X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fdb%2FAccountAutocompleteAdapter.java;h=6a92b6170214a9026fba0e57e40c640b4d218c60;hb=833544eb24cb630dc1ce221e4aa3dedb3f6341e3;hp=ecc21db74e69e624c28d56f02a53bc696a451262;hpb=d0c7376f092d1778ec8bab43cd2017eab723d521;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 ecc21db7..6a92b617 100644
--- a/app/src/main/java/net/ktnx/mobileledger/db/AccountAutocompleteAdapter.java
+++ b/app/src/main/java/net/ktnx/mobileledger/db/AccountAutocompleteAdapter.java
@@ -29,16 +29,22 @@ 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 String profileUUID;
+    private long profileId = NO_PROFILE_ID;
     public AccountAutocompleteAdapter(Context context) {
         super(context, android.R.layout.simple_dropdown_item_1line, new ArrayList<>());
     }
-    public void setProfileUUID(String profileUUID) {
-        this.profileUUID = profileUUID;
+    public AccountAutocompleteAdapter(Context context, @NonNull Profile profile) {
+        this(context);
+        profileId = profile.getId();
+    }
+    public void setProfileId(long profileId) {
+        this.profileId = profileId;
     }
     @NonNull
     @Override
@@ -69,11 +75,11 @@ public class AccountAutocompleteAdapter extends ArrayAdapter<String> {
 
             Logger.debug("acc", String.format("Looking for account '%s'", constraint));
             final List<String> matches = AccountDAO.unbox(
-                    (profileUUID == null) ? dao.lookupByNameSync(String.valueOf(constraint)
-                                                                       .toUpperCase())
-                                          : dao.lookupInProfileByNameSync(profileUUID,
-                                                  String.valueOf(constraint)
-                                                        .toUpperCase()));
+                    (profileId == NO_PROFILE_ID) ? dao.lookupNamesByNameSync(
+                            String.valueOf(constraint)
+                                  .toUpperCase()) : dao.lookupNamesInProfileByNameSync(profileId,
+                            String.valueOf(constraint)
+                                  .toUpperCase()));
             results.values = matches;
             results.count = matches.size();