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=1568c65fa6d7512e19ba13d0d662fe44a2c6bd98;hp=c308d6320fe73674461d56507c0227b39ca82b06;hb=a9f669055c4458c54e3ece1d2896e5ce0c28b920;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..1568c65f 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,7 +18,6 @@ package net.ktnx.mobileledger.ui.activity; import android.os.Bundle; -import android.util.Log; import android.view.Menu; import net.ktnx.mobileledger.R; @@ -27,9 +26,14 @@ import net.ktnx.mobileledger.model.MobileLedgerProfile; import net.ktnx.mobileledger.ui.profiles.ProfileDetailFragment; import net.ktnx.mobileledger.utils.Colors; +import java.util.ArrayList; +import java.util.Locale; + import androidx.appcompat.app.ActionBar; import androidx.appcompat.widget.Toolbar; +import static net.ktnx.mobileledger.utils.Logger.debug; + /** * An activity representing a single Profile detail screen. This * activity is only used on narrow width devices. On tablet-size devices, @@ -44,12 +48,16 @@ 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 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); @@ -87,8 +95,8 @@ public class ProfileDetailActivity extends CrashReportingActivity { @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; }