X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FSplashActivity.java;h=3fe204834bb572c05e7e77a8caf5a1687f15699f;hb=6c2ceae7d891f3710a265aaf82722f5ede44520d;hp=7ab3e27937214239f06667aaab7f49b6de8ba5e5;hpb=3eb8ad724a5280845bc3320b52136e3ea699bcf1;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/SplashActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/SplashActivity.java index 7ab3e279..3fe20483 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/SplashActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/SplashActivity.java @@ -20,13 +20,15 @@ package net.ktnx.mobileledger.ui.activity; import android.content.Intent; import android.os.Bundle; import android.os.Handler; +import android.os.Looper; import androidx.annotation.Nullable; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.db.DB; import net.ktnx.mobileledger.utils.Logger; -import net.ktnx.mobileledger.utils.MobileLedgerDatabase; + +import java.util.Locale; public class SplashActivity extends CrashReportingActivity { private static final long keepActiveForMS = 400; @@ -39,8 +41,8 @@ public class SplashActivity extends CrashReportingActivity { setContentView(R.layout.splash_activity_layout); Logger.debug("splash", "onCreate()"); - MobileLedgerDatabase.initComplete.setValue(false); - MobileLedgerDatabase.initComplete.observe(this, this::onDbInitDoneChanged); + DB.initComplete.setValue(false); + DB.initComplete.observe(this, this::onDbInitDoneChanged); } @Override protected void onStart() { @@ -77,8 +79,11 @@ public class SplashActivity extends CrashReportingActivity { if (now > startupTime + keepActiveForMS) startMainActivity(); else { - new Handler().postDelayed(this::startMainActivity, - keepActiveForMS - (now - startupTime)); + final long delay = keepActiveForMS - (now - startupTime); + Logger.debug("splash", + String.format(Locale.ROOT, "Scheduling main activity start in %d milliseconds", + delay)); + new Handler(Looper.getMainLooper()).postDelayed(this::startMainActivity, delay); } } private void startMainActivity() { @@ -102,7 +107,7 @@ public class SplashActivity extends CrashReportingActivity { .getProfileDAO() .getProfileCountSync(); - MobileLedgerDatabase.initComplete.postValue(true); + DB.initComplete.postValue(true); } } }