X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FRetrieveAccountsTask.java;h=16919b336b62fac88f73489492924c0178c35dfd;hb=1d78d069e125c9c4d66d413a1f862908fca96d83;hp=d90eda15dabe74349e46bfddc1f8b3598c7190e9;hpb=48d2f79edc48f9aa504b5d0214429a8e5017bf3e;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
index d90eda15..16919b33 100644
--- a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
@@ -4,6 +4,7 @@ import android.content.SharedPreferences;
 import android.util.Log;
 
 import java.io.BufferedReader;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -67,7 +68,9 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<Void, In
                                 acct_name = acct_name.replace("\"", "");
                                 Log.d("account-parser", acct_name);
 
-                                db.execSQL("insert or replace into accounts(name, keep) values(?, 1)", new Object[]{acct_name} );
+                                db.execSQL("insert or replace into accounts(name, name_upper, " +
+                                                "keep) values(?, ?, 1)",
+                                        new Object[]{acct_name, acct_name.toUpperCase()});
                                 publishProgress(++count);
 
                                 last_account_name = acct_name;
@@ -108,7 +111,10 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<Void, In
                                     if (description.isEmpty()) continue;
 
                                     Log.d("db", String.format("Stored description: %s", description));
-                                    db.execSQL("insert or replace into description_history(description, keep) values(?, 1);", new Object[]{description});
+                                    db.execSQL("insert or replace into description_history" +
+                                                    "(description, description_upper, keep) " +
+                                                    "values(?, ?, 1);",
+                                            new Object[]{description, description.toUpperCase()});
                                 }
                             }
                         }
@@ -130,7 +136,12 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<Void, In
         } catch (MalformedURLException e) {
             error = R.string.err_bad_backend_url;
             e.printStackTrace();
-        } catch (IOException e) {
+        }
+        catch (FileNotFoundException e) {
+            error = R.string.err_bad_auth;
+            e.printStackTrace();
+        }
+        catch (IOException e) {
             error = R.string.err_net_io_error;
             e.printStackTrace();
         }