X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=9214e79445d1ff0d9732b95a4a2a801da21eed8c;hb=d3a8b658a1fc185202ab739eaa66080813729170;hp=d1241601809c09f5699e74924db6363b0f1cef63;hpb=a1d55154e1c9fb72fcd60de31d6e64e8d046f96d;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java
index d1241601..9214e794 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryFragment.java
@@ -37,15 +37,17 @@ import android.view.ViewGroup;
 
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.async.RetrieveAccountsTask;
+import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerAccount;
 import net.ktnx.mobileledger.ui.MobileLedgerListFragment;
 import net.ktnx.mobileledger.ui.RecyclerItemListener;
 import net.ktnx.mobileledger.ui.activity.MainActivity;
-import net.ktnx.mobileledger.utils.MLDB;
 
 import java.lang.ref.WeakReference;
 import java.util.Date;
 import java.util.List;
+import java.util.Observable;
+import java.util.Observer;
 
 import static net.ktnx.mobileledger.ui.activity.SettingsActivity.PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS;
 
@@ -59,10 +61,38 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
     private AccountSummaryAdapter modelAdapter;
     private Menu optMenu;
     private FloatingActionButton fab;
+    private Observer backgroundTaskCountObserver;
+    @Override
+    public void onDestroy() {
+        if(backgroundTaskCountObserver!= null) {
+            Log.d("acc", "destroying background task count observer");
+            Data.backgroundTaskCount.deleteObserver(backgroundTaskCountObserver);
+        }
+        super.onDestroy();
+    }
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+
+        if (backgroundTaskCountObserver == null) {
+            Log.d("acc", "creating background task count observer");
+            Data.backgroundTaskCount.addObserver(backgroundTaskCountObserver = new Observer() {
+                @Override
+                public void update(Observable o, Object arg) {
+                    if (mActivity == null) return;
+                    if (swiper == null) return;
+                    mActivity.runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            int cnt = Data.backgroundTaskCount.get();
+                            Log.d("acc", String.format("background task count changed to %d", cnt));
+                            swiper.setRefreshing(cnt > 0);
+                        }
+                    });
+                }
+            });
+        }
     }
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -81,8 +111,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
         mActivity.markDrawerItemCurrent(R.id.nav_account_summary);
 
         model = ViewModelProviders.of(this).get(AccountSummaryViewModel.class);
-        List<LedgerAccount> accounts = model.getAccounts(this.getContext());
-        modelAdapter = new AccountSummaryAdapter(accounts);
+        modelAdapter = new AccountSummaryAdapter();
 
         RecyclerView root = mActivity.findViewById(R.id.account_root);
         root.setAdapter(modelAdapter);
@@ -102,7 +131,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
                             modelAdapter.selectItem(position);
                         }
                         else {
-                            List<LedgerAccount> accounts = model.getAccounts(mActivity);
+                            List<LedgerAccount> accounts = Data.accounts.get();
                             if (accounts != null) {
                                 LedgerAccount account = accounts.get(position);
 
@@ -144,13 +173,19 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
             Log.d("ui", "refreshing accounts via swipe");
             update_accounts(true);
         });
-        prepare_db();
-//        update_account_table();
-        update_accounts(false);
 
-    }
-    private void prepare_db() {
-        account_list_last_updated = MLDB.get_option_value(MLDB.OPT_LAST_REFRESH, (long) 0);
+        Data.accounts.addObserver(new Observer() {
+            @Override
+            public void update(Observable o, Object arg) {
+                mActivity.runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        modelAdapter.notifyDataSetChanged();
+                    }
+                });
+            }
+        });
+        update_account_table();
     }
 
     private void update_accounts(boolean force) {
@@ -173,8 +208,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
     private void update_account_table() {
         if (this.getContext() == null) return;
 
-        model.reloadAccounts(this.getContext());
-        modelAdapter.notifyDataSetChanged();
+        model.scheduleAccountListReload(this.getContext());
     }
     public void onShowOnlyStarredClicked(MenuItem mi) {
         SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity);
@@ -203,7 +237,7 @@ public class AccountSummaryFragment extends MobileLedgerListFragment {
         stopSelection();
     }
     public void onConfirmAccSelection(MenuItem item) {
-        model.commitSelections(mActivity);
+        AccountSummaryViewModel.commitSelections(mActivity);
         stopSelection();
     }
     @Override