X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailFragment.java;h=c0944f9a9261bd0aa1355a36fd2b7c9ba570df12;hp=4f9573b0c55895056149822f773d3cac9d5f27c9;hb=112fd782066d4eb759a104eaf7116b310e0d47d5;hpb=294362e52db84e8db8a165c3f79f0367427ba9ff

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
index 4f9573b0..c0944f9a 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
@@ -108,7 +108,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
                         String.format("[fragment] removing profile %s", mProfile.getUuid()));
                 mProfile.removeFromDB();
                 ArrayList<MobileLedgerProfile> oldList = Data.profiles.getValue();
-                assert oldList != null;
+                if (oldList == null) throw new AssertionError();
                 ArrayList<MobileLedgerProfile> newList =
                         (ArrayList<MobileLedgerProfile>) oldList.clone();
                 newList.remove(mProfile);
@@ -116,9 +116,10 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
                 if (mProfile.equals(Data.profile.getValue())) {
                     debug("profiles", "[fragment] setting current profile to 0");
                     Data.setCurrentProfile(newList.get(0));
-                    final FragmentActivity activity = getActivity();
-                    if (activity != null) activity.finish();
                 }
+
+                final FragmentActivity activity = getActivity();
+                if (activity != null) activity.finish();
             });
             builder.show();
             return false;
@@ -143,7 +144,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
         int index = Data.getProfileIndex(mProfile);
         MobileLedgerProfile newProfile = new MobileLedgerProfile(mProfile);
         final ArrayList<MobileLedgerProfile> profiles = Data.profiles.getValue();
-        assert profiles != null;
+        if (profiles == null) throw new AssertionError();
         profiles.set(index, newProfile);
         if (mProfile.equals(Data.profile.getValue())) Data.profile.setValue(newProfile);
     }
@@ -192,7 +193,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue
             updateProfileFromUI();
             mProfile.storeInDB();
             final ArrayList<MobileLedgerProfile> profiles = Data.profiles.getValue();
-            assert profiles != null;
+            if (profiles == null) throw new AssertionError();
             ArrayList<MobileLedgerProfile> newList =
                     (ArrayList<MobileLedgerProfile>) profiles.clone();
             newList.add(mProfile);