profiles: ensure single instance per profile, fix havoc on add/removal of a profile

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / ProfileListActivity.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileListActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileListActivity.java
index 07fce288bdcc6d51ec09ba92b640150ea9d273d0..6932e97828d84f1d4b06049b259cf0ba332e6287 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileListActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileListActivity.java
@@ -200,23 +200,28 @@ public class ProfileListActivity extends AppCompatActivity {
             View view = LayoutInflater.from(parent.getContext())
                     .inflate(R.layout.profile_list_content, parent, false);
             ProfileListViewHolder holder = new ProfileListViewHolder(view);
             View view = LayoutInflater.from(parent.getContext())
                     .inflate(R.layout.profile_list_content, parent, false);
             ProfileListViewHolder holder = new ProfileListViewHolder(view);

-            Data.profile.addObserver((o, arg) -> {
-                MobileLedgerProfile newProfile = Data.profile.get();
-                MobileLedgerProfile profile = (MobileLedgerProfile) holder.itemView.getTag();
-                holder.mRadioView.setChecked(profile.equals(newProfile));
-            });

 
             holder.mRadioView.setOnCheckedChangeListener((buttonView, isChecked) -> {
                 if (!isChecked) return;
 
             holder.mRadioView.setOnCheckedChangeListener((buttonView, isChecked) -> {
                 if (!isChecked) return;

+                Log.d("profiles",
+                        String.format("Item %d got checked", holder.getAdapterPosition()));

                 MobileLedgerProfile profile = (MobileLedgerProfile) holder.itemView.getTag();
                 MobileLedgerProfile profile = (MobileLedgerProfile) holder.itemView.getTag();

-                if (profile != null) Data.setCurrentProfile(profile);
+                if (profile != null) {
+                    Log.d("profiles",
+                            String.format("Setting current profile to %s", profile.getUuid()));
+                    Data.setCurrentProfile(profile);
+                }

             });
             View.OnClickListener profileSelector = v -> holder.mRadioView.setChecked(true);
             holder.mTitle.setOnClickListener(profileSelector);
             holder.mSubTitle.setOnClickListener(profileSelector);
             Data.profile.addObserver((o, arg) -> {
             });
             View.OnClickListener profileSelector = v -> holder.mRadioView.setChecked(true);
             holder.mTitle.setOnClickListener(profileSelector);
             holder.mSubTitle.setOnClickListener(profileSelector);
             Data.profile.addObserver((o, arg) -> {

-                MobileLedgerProfile profile = (MobileLedgerProfile) holder.itemView.getTag();
-                holder.mRadioView.setChecked(Data.profile.get().equals(profile));
+                MobileLedgerProfile myProfile = (MobileLedgerProfile) holder.itemView.getTag();
+                final MobileLedgerProfile currentProfile = Data.profile.get();
+                final boolean sameProfile = currentProfile.equals(myProfile);
+                if (holder.mRadioView.isChecked() != sameProfile) {
+                    holder.mRadioView.setChecked(sameProfile);
+                }

             });
             return holder;
         }
             });
             return holder;
         }


@@ -226,11 +231,11 @@ public class ProfileListActivity extends AppCompatActivity {
             final MobileLedgerProfile currentProfile = Data.profile.get();
             Log.d("profiles", String.format("pos %d: %s, current: %s", position, profile.getUuid(),
                     currentProfile.getUuid()));
             final MobileLedgerProfile currentProfile = Data.profile.get();
             Log.d("profiles", String.format("pos %d: %s, current: %s", position, profile.getUuid(),
                     currentProfile.getUuid()));

+            holder.itemView.setTag(profile);

             holder.mTitle.setText(profile.getName());
             holder.mSubTitle.setText(profile.getUrl());
             holder.mTitle.setText(profile.getName());
             holder.mSubTitle.setText(profile.getUrl());

-            holder.mRadioView.setChecked(profile.getUuid().equals(currentProfile.getUuid()));
+            holder.mRadioView.setChecked(profile.equals(currentProfile));

 
 

-            holder.itemView.setTag(profile);

             holder.mEditButton.setOnClickListener(mOnClickListener);
         }
         @Override
             holder.mEditButton.setOnClickListener(mOnClickListener);
         }
         @Override