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=82709138207aaf553b51f29b4f893a8d1c409895;hp=9214e79445d1ff0d9732b95a4a2a801da21eed8c;hb=198f2762d2236a57cec413322c0bde6985ead88a;hpb=ffbfe16379b73aaf0bc68b4251c2acb930a19d26 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 9214e794..82709138 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 @@ -36,15 +36,12 @@ import android.view.View; 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 java.lang.ref.WeakReference; -import java.util.Date; import java.util.List; import java.util.Observable; import java.util.Observer; @@ -82,13 +79,10 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { 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); - } + mActivity.runOnUiThread(() -> { + int cnt = Data.backgroundTaskCount.get(); + Log.d("acc", String.format("background task count changed to %d", cnt)); + swiper.setRefreshing(cnt > 0); }); } }); @@ -171,40 +165,17 @@ public class AccountSummaryFragment extends MobileLedgerListFragment { swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent); swiper.setOnRefreshListener(() -> { Log.d("ui", "refreshing accounts via swipe"); - update_accounts(true); + mActivity.scheduleTransactionListRetrieval(); }); Data.accounts.addObserver(new Observer() { @Override public void update(Observable o, Object arg) { - mActivity.runOnUiThread(new Runnable() { - @Override - public void run() { - modelAdapter.notifyDataSetChanged(); - } - }); + mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged()); } }); update_account_table(); } - - private void update_accounts(boolean force) { - long now = new Date().getTime(); - if ((now > (account_list_last_updated + (24 * 3600 * 1000))) || force) { - Log.d("db", - "accounts last updated at " + account_list_last_updated + " and now is " + now + - ". re-fetching"); - update_accounts(); - } - } - - private void update_accounts() { - RetrieveAccountsTask task = new RetrieveAccountsTask(new WeakReference<>(mActivity)); - - task.setPref(PreferenceManager.getDefaultSharedPreferences(mActivity)); - task.execute(); - - } private void update_account_table() { if (this.getContext() == null) return;