X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fdb%2FAccountAutocompleteAdapter.java;h=6a92b6170214a9026fba0e57e40c640b4d218c60;hb=2780d22c9b11fcd67eff8f839e4b25f8facd25c1;hp=42bf4c6b50f4e9579fcf4e894d7f97be85ecc564;hpb=93545c6fbf1244fbd96ecfc50e1115dbdc25f9ae;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/db/AccountAutocompleteAdapter.java b/app/src/main/java/net/ktnx/mobileledger/db/AccountAutocompleteAdapter.java
index 42bf4c6b..6a92b617 100644
--- a/app/src/main/java/net/ktnx/mobileledger/db/AccountAutocompleteAdapter.java
+++ b/app/src/main/java/net/ktnx/mobileledger/db/AccountAutocompleteAdapter.java
@@ -24,21 +24,22 @@ import android.widget.Filter;
 import androidx.annotation.NonNull;
 
 import net.ktnx.mobileledger.dao.AccountDAO;
-import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.utils.Logger;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static net.ktnx.mobileledger.db.Profile.NO_PROFILE_ID;
+
 public class AccountAutocompleteAdapter extends ArrayAdapter<String> {
     private final AccountFilter filter = new AccountFilter();
     private final AccountDAO dao = DB.get()
                                      .getAccountDAO();
-    private long profileId;
+    private long profileId = NO_PROFILE_ID;
     public AccountAutocompleteAdapter(Context context) {
         super(context, android.R.layout.simple_dropdown_item_1line, new ArrayList<>());
     }
-    public AccountAutocompleteAdapter(Context context, @NonNull MobileLedgerProfile profile) {
+    public AccountAutocompleteAdapter(Context context, @NonNull Profile profile) {
         this(context);
         profileId = profile.getId();
     }
@@ -73,11 +74,12 @@ public class AccountAutocompleteAdapter extends ArrayAdapter<String> {
             }
 
             Logger.debug("acc", String.format("Looking for account '%s'", constraint));
-            final List<String> matches = AccountDAO.unbox((profileId == 0) ? dao.lookupByNameSync(
-                    String.valueOf(constraint)
-                          .toUpperCase()) : dao.lookupInProfileByNameSync(profileId,
-                    String.valueOf(constraint)
-                          .toUpperCase()));
+            final List<String> matches = AccountDAO.unbox(
+                    (profileId == NO_PROFILE_ID) ? dao.lookupNamesByNameSync(
+                            String.valueOf(constraint)
+                                  .toUpperCase()) : dao.lookupNamesInProfileByNameSync(profileId,
+                            String.valueOf(constraint)
+                                  .toUpperCase()));
             results.values = matches;
             results.count = matches.size();