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=cad021770fa25866bb17b1705a527606c0d30504;hp=406d0d7364da6f4c4c083529be6357dc72b0b9b4;hb=HEAD;hpb=68cd8ad9a58628674aec13a0d43fd89683728669 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 406d0d73..e686d96f 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 @@ -51,6 +51,7 @@ import androidx.viewpager2.widget.ViewPager2; import com.google.android.material.snackbar.Snackbar; +import net.ktnx.mobileledger.BackupsActivity; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.RetrieveTransactionsTask; import net.ktnx.mobileledger.async.TransactionAccumulator; @@ -71,6 +72,7 @@ import net.ktnx.mobileledger.ui.templates.TemplatesActivity; import net.ktnx.mobileledger.ui.transaction_list.TransactionListFragment; import net.ktnx.mobileledger.utils.Colors; import net.ktnx.mobileledger.utils.Logger; +import net.ktnx.mobileledger.utils.Misc; import org.jetbrains.annotations.NotNull; @@ -91,6 +93,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa public static final String STATE_ACC_FILTER = "account_filter"; private static final boolean FAB_HIDDEN = false; private static final boolean FAB_SHOWN = true; + private ConverterThread converterThread = null; private SectionsPagerAdapter mSectionsPagerAdapter; private ProfilesRecyclerViewAdapter mProfileListAdapter; private int mCurrentPage; @@ -164,8 +167,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa Data.backgroundTasksRunning.observe(this, this::onRetrieveRunningChanged); if (barDrawerToggle == null) { - barDrawerToggle = new ActionBarDrawerToggle(this, b.drawerLayout, b.toolbar, - R.string.navigation_drawer_open, R.string.navigation_drawer_close); + barDrawerToggle = new ActionBarDrawerToggle(this, b.drawerLayout, b.toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); b.drawerLayout.addDrawerListener(barDrawerToggle); } barDrawerToggle.syncState(); @@ -174,8 +176,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa PackageInfo pi = getApplicationContext().getPackageManager() .getPackageInfo(getPackageName(), 0); ((TextView) b.navUpper.findViewById(R.id.drawer_version_text)).setText(pi.versionName); - ((TextView) b.noProfilesLayout.findViewById(R.id.drawer_version_text)).setText( - pi.versionName); + ((TextView) b.noProfilesLayout.findViewById(R.id.drawer_version_text)).setText(pi.versionName); } catch (Exception e) { e.printStackTrace(); @@ -219,6 +220,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa } b.btnNoProfilesAdd.setOnClickListener(v -> ProfileDetailActivity.start(this, null)); + b.btnRestore.setOnClickListener(v -> BackupsActivity.start(this)); b.btnAddTransaction.setOnClickListener(this::fabNewTransactionClicked); @@ -269,10 +271,8 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa b.navProfileList.setLayoutManager(llm); b.navProfilesStartEdit.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); - b.navProfilesCancelEdit.setOnClickListener( - (v) -> mProfileListAdapter.flipEditingProfiles()); - b.navProfileListHeadButtons.setOnClickListener( - (v) -> mProfileListAdapter.flipEditingProfiles()); + b.navProfilesCancelEdit.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); + b.navProfileListHeadButtons.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); if (drawerListener == null) { drawerListener = new DrawerLayout.SimpleDrawerListener() { @Override @@ -322,6 +322,11 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa b.navAccountSummary.setOnClickListener(this::onAccountSummaryClicked); b.navLatestTransactions.setOnClickListener(this::onLatestTransactionsClicked); b.navPatterns.setOnClickListener(this::onPatternsClick); + b.navBackupRestore.setOnClickListener(this::onBackupRestoreClick); + } + private void onBackupRestoreClick(View view) { + Intent intent = new Intent(this, BackupsActivity.class); + startActivity(intent); } private void onPatternsClick(View view) { Intent intent = new Intent(this, TemplatesActivity.class); @@ -340,7 +345,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa mainModel.scheduleTransactionListRetrieval(); } } - private void createShortcuts(List list) { + private void createShortcuts(@NotNull List list) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) return; @@ -372,8 +377,10 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa } sm.setDynamicShortcuts(shortcuts); } - private void onProfileListChanged(List newList) { - if ((newList == null) || newList.isEmpty()) { + private void onProfileListChanged(@NotNull List newList) { + createShortcuts(newList); + + if (newList.isEmpty()) { b.noProfilesLayout.setVisibility(View.VISIBLE); b.mainAppLayout.setVisibility(View.GONE); return; @@ -388,23 +395,30 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa Logger.debug("profiles", "profile list changed"); mProfileListAdapter.setProfileList(newList); - createShortcuts(newList); + final Profile currentProfile = Data.getProfile(); + Profile replacementProfile = null; + if (currentProfile != null) { + for (Profile p : newList) { + if (p.getId() == currentProfile.getId()) { + replacementProfile = p; + break; + } + } + } - Profile currentProfile = Data.getProfile(); - if (currentProfile == null || !newList.contains(currentProfile)) { + if (replacementProfile == null) { Logger.debug(TAG, "Switching profile because the current is no longer available"); Data.setCurrentProfile(newList.get(0)); } + else { + Data.setCurrentProfile(replacementProfile); + } } /** * called when the current profile has changed */ private void onProfileChanged(@Nullable Profile newProfile) { - if (this.profile == null) { - if (newProfile == null) - return; - } - else { + if (this.profile != null) { if (this.profile.equals(newProfile)) return; } @@ -416,7 +430,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa else setTitle(R.string.app_name); - int newProfileTheme = haveProfile ? newProfile.getTheme() : -1; + int newProfileTheme = haveProfile ? newProfile.getTheme() : Colors.DEFAULT_HUE_DEG; if (newProfileTheme != Colors.profileThemeId) { Logger.debug("profiles", String.format(Locale.ENGLISH, "profile theme %d → %d", Colors.profileThemeId, @@ -462,38 +476,40 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa } mainModel.getAccountFilter() - .observe(this, accFilter -> { - Logger.debug(TAG, "account filter changed, reloading transactions"); -// mainModel.scheduleTransactionListReload(); - LiveData> transactions = - new MutableLiveData<>(new ArrayList()); - if (profile != null) { - if (accFilter == null || accFilter.isEmpty()) { - transactions = DB.get() - .getTransactionDAO() - .getAllWithAccounts(profile.getId()); - } - else { - transactions = DB.get() - .getTransactionDAO() - .getAllWithAccountsFiltered(profile.getId(), - accFilter); - } - } - - transactions.observe(this, list -> { - TransactionAccumulator accumulator = new TransactionAccumulator(accFilter); - - for (TransactionWithAccounts tr : list) - accumulator.put(new LedgerTransaction(tr)); - - accumulator.publishResults(mainModel); - }); - }); + .observe(this, this::onAccountFilterChanged); mainModel.stopTransactionsRetrieval(); mainModel.clearTransactions(); } + private void onAccountFilterChanged(String accFilter) { + Logger.debug(TAG, "account filter changed, reloading transactions"); +// mainModel.scheduleTransactionListReload(); + LiveData> transactions = + new MutableLiveData<>(new ArrayList<>()); + if (profile != null) { + if (accFilter == null || accFilter.isEmpty()) { + transactions = DB.get() + .getTransactionDAO() + .getAllWithAccounts(profile.getId()); + } + else { + transactions = DB.get() + .getTransactionDAO() + .getAllWithAccountsFiltered(profile.getId(), accFilter); + } + } + + transactions.observe(this, list -> { + Logger.debug(TAG, + String.format(Locale.ROOT, "got transaction list from DB (%d transactions)", + list.size())); + + if (converterThread != null) + converterThread.interrupt(); + converterThread = new ConverterThread(mainModel, list, accFilter); + converterThread.start(); + }); + } private void profileThemeChanged() { // un-hook all observed LiveData Data.removeProfileObservers(this); @@ -747,4 +763,37 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa return 2; } } + + static private class ConverterThread extends Thread { + private final List list; + private final MainModel model; + private final String accFilter; + public ConverterThread(@NonNull MainModel model, + @NonNull List list, String accFilter) { + this.model = model; + this.list = list; + this.accFilter = accFilter; + } + @Override + public void run() { + TransactionAccumulator accumulator = new TransactionAccumulator(accFilter, accFilter); + + for (TransactionWithAccounts tr : list) { + if (isInterrupted()) { + Logger.debug(TAG, "ConverterThread bailing out on interrupt"); + return; + } + accumulator.put(new LedgerTransaction(tr)); + } + + if (isInterrupted()) { + Logger.debug(TAG, "ConverterThread bailing out on interrupt"); + return; + } + + Logger.debug(TAG, "ConverterThread publishing results"); + + Misc.onMainThread(() -> accumulator.publishResults(model)); + } + } }