From 48879df2da87950373593573be924d06956f1030 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Wed, 10 Apr 2019 05:15:20 -0400
Subject: [PATCH] Some cleanups

---
 app/src/main/java/com/topjohnwu/magisk/App.java          | 2 ++
 app/src/main/java/com/topjohnwu/magisk/Const.java        | 1 -
 app/src/main/java/com/topjohnwu/magisk/MainActivity.java | 2 +-
 .../main/java/com/topjohnwu/magisk/SplashActivity.java   | 5 +++--
 .../com/topjohnwu/magisk/components/BaseActivity.java    | 9 ---------
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/App.java b/app/src/main/java/com/topjohnwu/magisk/App.java
index 92fc95cac..14284d949 100644
--- a/app/src/main/java/com/topjohnwu/magisk/App.java
+++ b/app/src/main/java/com/topjohnwu/magisk/App.java
@@ -12,6 +12,7 @@ import android.preference.PreferenceManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDelegate;
 
 import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.database.MagiskDB;
@@ -36,6 +37,7 @@ public class App extends Application implements Application.ActivityLifecycleCal
     private volatile BaseActivity foreground;
 
     static {
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
         Shell.Config.setFlags(Shell.FLAG_MOUNT_MASTER | Shell.FLAG_USE_MAGISK_BUSYBOX);
         Shell.Config.verboseLogging(BuildConfig.DEBUG);
         Shell.Config.addInitializers(RootUtils.class);
diff --git a/app/src/main/java/com/topjohnwu/magisk/Const.java b/app/src/main/java/com/topjohnwu/magisk/Const.java
index 16d4b8eb0..311283b70 100644
--- a/app/src/main/java/com/topjohnwu/magisk/Const.java
+++ b/app/src/main/java/com/topjohnwu/magisk/Const.java
@@ -79,7 +79,6 @@ public class Const {
         public static final String LINK_KEY = "Link";
         public static final String IF_NONE_MATCH = "If-None-Match";
         // intents
-        public static final String FROM_SPLASH = "splash";
         public static final String OPEN_SECTION = "section";
         public static final String INTENT_SET_NAME = "filename";
         public static final String INTENT_SET_LINK = "link";
diff --git a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
index 50fd84651..f98f1977f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
@@ -50,7 +50,7 @@ public class MainActivity extends BaseActivity
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
-        if (!getIntent().getBooleanExtra(Const.Key.FROM_SPLASH, false)) {
+        if (!SplashActivity.DONE) {
             startActivity(new Intent(this, ClassMap.get(SplashActivity.class)));
             finish();
         }
diff --git a/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java b/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
index 3f4700338..91c3722af 100644
--- a/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
@@ -20,6 +20,8 @@ import com.topjohnwu.superuser.Shell;
 
 public class SplashActivity extends BaseActivity {
 
+    public static boolean DONE = false;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -83,8 +85,7 @@ public class SplashActivity extends BaseActivity {
 
         Intent intent = new Intent(this, ClassMap.get(MainActivity.class));
         intent.putExtra(Const.Key.OPEN_SECTION, getIntent().getStringExtra(Const.Key.OPEN_SECTION));
-        intent.putExtra(Const.Key.FROM_SPLASH, true);
-        intent.putExtra(BaseActivity.INTENT_PERM, getIntent().getStringExtra(BaseActivity.INTENT_PERM));
+        DONE = true;
         startActivity(intent);
         finish();
     }
diff --git a/app/src/main/java/com/topjohnwu/magisk/components/BaseActivity.java b/app/src/main/java/com/topjohnwu/magisk/components/BaseActivity.java
index e36ce1e80..8e0918439 100644
--- a/app/src/main/java/com/topjohnwu/magisk/components/BaseActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/components/BaseActivity.java
@@ -14,7 +14,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
 import androidx.collection.SparseArrayCompat;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
@@ -28,7 +27,6 @@ import com.topjohnwu.magisk.utils.LocaleManager;
 
 public abstract class BaseActivity extends AppCompatActivity implements Event.AutoListener {
 
-    public static final String INTENT_PERM = "perm_dialog";
     private static Runnable grantCallback;
 
     static int[] EMPTY_INT_ARRAY = new int[0];
@@ -36,10 +34,6 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
     private SparseArrayCompat<ActivityResultListener> resultListeners = new SparseArrayCompat<>();
     public App app = App.self;
 
-    static {
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
-    }
-
     @Override
     public int[] getListeningEvents() {
         return EMPTY_INT_ARRAY;
@@ -65,9 +59,6 @@ public abstract class BaseActivity extends AppCompatActivity implements Event.Au
             setTheme(getDarkTheme());
         }
         super.onCreate(savedInstanceState);
-        String[] perms = getIntent().getStringArrayExtra(INTENT_PERM);
-        if (perms != null)
-            ActivityCompat.requestPermissions(this, perms, 0);
     }
 
     @Override