X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=7373d0d85b3f858a06804aae12a346a51846976a;hp=ec34809819e4a9968d2ef9cc9d99d54a4fe33911;hb=8fd287a2b36f1d28ee1c1ca67687abaab4e95f2f;hpb=4a18f169ea73b7bf85c4c018ef047a2e873319d5

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
index ec348098..7373d0d8 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
@@ -158,64 +158,81 @@ public class MainActivity extends ProfileThemedActivity {
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        profileObserver = (o, arg) -> {
-            MobileLedgerProfile profile = Data.profile.get();
-            MainActivity.this.runOnUiThread(() -> {
-                if (profile == null) MainActivity.this.setTitle(R.string.app_name);
-                else MainActivity.this.setTitle(profile.getName());
-                MainActivity.this.updateLastUpdateTextFromDB();
-                if (profile.isPostingPermitted()) {
-                    toolbar.setSubtitle(null);
-                    fab.show();
-                }
-                else {
-                    toolbar.setSubtitle(R.string.profile_subitlte_read_only);
-                    fab.hide();
-                }
-
-                int old_index = -1;
-                int new_index = -1;
-                if (arg != null) {
-                    MobileLedgerProfile old = (MobileLedgerProfile) arg;
-                    old_index = Data.getProfileIndex(old);
-                    new_index = Data.getProfileIndex(profile);
-                }
-
-                if ((old_index != -1) && (new_index != -1)) {
-                    mProfileListAdapter.notifyItemChanged(old_index);
-                    mProfileListAdapter.notifyItemChanged(new_index);
-                }
-                else mProfileListAdapter.notifyDataSetChanged();
-
-                MainActivity.this.collapseProfileList();
-
-                int newProfileTheme = profile.getThemeId();
-                if (newProfileTheme != Colors.profileThemeId) {
-                    Log.d("profiles", String.format("profile theme %d → %d", Colors.profileThemeId,
-                            newProfileTheme));
-                    MainActivity.this.profileThemeChanged();
-                    Colors.profileThemeId = newProfileTheme;
-                }
-                else drawer.closeDrawers();
+        if (profileObserver == null) {
+            profileObserver = (o, arg) -> {
+                MobileLedgerProfile profile = Data.profile.get();
+                MainActivity.this.runOnUiThread(() -> {
+
+                    Data.transactions.clear();
+                    Log.d("transactions", "requesting list reload");
+                    TransactionListViewModel.scheduleTransactionListReload();
+
+                    Data.accounts.clear();
+                    AccountSummaryViewModel.scheduleAccountListReload();
+
+                    if (profile == null) MainActivity.this.setTitle(R.string.app_name);
+                    else MainActivity.this.setTitle(profile.getName());
+                    MainActivity.this.updateLastUpdateTextFromDB();
+                    int old_index = -1;
+                    int new_index = -1;
+                    if (arg != null) {
+                        MobileLedgerProfile old = (MobileLedgerProfile) arg;
+                        old_index = Data.getProfileIndex(old);
+                        new_index = Data.getProfileIndex(profile);
+                    }
 
-                Log.d("transactions", "requesting list reload");
-                TransactionListViewModel.scheduleTransactionListReload();
+                    if ((old_index != -1) && (new_index != -1)) {
+                        mProfileListAdapter.notifyItemChanged(old_index);
+                        mProfileListAdapter.notifyItemChanged(new_index);
+                    }
+                    else mProfileListAdapter.notifyDataSetChanged();
+
+                    MainActivity.this.collapseProfileList();
+
+                    int newProfileTheme = (profile == null) ? -1 : profile.getThemeId();
+                    if (newProfileTheme != Colors.profileThemeId) {
+                        Log.d("profiles",
+                                String.format("profile theme %d → %d", Colors.profileThemeId,
+                                        newProfileTheme));
+                        MainActivity.this.profileThemeChanged();
+                        Colors.profileThemeId = newProfileTheme;
+                        // profileThemeChanged would restart the activity, so no need to reload the
+                        // data sets below
+                        return;
+                    }
+                    drawer.closeDrawers();
 
-                AccountSummaryViewModel.scheduleAccountListReload();
+                    if (profile == null) {
+                        toolbar.setSubtitle(null);
+                        fab.hide();
+                    }
+                    else {
+                        if (profile.isPostingPermitted()) {
+                            toolbar.setSubtitle(null);
+                            fab.show();
+                        }
+                        else {
+                            toolbar.setSubtitle(R.string.profile_subitlte_read_only);
+                            fab.hide();
+                        }
+                    }
+                });
+            };
+            Data.profile.addObserver(profileObserver);
+        }
 
-            });
-        };
-        Data.profile.addObserver(profileObserver);
-        profilesObserver = (o, arg) -> {
-            findViewById(R.id.nav_profile_list).setMinimumHeight(
-                    (int) (getResources().getDimension(R.dimen.thumb_row_height) *
-                           Data.profiles.size()));
-
-            Log.d("profiles", "profile list changed");
-            if (arg == null) mProfileListAdapter.notifyDataSetChanged();
-            else mProfileListAdapter.notifyItemChanged((int) arg);
-        };
-        Data.profiles.addObserver(profilesObserver);
+        if (profilesObserver == null) {
+            profilesObserver = (o, arg) -> {
+                findViewById(R.id.nav_profile_list).setMinimumHeight(
+                        (int) (getResources().getDimension(R.dimen.thumb_row_height) *
+                               Data.profiles.size()));
+
+                Log.d("profiles", "profile list changed");
+                if (arg == null) mProfileListAdapter.notifyDataSetChanged();
+                else mProfileListAdapter.notifyItemChanged((int) arg);
+            };
+            Data.profiles.addObserver(profilesObserver);
+        }
 
         ActionBarDrawerToggle toggle =
                 new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open,
@@ -356,6 +373,20 @@ public class MainActivity extends ProfileThemedActivity {
             Log.d("main", String.format("Date formatted: %s", text));
         }
     }
+    @Override
+    public void finish() {
+        if (profilesObserver != null) {
+            Data.profiles.deleteObserver(profilesObserver);
+            profilesObserver = null;
+        }
+
+        if (profileObserver != null) {
+            Data.profile.deleteObserver(profileObserver);
+            profileObserver = null;
+        }
+
+        super.finish();
+    }
     private void profileThemeChanged() {
         setupProfileColors();
 
@@ -381,7 +412,16 @@ public class MainActivity extends ProfileThemedActivity {
         String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
         MobileLedgerProfile profile;
 
-        profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
+        if (Data.profiles.isEmpty()) {
+            profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
+        }
+        else {
+            try(LockHolder lh = Data.profiles.lockForReading()) {
+                int i = Data.getProfileIndex(profileUUID);
+                if (i == -1 ) i = 0;
+                profile = Data.profiles.get(i);
+            }
+        }
 
         if (Data.profiles.isEmpty()) {
             findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE);