several fixes when there are no profiles after full room adoption

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / ProfileThemedActivity.java

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 a1beb94be914565384fd5dfa33b8b003586412a6..0b4a1fe012f4950dd52f938983a691df14f7cb34 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java
@@ -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;
             }
 
@@ -118,7 +117,10 @@ public class ProfileThemedActivity extends CrashReportingActivity {
             profile = dao.getAnySync();
         }
 
-        Logger.debug(TAG, String.format(Locale.ROOT, "Profile %d loaded. posting", profileId));
+        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);
     }
 }