X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FProfileDetailActivity.java;h=4536e0d91f66aa6d22f1d6a48fadf6f64e9d9bad;hp=c308d6320fe73674461d56507c0227b39ca82b06;hb=b04c98250e8e2abcf1d652e2a20cff0f9b98784b;hpb=dc792fac64192abb61c6533c0ff0e2d56d298cb9

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileDetailActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileDetailActivity.java
index c308d632..4536e0d9 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileDetailActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileDetailActivity.java
@@ -18,17 +18,21 @@
 package net.ktnx.mobileledger.ui.activity;
 
 import android.os.Bundle;
-import android.util.Log;
 import android.view.Menu;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.ui.profiles.ProfileDetailFragment;
 import net.ktnx.mobileledger.utils.Colors;
 
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.Toolbar;
+import java.util.ArrayList;
+import java.util.Locale;
+
+import static net.ktnx.mobileledger.utils.Logger.debug;
 
 /**
  * An activity representing a single Profile detail screen. This
@@ -44,12 +48,17 @@ public class ProfileDetailActivity extends CrashReportingActivity {
         final int index = getIntent().getIntExtra(ProfileDetailFragment.ARG_ITEM_ID, -1);
 
         if (index != -1) {
-            profile = Data.profiles.get(index);
-            if (profile == null) throw new AssertionError(
-                    String.format("Can't get profile " + "(index:%d) from the global list", index));
+            ArrayList<MobileLedgerProfile> profiles = Data.profiles.getValue();
+            if (profiles != null) {
+                profile = profiles.get(index);
+                if (profile == null)
+                    throw new AssertionError(
+                            String.format("Can't get profile " + "(index:%d) from the global list",
+                                    index));
 
-            Log.d("profiles", String.format("Editing profile %s (%s); hue=%d", profile.getName(),
-                    profile.getUuid(), profile.getThemeId()));
+                debug("profiles", String.format(Locale.ENGLISH, "Editing profile %s (%s); hue=%d",
+                        profile.getName(), profile.getUuid(), profile.getThemeId()));
+            }
         }
 
         super.onCreate(savedInstanceState);
@@ -81,14 +90,16 @@ public class ProfileDetailActivity extends CrashReportingActivity {
             mFragment = new ProfileDetailFragment();
             mFragment.setArguments(arguments);
             getSupportFragmentManager().beginTransaction()
-                    .add(R.id.profile_detail_container, mFragment).commit();
+                                       .add(R.id.profile_detail_container, mFragment)
+                                       .commit();
         }
     }
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        Log.d("profiles", "[activity] Creating profile details options menu");
-        mFragment.onCreateOptionsMenu(menu, getMenuInflater());
+        debug("profiles", "[activity] Creating profile details options menu");
+        if (mFragment != null)
+            mFragment.onCreateOptionsMenu(menu, getMenuInflater());
 
         return true;
     }