X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListFragment.java;h=3c008936b1f08d7d8ac8019dfb7c72eafef78386;hb=181835cdae5958e64bbab222e4f7264309c6afe2;hp=12447d26f42bc68da59cacbc9aa706aaf168597e;hpb=d45a715886c1139da8e8bea91d374abbcffa7af2;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java
index 12447d26..3c008936 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java
@@ -56,9 +56,6 @@ public class TransactionListFragment extends MobileLedgerListFragment {
     private View vAccountFilter;
     private AutoCompleteTextView accNameFilter;
     private Observer backgroundTaskCountObserver;
-    private Observer accountFilterObserver;
-    private static void update(Observable o, Object arg) {
-    }
     @Override
     public void onDestroy() {
         if (backgroundTaskCountObserver != null) {
@@ -67,8 +64,6 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         }
         super.onDestroy();
     }
-    public void setShowOnlyAccountName(String mShowOnlyAccountName) {
-    }
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -153,19 +148,15 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         vAccountFilter = mActivity.findViewById(R.id.transaction_list_account_name_filter);
         accNameFilter = mActivity.findViewById(R.id.transaction_filter_account_name);
 
-        TransactionListFragment me = this;
         MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name", true);
         accNameFilter.setOnItemClickListener((parent, view, position, id) -> {
 //                Log.d("tmp", "direct onItemClick");
             MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position);
-            Data.accountFilter.set(mc.getString(1));
+            Data.accountFilter.setValue(mc.getString(1));
             Globals.hideSoftKeyboard(mActivity);
         });
 
-        if (accountFilterObserver == null) {
-            accountFilterObserver = (o, arg) -> onAccountNameFilterChanged();
-            Data.accountFilter.addObserver(accountFilterObserver);
-        }
+        Data.accountFilter.observe(this, this::onAccountNameFilterChanged);
 
         TransactionListViewModel.updating.addObserver(
                 (o, arg) -> swiper.setRefreshing(TransactionListViewModel.updating.get()));
@@ -183,20 +174,13 @@ public class TransactionListFragment extends MobileLedgerListFragment {
                 (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()));
 
         mActivity.findViewById(R.id.clearAccountNameFilter).setOnClickListener(v -> {
-            String current = Data.accountFilter.get();
-            Data.accountFilter.set(null);
+            Data.accountFilter.setValue(null);
             vAccountFilter.setVisibility(View.GONE);
             menuTransactionListFilter.setVisible(true);
             Globals.hideSoftKeyboard(mActivity);
         });
-
-        onAccountNameFilterChanged(false);
-    }
-    private void onAccountNameFilterChanged() {
-        onAccountNameFilterChanged(true);
     }
-    private void onAccountNameFilterChanged(boolean reloadTransactions) {
-        String accName = Data.accountFilter.get();
+    private void onAccountNameFilterChanged(String accName) {
         if (accNameFilter != null) {
             accNameFilter.setText(accName, false);
         }
@@ -206,7 +190,7 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         }
         if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(!filterActive);
 
-        if (reloadTransactions) TransactionListViewModel.scheduleTransactionListReload();
+        TransactionListViewModel.scheduleTransactionListReload();
 
     }
     @Override
@@ -216,7 +200,7 @@ public class TransactionListFragment extends MobileLedgerListFragment {
         menuTransactionListFilter = menu.findItem(R.id.menu_transaction_list_filter);
         if ((menuTransactionListFilter == null)) throw new AssertionError();
 
-        if (Data.accountFilter.get() != null) {
+        if (Data.accountFilter.getValue() != null) {
             menuTransactionListFilter.setVisible(false);
         }