X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FProfileThemedActivity.java;h=dcc83460cf1f391629adede89dc81d4a257e2336;hb=3f3f3d176f344f297e1db730d9121ff3c484053a;hp=43776addf18181f7756edd9c07acaa54447d6f6d;hpb=5df10dc0b58df4d4be4e9ab34f1e0f477ca46766;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java index 43776add..dcc83460 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java @@ -18,12 +18,12 @@ package net.ktnx.mobileledger.ui.activity; import android.annotation.SuppressLint; -import android.os.AsyncTask; import android.os.Bundle; import androidx.annotation.Nullable; import net.ktnx.mobileledger.App; +import net.ktnx.mobileledger.dao.BaseDAO; import net.ktnx.mobileledger.dao.ProfileDAO; import net.ktnx.mobileledger.db.DB; import net.ktnx.mobileledger.db.Profile; @@ -75,7 +75,6 @@ public class ProfileThemedActivity extends CrashReportingActivity { Data.observeProfile(this, profile -> { if (profile == null) { Logger.debug(TAG, "No current profile, leaving"); - finish(); return; } @@ -84,6 +83,9 @@ public class ProfileThemedActivity extends CrashReportingActivity { if (hue != mThemeHue) { storeProfilePref(profile); + Logger.debug(TAG, + String.format(Locale.US, "profile observer calling setupProfileColors(%d)", + hue)); setupProfileColors(hue); } }); @@ -99,14 +101,16 @@ public class ProfileThemedActivity extends CrashReportingActivity { if (profileId == -1) mThemeHue = Colors.DEFAULT_HUE_DEG; + Logger.debug(TAG, + String.format(Locale.US, "initProfile() calling setupProfileColors(%d)", hue)); setupProfileColors(hue); initProfile(profileId); } protected void initProfile(long profileId) { - AsyncTask.execute(() -> initProfileAsync(profileId)); + BaseDAO.runAsync(() -> initProfileSync(profileId)); } - private void initProfileAsync(long profileId) { + private void initProfileSync(long profileId) { ProfileDAO dao = DB.get() .getProfileDAO(); Profile profile = dao.getByIdSync(profileId); @@ -118,6 +122,10 @@ public class ProfileThemedActivity extends CrashReportingActivity { profile = dao.getAnySync(); } + if (profile == null) + Logger.debug(TAG, "No profile could be loaded"); + else + Logger.debug(TAG, String.format(Locale.ROOT, "Profile %d loaded. posting", profileId)); Data.postCurrentProfile(profile); } }