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=bd28ab299c52f47d62a9025bef5287bfc73f7f56;hp=afa9c71e2916c3df0e8c2ed163db4663f7a56053;hb=52aac35d8e7fd33dea55aa29f5b19ca6c39aaaa8;hpb=3d7b60a2c48d395fd75974f458b9cc6b3cd9a2b9 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 afa9c71e..bd28ab29 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 @@ -94,7 +94,6 @@ public class MainActivity extends ProfileThemedActivity { private FloatingActionButton fab; private ProfilesRecyclerViewAdapter mProfileListAdapter; private int mCurrentPage; - private String mAccountFilter; private boolean mBackMeansToAccountList = false; private Toolbar mToolbar; private DrawerLayout.SimpleDrawerListener drawerListener; @@ -105,19 +104,14 @@ public class MainActivity extends ProfileThemedActivity { protected void onStart() { super.onStart(); - debug("flow", String.format(Locale.ENGLISH, - "MainActivity.onStart(), currentPage is %d, accountFilter is %s", mCurrentPage, - (mAccountFilter == null) ? "" : mAccountFilter)); mViewPager.setCurrentItem(mCurrentPage, false); - if (mAccountFilter != null) showTransactionsFragment(mAccountFilter); - else Data.accountFilter.setValue(null); - } @Override protected void onSaveInstanceState(@NotNull Bundle outState) { super.onSaveInstanceState(outState); outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem()); - if (mAccountFilter != null) outState.putString(STATE_ACC_FILTER, mAccountFilter); + if (Data.accountFilter.getValue() != null) + outState.putString(STATE_ACC_FILTER, Data.accountFilter.getValue()); } @Override protected void onDestroy() { @@ -225,9 +219,8 @@ public class MainActivity extends ProfileThemedActivity { if (currentPage != -1) { mCurrentPage = currentPage; } - mAccountFilter = savedInstanceState.getString(STATE_ACC_FILTER, null); + Data.accountFilter.setValue(savedInstanceState.getString(STATE_ACC_FILTER, null)); } - else mAccountFilter = null; Data.lastUpdateDate.observe(this, this::updateLastUpdateDisplay);