From 09bb545f5a402a87fab35a485e0ebf03c8575351 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 8 Jan 2020 11:26:50 +0100
Subject: [PATCH] show first run again

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../client/onboarding/FirstRunActivity.java     |  2 ++
 .../android/ui/activity/BaseActivity.java       | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.java b/src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.java
index 8790115ebe73..8eb68e5aea22 100644
--- a/src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.java
+++ b/src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.java
@@ -72,6 +72,8 @@ public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageCh
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        enableAccountHandling = false;
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.first_run_activity);
 
diff --git a/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java b/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java
index a02d2e324dea..fb8741baf6a3 100644
--- a/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java
@@ -8,14 +8,13 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.PersistableBundle;
 
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.preferences.AppPreferences;
-import com.nextcloud.java.util.Optional;
 import com.nextcloud.client.preferences.DarkMode;
+import com.nextcloud.java.util.Optional;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
@@ -54,6 +53,7 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
      */
     private boolean themeChangePending;
     private boolean paused;
+    protected boolean enableAccountHandling = true;
 
     @Inject UserAccountManager accountManager;
     @Inject AppPreferences preferences;
@@ -72,8 +72,11 @@ public UserAccountManager getUserAccountManager() {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Account account = accountManager.getCurrentAccount();
-        setAccount(account, false);
+
+        if (enableAccountHandling) {
+            Account account = accountManager.getCurrentAccount();
+            setAccount(account, false);
+        }
     }
 
     @Override
@@ -175,10 +178,14 @@ protected void setUser(User user) {
     protected void swapToDefaultAccount() {
         // default to the most recently used account
         Account newAccount = accountManager.getCurrentAccount();
+
         if (newAccount == null) {
             /// no account available: force account creation
             createAccount(true);
-            finish();
+
+            if (enableAccountHandling) {
+                finish();
+            }
         } else {
             currentAccount = newAccount;
         }