X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryFragment.java;h=99ce8bded745ef230239f09ff4ae358b95e2ab23;hp=2d494af98afac869e725faa1dcf8fd63a2b47459;hb=9ab140e69f987d4a207037e9ef1d3ac9888f3fd4;hpb=b011feba6b09f35a0e07c9502f126877b5f05905

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 2d494af9..99ce8bde 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
@@ -25,9 +25,6 @@ import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -40,7 +37,9 @@ 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;
@@ -48,10 +47,12 @@ 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;
 
-public class AccountSummaryFragment extends Fragment {
+public class AccountSummaryFragment extends MobileLedgerListFragment {
 
     private static long account_list_last_updated;
     private static boolean account_list_needs_update = true;
@@ -60,13 +61,39 @@ public class AccountSummaryFragment extends Fragment {
     private AccountSummaryViewModel model;
     private AccountSummaryAdapter modelAdapter;
     private Menu optMenu;
-    private MainActivity mActivity;
     private FloatingActionButton fab;
-    private SwipeRefreshLayout swiper;
+    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);
@@ -101,7 +128,7 @@ public class AccountSummaryFragment extends Fragment {
                 new RecyclerItemListener.RecyclerTouchListener() {
                     @Override
                     public void onClickItem(View v, int position) {
-                        Log.d("list", String.format("item %d clicked", position));
+                        Log.d("value", String.format("item %d clicked", position));
                         if (modelAdapter.isSelectionActive()) {
                             modelAdapter.selectItem(position);
                         }
@@ -117,7 +144,7 @@ public class AccountSummaryFragment extends Fragment {
 
                     @Override
                     public void onLongClickItem(View v, int position) {
-                        Log.d("list", String.format("item %d long-clicked", position));
+                        Log.d("value", String.format("item %d long-clicked", position));
                         modelAdapter.startSelection();
                         if (optMenu != null) {
                             optMenu.findItem(R.id.menu_acc_summary_cancel_selection)
@@ -148,13 +175,19 @@ public class AccountSummaryFragment extends Fragment {
             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("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) {
@@ -168,34 +201,18 @@ public class AccountSummaryFragment extends Fragment {
     }
 
     private void update_accounts() {
-        RetrieveAccountsTask task = new RetrieveAccountsTask(new WeakReference<>(this));
+        RetrieveAccountsTask task = new RetrieveAccountsTask(new WeakReference<>(mActivity));
 
         task.setPref(PreferenceManager.getDefaultSharedPreferences(mActivity));
         task.execute();
 
     }
-    public void onAccountRefreshDone(int error) {
-        swiper.setRefreshing(false);
-        if (error != 0) {
-            String err_text = getResources().getString(error);
-            Log.d("visual", String.format("showing snackbar: %s", err_text));
-            Snackbar.make(swiper, err_text, Snackbar.LENGTH_LONG).show();
-        }
-        else {
-            MLDB.set_option_value("last_refresh", new Date().getTime());
-            update_account_table();
-        }
-    }
     private void update_account_table() {
         if (this.getContext() == null) return;
 
         model.reloadAccounts(this.getContext());
         modelAdapter.notifyDataSetChanged();
     }
-    public void onRefreshAccountSummaryClicked(MenuItem mi) {
-        update_accounts(true);
-    }
-
     public void onShowOnlyStarredClicked(MenuItem mi) {
         SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity);
         boolean flag = pref.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false);