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;fp=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=d9ac65b71aa43ca3b08a42d8c2b17efdf9c7f065;hp=406d0d7364da6f4c4c083529be6357dc72b0b9b4;hb=cf5745a939dd043b6b144c416fd4e8257b2cac66;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..d9ac65b7 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 @@ -391,7 +391,16 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa createShortcuts(newList); Profile currentProfile = Data.getProfile(); - if (currentProfile == null || !newList.contains(currentProfile)) { + boolean currentProfilePresent = false; + if (currentProfile != null) { + for (Profile p : newList) { + if (p.getId() == currentProfile.getId()) { + currentProfilePresent = true; + break; + } + } + } + if (!currentProfilePresent) { Logger.debug(TAG, "Switching profile because the current is no longer available"); Data.setCurrentProfile(newList.get(0)); }