1.2148 release

app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.bugsnag.android.gradle'
 apply plugin: 'kotlin-android'
 apply plugin: 'de.undercouch.download'
 
-def getVersionCode = { -> return 2147 }
+def getVersionCode = { -> return 2148 }
 def getRevision = { -> return "a" }
 def getReleaseName = { -> return "Wintonotitan" }
 // https://en.wikipedia.org/wiki/List_of_dinosaur_genera

app/src/main/java/eu/faircode/email/ActivityMain.java

@@ -464,9 +464,8 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
         if ("eula".equals(key)) {
             boolean eula = prefs.getBoolean(key, false);
             if (eula) {
-                // recreate is done without animation
-                finish();
-                startActivity(getIntent());
+                // recreate is done without animation, unfortunately
+                recreate();
             }
         }
     }

app/src/main/java/eu/faircode/email/ActivityView.java

@@ -774,8 +774,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     private void init() {
         Bundle args = new Bundle();
 
-        long account = getIntent().getLongExtra("account", -1);
-
         FragmentBase fragment;
         switch (startup) {
             case "accounts":
@@ -784,15 +782,11 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                 break;
             case "folders":
                 fragment = new FragmentFolders();
-                args.putLong("account", account);
                 args.putBoolean("unified", true);
                 break;
             case "primary":
                 fragment = new FragmentFolders();
-                if (account < 0)
-                    args.putBoolean("primary", true);
-                else
-                    args.putLong("account", account);
+                args.putBoolean("primary", true);
                 break;
             default:
                 fragment = new FragmentMessages();