From 47e62a568157ccb48e0b8855e301351d9be0c44a Mon Sep 17 00:00:00 2001
From: dvdandroid <davide.intelligent@gmail.com>
Date: Wed, 24 May 2017 21:21:15 +0200
Subject: [PATCH 01/16] Small code cleanup

---
 .../com/topjohnwu/magisk/AboutActivity.java     | 15 ---------------
 .../com/topjohnwu/magisk/SettingsActivity.java  | 15 ---------------
 .../topjohnwu/magisk/components/Activity.java   | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
index 20680e37..44d3298e 100644
--- a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
@@ -13,7 +13,6 @@
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
-import android.view.WindowManager;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.components.AboutCardRow;
@@ -135,18 +134,4 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setFloating();
     }
 
-    public void setFloating() {
-        boolean isTablet = getResources().getBoolean(R.bool.isTablet);
-        if (isTablet) {
-            WindowManager.LayoutParams params = getWindow().getAttributes();
-            params.height = getResources().getDimensionPixelSize(R.dimen.floating_height);
-            params.width = getResources().getDimensionPixelSize(R.dimen.floating_width);
-            params.alpha = 1.0f;
-            params.dimAmount = 0.6f;
-            params.flags |= 2;
-            getWindow().setAttributes(params);
-            setFinishOnTouchOutside(true);
-        }
-    }
-
 }
diff --git a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
index de50b880..bc6fbe2b 100644
--- a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
@@ -9,7 +9,6 @@
 import android.preference.PreferenceScreen;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
-import android.view.WindowManager;
 import android.widget.Toast;
 
 import com.topjohnwu.magisk.asyncs.MagiskHide;
@@ -55,20 +54,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
     }
 
-    public void setFloating() {
-        boolean isTablet = getResources().getBoolean(R.bool.isTablet);
-        if (isTablet) {
-            WindowManager.LayoutParams params = getWindow().getAttributes();
-            params.height = getResources().getDimensionPixelSize(R.dimen.floating_height);
-            params.width = getResources().getDimensionPixelSize(R.dimen.floating_width);
-            params.alpha = 1.0f;
-            params.dimAmount = 0.6f;
-            params.flags |= 2;
-            getWindow().setAttributes(params);
-            setFinishOnTouchOutside(true);
-        }
-    }
-
     public static class SettingsFragment extends PreferenceFragment
             implements SharedPreferences.OnSharedPreferenceChangeListener {
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/components/Activity.java b/app/src/main/java/com/topjohnwu/magisk/components/Activity.java
index 87bcd6b0..055d2b19 100644
--- a/app/src/main/java/com/topjohnwu/magisk/components/Activity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/components/Activity.java
@@ -1,8 +1,10 @@
 package com.topjohnwu.magisk.components;
 
 import android.support.v7.app.AppCompatActivity;
+import android.view.WindowManager;
 
 import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
 
 public class Activity extends AppCompatActivity {
 
@@ -10,4 +12,19 @@ public class Activity extends AppCompatActivity {
     public MagiskManager getApplicationContext() {
         return (MagiskManager) super.getApplicationContext();
     }
+
+    protected void setFloating() {
+        boolean isTablet = getResources().getBoolean(R.bool.isTablet);
+        if (isTablet) {
+            WindowManager.LayoutParams params = getWindow().getAttributes();
+            params.height = getResources().getDimensionPixelSize(R.dimen.floating_height);
+            params.width = getResources().getDimensionPixelSize(R.dimen.floating_width);
+            params.alpha = 1.0f;
+            params.dimAmount = 0.6f;
+            params.flags |= 2;
+            getWindow().setAttributes(params);
+            setFinishOnTouchOutside(true);
+        }
+    }
+
 }

From 738f943a686de0026db79cd41b362e0cf8aa70dc Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 26 May 2017 18:20:53 +0800
Subject: [PATCH 02/16] Several UI tweaks

---
 app/src/main/java/com/topjohnwu/magisk/AboutActivity.java | 6 ++----
 .../main/java/com/topjohnwu/magisk/SettingsActivity.java  | 4 ++--
 .../{activity_container.xml => activity_settings.xml}     | 0
 app/src/main/res/layout/fragment_magisk.xml               | 3 ++-
 app/src/main/res/values-sw600dp/styles.xml                | 8 ++++++++
 app/src/main/res/values/attrs.xml                         | 1 +
 app/src/main/res/values/colors.xml                        | 2 +-
 app/src/main/res/values/styles.xml                        | 6 ++++++
 8 files changed, 22 insertions(+), 8 deletions(-)
 rename app/src/main/res/layout/{activity_container.xml => activity_settings.xml} (100%)

diff --git a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
index 44d3298e..10462811 100644
--- a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
@@ -28,7 +28,7 @@
 
 public class AboutActivity extends Activity {
 
-    private static final String DONATION_URL = "http://topjohnwu.github.io/donate";
+    private static final String DONATION_URL = "https://www.paypal.me/topjohnwu";
     private static final String XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382";
     private static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/MagiskManager";
 
@@ -44,10 +44,8 @@ public class AboutActivity extends Activity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        String theme = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("theme", "");
-        Logger.dev("AboutActivity: Theme is " + theme);
         if (getApplicationContext().isDarkTheme) {
-            setTheme(R.style.AppTheme_Dark);
+            setTheme(R.style.AppTheme_Transparent_Dark);
         }
         setContentView(R.layout.activity_about);
         ButterKnife.bind(this);
diff --git a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
index bc6fbe2b..79581dce 100644
--- a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
@@ -30,10 +30,10 @@ public class SettingsActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getApplicationContext().isDarkTheme) {
-            setTheme(R.style.AppTheme_Dark);
+            setTheme(R.style.AppTheme_Transparent_Dark);
         }
 
-        setContentView(R.layout.activity_container);
+        setContentView(R.layout.activity_settings);
         ButterKnife.bind(this);
 
         setSupportActionBar(toolbar);
diff --git a/app/src/main/res/layout/activity_container.xml b/app/src/main/res/layout/activity_settings.xml
similarity index 100%
rename from app/src/main/res/layout/activity_container.xml
rename to app/src/main/res/layout/activity_settings.xml
diff --git a/app/src/main/res/layout/fragment_magisk.xml b/app/src/main/res/layout/fragment_magisk.xml
index 9592aa94..fe8dbc99 100644
--- a/app/src/main/res/layout/fragment_magisk.xml
+++ b/app/src/main/res/layout/fragment_magisk.xml
@@ -178,7 +178,8 @@
                             android:layout_centerVertical="true"
                             android:layout_margin="15dp"
                             android:layout_toStartOf="@+id/safetyNet_status"
-                            android:src="@drawable/ic_refresh" />
+                            android:src="@drawable/ic_refresh"
+                            android:tint="?attr/imageColorTint" />
 
                         <ProgressBar
                             android:id="@+id/safetyNet_check_progress"
diff --git a/app/src/main/res/values-sw600dp/styles.xml b/app/src/main/res/values-sw600dp/styles.xml
index 003c1247..388ccf1b 100644
--- a/app/src/main/res/values-sw600dp/styles.xml
+++ b/app/src/main/res/values-sw600dp/styles.xml
@@ -9,4 +9,12 @@
         <item name="android:windowNoTitle">true</item>
     </style>
 
+    <style name="AppTheme.Transparent.Dark" parent="AppTheme.Dark">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 7327dc4c..4b67ac85 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -30,5 +30,6 @@
     </declare-styleable>
 
     <attr name="colorAccentFallback" format="reference" />
+    <attr name="imageColorTint" format="reference" />
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 68f9a017..3aaf0ba5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,7 +10,7 @@
     <color name="red500">#F44336</color>
     <color name="green500">#4CAF50</color>
     <color name="grey500">#9E9E9E</color>
-    <color name="blue500">#2196F3</color>
+    <color name="blue500">#2196f3</color>
     <color name="yellow500">#FFC107</color>
 
     <color name="dark_secondary_text">#dedede</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0fb273ef..bb15ff54 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,6 +12,7 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="imageColorTint">@android:color/background_dark</item>
     </style>
 
     <style name="AppTheme.Dark" parent="Theme.AppCompat.NoActionBar">
@@ -24,6 +25,7 @@
         <item name="windowNoTitle">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:textColorSecondary">@color/dark_secondary_text</item>
+        <item name="imageColorTint">@android:color/background_light</item>
     </style>
 
     <style name="CardViewStyle.Dark" parent="CardView">
@@ -38,6 +40,10 @@
         <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
     </style>
 
+    <style name="AppTheme.Transparent.Dark" parent="AppTheme.Dark">
+        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
+    </style>
+
     <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowBackground">@drawable/ic_splash_activity</item>
         <item name="android:windowTranslucentStatus">true</item>

From 2a7d99688167104a3f31be814798a268a6b1bcb8 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 27 May 2017 02:41:24 +0800
Subject: [PATCH 03/16] Add multiuser support

---
 .../com/topjohnwu/magisk/AboutActivity.java   |  2 -
 .../com/topjohnwu/magisk/MagiskManager.java   | 30 +++++---
 .../topjohnwu/magisk/SettingsActivity.java    | 73 +++++++++----------
 .../magisk/services/BootupIntentService.java  | 20 ++---
 app/src/main/res/values/arrays.xml            | 12 +++
 app/src/main/res/values/strings.xml           |  8 ++
 app/src/main/res/xml/app_settings.xml         | 13 ++--
 7 files changed, 84 insertions(+), 74 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
index 10462811..ee744f3c 100644
--- a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
@@ -3,7 +3,6 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
@@ -18,7 +17,6 @@
 import com.topjohnwu.magisk.components.AboutCardRow;
 import com.topjohnwu.magisk.components.Activity;
 import com.topjohnwu.magisk.components.AlertDialogBuilder;
-import com.topjohnwu.magisk.utils.Logger;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
index 5726e073..b5cf1a06 100644
--- a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
@@ -30,6 +30,10 @@ public class MagiskManager extends Application {
     public static final String UNINSTALLER = "magisk_uninstaller.sh";
     public static final String INTENT_SECTION = "section";
     public static final String BUSYBOX_VERSION = "1.26.2";
+    public static final String ROOT_ACCESS_PROP = "persist.magisk.root";
+    public static final String MULTIUSER_MODE_PROP = "persist.magisk.multiuser";
+    public static final String MAGISKHIDE_PROP = "persist.magisk.hide";
+    public static final String DISABLE_INDICATION_PROP = "ro.magisk.disable";
 
     // Events
     public final CallbackEvent<Void> blockDetectionDone = new CallbackEvent<>();
@@ -53,7 +57,6 @@ public class MagiskManager extends Application {
     public boolean isSuClient = false;
     public String suVersion = null;
     public boolean disabled;
-    public boolean magiskHideStarted;
 
     // Data
     public ValueSortedMap<String, Repo> repoMap;
@@ -72,6 +75,7 @@ public class MagiskManager extends Application {
     public int suRequestTimeout;
     public int suLogTimeout = 14;
     public int suAccessState;
+    public int multiuserMode;
     public int suResponseType;
     public int suNotificationType;
 
@@ -130,6 +134,7 @@ public void init() {
                 .putString("su_auto_response", String.valueOf(suResponseType))
                 .putString("su_notification", String.valueOf(suNotificationType))
                 .putString("su_access", String.valueOf(suAccessState))
+                .putString("multiuser_mode", String.valueOf(multiuserMode))
                 .putString("busybox_version", BUSYBOX_VERSION)
                 .apply();
         // Add busybox to PATH
@@ -149,12 +154,17 @@ public void initSuAccess() {
             isSuClient = suVersion.toUpperCase().contains("MAGISK");
         }
         if (isSuClient) {
-            ret = Shell.sh("getprop persist.sys.root_access");
+            ret = Shell.sh("getprop " + ROOT_ACCESS_PROP);
             if (Utils.isValidShellResponse(ret)) {
                 suAccessState = Integer.parseInt(ret.get(0));
             } else {
-                Shell.su(true, "setprop persist.sys.root_access 3");
-                suAccessState = 3;
+                suAccessState = 0;
+            }
+            ret = Shell.sh("getprop " + MULTIUSER_MODE_PROP);
+            if (Utils.isValidShellResponse(ret)) {
+                multiuserMode = Integer.parseInt(ret.get(0));
+            } else {
+                multiuserMode = 0;
             }
         }
     }
@@ -177,21 +187,17 @@ public void updateMagiskInfo() {
                 magiskVersionCode = Integer.parseInt(ret.get(0));
             } catch (NumberFormatException ignored) {}
         }
-        ret = Shell.sh("getprop ro.magisk.disable");
+        ret = Shell.sh("getprop " + DISABLE_INDICATION_PROP);
         try {
             disabled = Utils.isValidShellResponse(ret) && Integer.parseInt(ret.get(0)) != 0;
         } catch (NumberFormatException e) {
             disabled = false;
         }
-        ret = Shell.sh("getprop persist.magisk.hide");
+        ret = Shell.sh("getprop " + MAGISKHIDE_PROP);
         try {
-            magiskHideStarted = Utils.isValidShellResponse(ret) && Integer.parseInt(ret.get(0)) != 0;
+            magiskHide = Utils.isValidShellResponse(ret) && Integer.parseInt(ret.get(0)) != 0;
         } catch (NumberFormatException e) {
-            magiskHideStarted = false;
-        }
-
-        if (magiskHideStarted) {
-            magiskHide = true;
+            magiskHide = false;
         }
         
     }
diff --git a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
index 79581dce..36ac81c5 100644
--- a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
@@ -60,11 +60,8 @@ public static class SettingsFragment extends PreferenceFragment
         private SharedPreferences prefs;
         private PreferenceScreen prefScreen;
 
-        private ListPreference suAccess, autoRes, suNotification, requestTimeout;
-
-        private MagiskManager getApplication() {
-            return Utils.getMagiskManager(getActivity());
-        }
+        private ListPreference suAccess, autoRes, suNotification, requestTimeout, multiuserMode;
+        private MagiskManager magiskManager;
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
@@ -72,6 +69,7 @@ public void onCreate(Bundle savedInstanceState) {
             addPreferencesFromResource(R.xml.app_settings);
             prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
             prefScreen = getPreferenceScreen();
+            magiskManager = Utils.getMagiskManager(getActivity());
 
             PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
             PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
@@ -81,6 +79,7 @@ public void onCreate(Bundle savedInstanceState) {
             autoRes = (ListPreference) findPreference("su_auto_response");
             requestTimeout = (ListPreference) findPreference("su_request_timeout");
             suNotification = (ListPreference) findPreference("su_notification");
+            multiuserMode = (ListPreference) findPreference("multiuser_mode");
 
             setSummary();
 
@@ -97,10 +96,10 @@ public void onCreate(Bundle savedInstanceState) {
                 prefScreen.removePreference(magiskCategory);
                 prefScreen.removePreference(suCategory);
             } else {
-                if (!getApplication().isSuClient) {
+                if (!magiskManager.isSuClient) {
                     prefScreen.removePreference(suCategory);
                 }
-                if (getApplication().magiskVersionCode < 130) {
+                if (magiskManager.magiskVersionCode < 130) {
                     prefScreen.removePreference(magiskCategory);
                 }
             }
@@ -126,9 +125,9 @@ public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
             switch (key) {
                 case "dark_theme":
                     enabled = prefs.getBoolean("dark_theme", false);
-                    if (getApplication().isDarkTheme != enabled) {
-                        getApplication().isDarkTheme = enabled;
-                        getApplication().reloadMainActivity.trigger();
+                    if (magiskManager.isDarkTheme != enabled) {
+                        magiskManager.isDarkTheme = enabled;
+                        magiskManager.reloadMainActivity.trigger();
                         getActivity().recreate();
                     }
                     break;
@@ -148,29 +147,10 @@ protected Void doInBackground(Void... voids) {
                     }.exec();
                     Toast.makeText(getActivity(), R.string.settings_reboot_toast, Toast.LENGTH_LONG).show();
                     break;
-                case "busybox":
-                    enabled = prefs.getBoolean("busybox", false);
-                    new SerialTask<Void, Void, Void>() {
-                        private boolean enable = enabled;
-                        @Override
-                        protected Void doInBackground(Void... voids) {
-                            if (enable) {
-                                Shell.su(
-                                        "setprop persist.magisk.busybox 1",
-                                        "sh /sbin/magic_mask.sh mount_busybox");
-                            } else {
-                                Shell.su(
-                                        "setprop persist.magisk.busybox 0",
-                                        "umount /system/xbin");
-                            }
-                            return null;
-                        }
-                    }.exec();
-                    break;
                 case "magiskhide":
                     enabled = prefs.getBoolean("magiskhide", false);
                     if (enabled) {
-                        if (!getApplication().isSuClient) {
+                        if (!magiskManager.isSuClient) {
                             new AlertDialogBuilder(getActivity())
                                     .setTitle(R.string.no_magisksu_title)
                                     .setMessage(R.string.no_magisksu_msg)
@@ -202,17 +182,32 @@ protected Void doInBackground(Void... voids) {
                     }.exec();
                     break;
                 case "su_access":
-                    getApplication().suAccessState = Utils.getPrefsInt(prefs, "su_access", 0);
-                    Shell.su("setprop persist.sys.root_access " + getApplication().suAccessState);
+                    magiskManager.suAccessState = Utils.getPrefsInt(prefs, "su_access", 0);
+                    new SerialTask<Void, Void, Void>(getActivity()) {
+                        @Override
+                        protected Void doInBackground(Void... params) {
+                            Shell.su("setprop " + MagiskManager.ROOT_ACCESS_PROP + " " + magiskManager.suAccessState);
+                            return null;
+                        }
+                    }.exec();
                     break;
+                case "multiuser_mode":
+                    magiskManager.multiuserMode = Utils.getPrefsInt(prefs, "multiuser_mode", 0);
+                    new SerialTask<Void, Void, Void>(getActivity()) {
+                        @Override
+                        protected Void doInBackground(Void... params) {
+                            Shell.su("setprop " + MagiskManager.MULTIUSER_MODE_PROP + " " + magiskManager.multiuserMode);
+                            return null;
+                        }
+                    }.exec();
                 case "su_request_timeout":
-                    getApplication().suRequestTimeout = Utils.getPrefsInt(prefs, "su_request_timeout", 10);
+                    magiskManager.suRequestTimeout = Utils.getPrefsInt(prefs, "su_request_timeout", 10);
                     break;
                 case "su_auto_response":
-                    getApplication().suResponseType = Utils.getPrefsInt(prefs, "su_auto_response", 0);
+                    magiskManager.suResponseType = Utils.getPrefsInt(prefs, "su_auto_response", 0);
                     break;
                 case "su_notification":
-                    getApplication().suNotificationType = Utils.getPrefsInt(prefs, "su_notification", 1);
+                    magiskManager.suNotificationType = Utils.getPrefsInt(prefs, "su_notification", 1);
                     break;
                 case "developer_logging":
                     MagiskManager.devLogging = prefs.getBoolean("developer_logging", false);
@@ -226,13 +221,15 @@ protected Void doInBackground(Void... voids) {
 
         private void setSummary() {
             suAccess.setSummary(getResources()
-                    .getStringArray(R.array.su_access)[getApplication().suAccessState]);
+                    .getStringArray(R.array.su_access)[magiskManager.suAccessState]);
             autoRes.setSummary(getResources()
-                    .getStringArray(R.array.auto_response)[getApplication().suResponseType]);
+                    .getStringArray(R.array.auto_response)[magiskManager.suResponseType]);
             suNotification.setSummary(getResources()
-                    .getStringArray(R.array.su_notification)[getApplication().suNotificationType]);
+                    .getStringArray(R.array.su_notification)[magiskManager.suNotificationType]);
             requestTimeout.setSummary(
                     getString(R.string.request_timeout_summary, prefs.getString("su_request_timeout", "10")));
+            multiuserMode.setSummary(getResources()
+                    .getStringArray(R.array.multiuser_summary)[magiskManager.multiuserMode]);
         }
     }
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/services/BootupIntentService.java b/app/src/main/java/com/topjohnwu/magisk/services/BootupIntentService.java
index de1f72c5..06aa1c1a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/services/BootupIntentService.java
+++ b/app/src/main/java/com/topjohnwu/magisk/services/BootupIntentService.java
@@ -2,12 +2,6 @@
 
 import android.app.IntentService;
 import android.content.Intent;
-import android.widget.Toast;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.Shell;
-import com.topjohnwu.magisk.utils.Utils;
 
 public class BootupIntentService extends IntentService {
 
@@ -17,14 +11,10 @@ public BootupIntentService() {
 
     @Override
     protected void onHandleIntent(Intent intent) {
-        MagiskManager magiskManager = Utils.getMagiskManager(this);
-        magiskManager.initSuAccess();
-        magiskManager.updateMagiskInfo();
-        if (magiskManager.prefs.getBoolean("magiskhide", false) &&
-                !magiskManager.disabled && !magiskManager.magiskHideStarted && magiskManager.magiskVersionCode >= 130) {
-            magiskManager.toast(R.string.start_magiskhide, Toast.LENGTH_LONG);
-            Shell.su(true, MagiskManager.MAGISK_HIDE_PATH + "enable",
-                    "setprop persist.magisk.hide 1");
-        }
+        /* Currently no bootup task to do
+         MagiskManager magiskManager = Utils.getMagiskManager(this);
+         magiskManager.initSuAccess();
+         magiskManager.updateMagiskInfo();
+         */
     }
 }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 74bf942d..51092a10 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -49,4 +49,16 @@
         <item>@string/toast</item>
     </string-array>
 
+    <string-array name="multiuser_mode">
+        <item>@string/settings_owner_only</item>
+        <item>@string/settings_owner_manage</item>
+        <item>@string/settings_user_independent</item>
+    </string-array>
+
+    <string-array name="multiuser_summary">
+        <item>@string/owner_only_summary</item>
+        <item>@string/owner_manage_summary</item>
+        <item>@string/user_indepenent_summary</item>
+    </string-array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d4e3349..365bad46 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -201,4 +201,12 @@
     <string name="target_uid">Target UID:\u0020</string>
     <string name="command">Command:\u0020</string>
 
+    <string name="multiuser_mode">Multiuser Mode</string>
+    <string name="settings_owner_only">Device Owner Only</string>
+    <string name="settings_owner_manage">Device Owner Managed</string>
+    <string name="settings_user_independent">User Independent</string>
+    <string name="owner_only_summary">Only owner has root access</string>
+    <string name="owner_manage_summary">Only owner can manage root access and receive request prompts</string>
+    <string name="user_indepenent_summary">Each user has its own separate root rules</string>
+
 </resources>
diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml
index d5ffc6f5..bfc8e395 100644
--- a/app/src/main/res/xml/app_settings.xml
+++ b/app/src/main/res/xml/app_settings.xml
@@ -31,13 +31,6 @@
             android:title="@string/settings_core_only_title"
             android:summary="@string/settings_core_only_summary" />
 
-        <!-- No more busybox -->
-        <!--<SwitchPreference-->
-            <!--android:key="busybox"-->
-            <!--android:defaultValue="false"-->
-            <!--android:title="@string/settings_busybox_title"-->
-            <!--android:summary="@string/settings_busybox_summary" />-->
-
         <SwitchPreference
             android:key="magiskhide"
             android:defaultValue="false"
@@ -62,6 +55,12 @@
             android:entries="@array/su_access"
             android:entryValues="@array/value_array" />
 
+        <ListPreference
+            android:key="multiuser_mode"
+            android:title="@string/multiuser_mode"
+            android:entries="@array/multiuser_mode"
+            android:entryValues="@array/value_array" />
+
         <ListPreference
             android:key="su_auto_response"
             android:title="@string/auto_response"

From 44e36feb09dc1d07c2c6c0637c32b67a2f88cbdc Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 28 May 2017 00:16:10 +0800
Subject: [PATCH 04/16] Improve multiuser settings and notification

---
 .../topjohnwu/magisk/SettingsActivity.java    |  6 ++++
 .../magisk/superuser/SuReceiver.java          | 21 ++++++++++----
 .../magisk/superuser/SuRequestActivity.java   | 29 +++++++++++--------
 app/src/main/res/values/strings.xml           | 17 ++++++-----
 4 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
index 36ac81c5..fd345455 100644
--- a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
@@ -83,6 +83,12 @@ public void onCreate(Bundle savedInstanceState) {
 
             setSummary();
 
+            // Disable dangerous settings in user mode if selected owner manage
+            if (getActivity().getApplicationInfo().uid > 99999) {
+                prefScreen.removePreference(magiskCategory);
+                prefScreen.removePreference(suCategory);
+            }
+
             findPreference("clear").setOnPreferenceClickListener((pref) -> {
                 Utils.clearRepoCache(getActivity());
                 return true;
diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java b/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java
index 66ed3649..0374f74a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java
+++ b/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java
@@ -17,11 +17,13 @@ public class SuReceiver extends BroadcastReceiver {
 
     private static final int NO_NOTIFICATION = 0;
     private static final int TOAST = 1;
-
+    private static final int NOTIFY_NORMAL_LOG = 0;
+    private static final int NOTIFY_USER_TOASTS = 1;
+    private static final int NOTIFY_USER_TO_OWNER = 2;
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        int fromUid, toUid, pid;
+        int fromUid, toUid, pid, mode;
         String command, action;
         Policy policy;
 
@@ -29,6 +31,14 @@ public void onReceive(Context context, Intent intent) {
 
         if (intent == null) return;
 
+        mode = intent.getIntExtra("mode", -1);
+        if (mode < 0) return;
+
+        if (mode == NOTIFY_USER_TO_OWNER) {
+            magiskManager.toast(R.string.multiuser_hint_owner_request, Toast.LENGTH_LONG);
+            return;
+        }
+
         fromUid = intent.getIntExtra("from.uid", -1);
         if (fromUid < 0) return;
         if (fromUid == Process.myUid()) return; // Don't show anything if it's Magisk Manager
@@ -64,10 +74,11 @@ public void onReceive(Context context, Intent intent) {
                 return;
         }
 
-        if (policy.notification && magiskManager.suNotificationType == TOAST)
-            Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
+        if (policy.notification && magiskManager.suNotificationType == TOAST) {
+            magiskManager.toast(message, Toast.LENGTH_SHORT);
+        }
 
-        if (policy.logging) {
+        if (mode == NOTIFY_NORMAL_LOG && policy.logging) {
             toUid = intent.getIntExtra("to.uid", -1);
             if (toUid < 0) return;
             pid = intent.getIntExtra("pid", -1);
diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java b/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
index 7d71b2eb..702e7ce0 100644
--- a/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
@@ -55,6 +55,7 @@ public class SuRequestActivity extends Activity implements CallbackEvent.Listene
     private MagiskManager magiskManager;
 
     private int uid;
+    private boolean hasTimeout;
     private Policy policy;
     private CountDownTimer timer;
     private CallbackEvent.Listener<Policy> self;
@@ -70,6 +71,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Intent intent = getIntent();
         socketPath = intent.getStringExtra("socket");
+        hasTimeout = intent.getBooleanExtra("timeout", true);
         self = this;
 
         new FileObserver(socketPath) {
@@ -87,7 +89,13 @@ public void onEvent(int fileEvent, String path) {
         new SocketManager(this).exec();
     }
 
-    void showRequest() {
+    private boolean cancelTimeout() {
+        timer.cancel();
+        deny_btn.setText(getString(R.string.deny));
+        return false;
+    }
+
+    private void showRequest() {
 
         switch (magiskManager.suResponseType) {
             case AUTO_DENY:
@@ -126,17 +134,14 @@ public void onFinish() {
 
         grant_btn.setOnClickListener(v -> handleAction(Policy.ALLOW));
         deny_btn.setOnClickListener(v -> handleAction(Policy.DENY));
-        suPopup.setOnClickListener((v) -> {
-            timer.cancel();
-            deny_btn.setText(getString(R.string.deny));
-        });
-        timeout.setOnTouchListener((v, event) -> {
-            timer.cancel();
-            deny_btn.setText(getString(R.string.deny));
-            return false;
-        });
-
-        timer.start();
+        suPopup.setOnClickListener((v) -> cancelTimeout());
+        timeout.setOnTouchListener((v, event) -> cancelTimeout());
+
+        if (hasTimeout) {
+            timer.start();
+        } else {
+            cancelTimeout();
+        }
     }
 
     @Override
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 365bad46..936757d9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -162,6 +162,15 @@
     <string name="superuser_notification">Superuser Notification</string>
     <string name="request_timeout_summary">%1$s seconds</string>
 
+    <string name="multiuser_mode">Multiuser Mode</string>
+    <string name="settings_owner_only">Device Owner Only</string>
+    <string name="settings_owner_manage">Device Owner Managed</string>
+    <string name="settings_user_independent">User Independent</string>
+    <string name="owner_only_summary">Only owner has root access</string>
+    <string name="owner_manage_summary">Only owner can manage root access and receive request prompts</string>
+    <string name="user_indepenent_summary">Each user has its own separate root rules</string>
+    <string name="multiuser_hint_owner_request">A request has been sent to the device owner. Please switch to the owner and grant the permission</string>
+
     <string name="settings_development_category">App Development</string>
     <string name="settings_developer_logging_title">Enable advanced debug logging</string>
     <string name="settings_developer_logging_summary">Check this to enable verbose logging</string>
@@ -201,12 +210,4 @@
     <string name="target_uid">Target UID:\u0020</string>
     <string name="command">Command:\u0020</string>
 
-    <string name="multiuser_mode">Multiuser Mode</string>
-    <string name="settings_owner_only">Device Owner Only</string>
-    <string name="settings_owner_manage">Device Owner Managed</string>
-    <string name="settings_user_independent">User Independent</string>
-    <string name="owner_only_summary">Only owner has root access</string>
-    <string name="owner_manage_summary">Only owner can manage root access and receive request prompts</string>
-    <string name="user_indepenent_summary">Each user has its own separate root rules</string>
-
 </resources>

From 5af07c4531473e283ce165ca8a450011773b2724 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 28 May 2017 01:44:29 +0800
Subject: [PATCH 05/16] Update Traditional Chinese translate

---
 app/src/main/res/values-zh-rTW/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ec4ae7e5..ca3b7c73 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -197,5 +197,13 @@
     <string name="safetyNet_network_loss">網路斷線</string>
     <string name="safetyNet_res_invalid">回傳值無效</string>
     <string name="safetyNet_service_disconnected">服務已被取消</string>
+    <string name="multiuser_hint_owner_request">已發送權限請求到擁有者帳戶中。請切換到擁有者帳戶進行准許</string>
+    <string name="multiuser_mode">多使用者設定</string>
+    <string name="owner_manage_summary">僅裝置擁有者帳戶能管理超級用戶權限並接收權限請求通知</string>
+    <string name="owner_only_summary">僅裝置擁有者帳戶有超級用戶權限</string>
+    <string name="user_indepenent_summary">每一位使用者有獨立的權限規則</string>
+    <string name="settings_user_independent">各使用者獨立</string>
+    <string name="settings_owner_only">僅裝置擁有者</string>
+    <string name="settings_owner_manage">由裝置擁有者管理</string>
 
 </resources>

From a573baea038afadad19f7b158b6b81849097f05e Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Tue, 30 May 2017 01:27:10 +0800
Subject: [PATCH 06/16] Simplify SU requests, binary should be much superior
 now

---
 .../com/topjohnwu/magisk/MagiskManager.java   |  10 +-
 .../magisk/services/BootupIntentService.java  |   8 +-
 .../topjohnwu/magisk/superuser/Policy.java    |   2 +-
 .../magisk/superuser/RequestActivity.java     |   2 +-
 .../magisk/superuser/SuReceiver.java          |   2 +-
 .../magisk/superuser/SuRequestActivity.java   | 121 ++++++++----------
 6 files changed, 62 insertions(+), 83 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
index b5cf1a06..1893358e 100644
--- a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
@@ -108,11 +108,10 @@ public void init() {
         }
         magiskHide = prefs.getBoolean("magiskhide", false);
         updateNotification = prefs.getBoolean("notification", true);
+        initSU();
         // Always start a new root shell manually, just for safety
         Shell.init();
         updateMagiskInfo();
-        initSuAccess();
-        initSuConfigs();
         // Initialize busybox
         File busybox = new File(getApplicationInfo().dataDir + "/busybox/busybox");
         if (!busybox.exists() || !TextUtils.equals(prefs.getString("busybox_version", ""), BUSYBOX_VERSION)) {
@@ -141,13 +140,14 @@ public void init() {
         Shell.su("PATH=$PATH:" + busybox.getParent());
     }
 
-    public void initSuConfigs() {
+    public void initSU() {
+        // Create the app data directory, so su binary can work properly
+        new File(getApplicationInfo().dataDir).mkdirs();
+
         suRequestTimeout = Utils.getPrefsInt(prefs, "su_request_timeout", 10);
         suResponseType = Utils.getPrefsInt(prefs, "su_auto_response", 0);
         suNotificationType = Utils.getPrefsInt(prefs, "su_notification", 1);
-    }
 
-    public void initSuAccess() {
         List<String> ret = Shell.sh("su -v");
         if (Utils.isValidShellResponse(ret)) {
             suVersion = ret.get(0);
diff --git a/app/src/main/java/com/topjohnwu/magisk/services/BootupIntentService.java b/app/src/main/java/com/topjohnwu/magisk/services/BootupIntentService.java
index 06aa1c1a..b15ec7bc 100644
--- a/app/src/main/java/com/topjohnwu/magisk/services/BootupIntentService.java
+++ b/app/src/main/java/com/topjohnwu/magisk/services/BootupIntentService.java
@@ -3,6 +3,8 @@
 import android.app.IntentService;
 import android.content.Intent;
 
+import com.topjohnwu.magisk.MagiskManager;
+
 public class BootupIntentService extends IntentService {
 
     public BootupIntentService() {
@@ -11,10 +13,6 @@ public BootupIntentService() {
 
     @Override
     protected void onHandleIntent(Intent intent) {
-        /* Currently no bootup task to do
-         MagiskManager magiskManager = Utils.getMagiskManager(this);
-         magiskManager.initSuAccess();
-         magiskManager.updateMagiskInfo();
-         */
+        ((MagiskManager) getApplication()).initSU();
     }
 }
diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java b/app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java
index 54b1080f..34f9266e 100644
--- a/app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java
+++ b/app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java
@@ -11,7 +11,7 @@ public class Policy {
     public static final int DENY = 1;
     public static final int ALLOW = 2;
 
-    public int uid, policy;
+    public int uid, policy = INTERACTIVE;
     public long until;
     public boolean logging = true, notification = true;
     public String packageName, appName;
diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/RequestActivity.java b/app/src/main/java/com/topjohnwu/magisk/superuser/RequestActivity.java
index 9a52b894..0267e573 100644
--- a/app/src/main/java/com/topjohnwu/magisk/superuser/RequestActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/superuser/RequestActivity.java
@@ -17,7 +17,7 @@ protected void onCreate(Bundle savedInstanceState) {
             return;
         }
 
-        getApplicationContext().initSuConfigs();
+        getApplicationContext().initSU();
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setClass(this, SuRequestActivity.class);
         startActivity(intent);
         finish();
diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java b/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java
index 0374f74a..fbd72f03 100644
--- a/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java
+++ b/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java
@@ -56,7 +56,7 @@ public void onReceive(Context context, Intent intent) {
             }
         }
 
-        magiskManager.initSuConfigs();
+        magiskManager.initSU();
 
         SuLogEntry log = new SuLogEntry(policy);
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java b/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
index 702e7ce0..d0946fa1 100644
--- a/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
@@ -23,20 +23,18 @@
 import com.topjohnwu.magisk.components.Activity;
 import com.topjohnwu.magisk.database.SuDatabaseHelper;
 import com.topjohnwu.magisk.utils.CallbackEvent;
+import com.topjohnwu.magisk.utils.Logger;
 
 import java.io.DataInputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class SuRequestActivity extends Activity implements CallbackEvent.Listener<Policy> {
+public class SuRequestActivity extends Activity {
 
     private static final int[] timeoutList = {0, -1, 10, 20, 30, 60};
-    private static final int SU_PROTOCOL_PARAM_MAX = 20;
-    private static final int SU_PROTOCOL_NAME_MAX = 20;
-    private static final int SU_PROTOCOL_VALUE_MAX = 256;
-
     private static final int PROMPT = 0;
     private static final int AUTO_DENY = 1;
     private static final int AUTO_ALLOW = 2;
@@ -53,13 +51,11 @@ public class SuRequestActivity extends Activity implements CallbackEvent.Listene
     private LocalSocket socket;
     private PackageManager pm;
     private MagiskManager magiskManager;
+    private SuDatabaseHelper suDB;
 
-    private int uid;
     private boolean hasTimeout;
     private Policy policy;
     private CountDownTimer timer;
-    private CallbackEvent.Listener<Policy> self;
-    private CallbackEvent<Policy> event = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -68,19 +64,16 @@ protected void onCreate(Bundle savedInstanceState) {
 
         pm = getPackageManager();
         magiskManager = getApplicationContext();
+        suDB = new SuDatabaseHelper(this);
 
         Intent intent = getIntent();
         socketPath = intent.getStringExtra("socket");
         hasTimeout = intent.getBooleanExtra("timeout", true);
-        self = this;
 
         new FileObserver(socketPath) {
             @Override
             public void onEvent(int fileEvent, String path) {
                 if (fileEvent == FileObserver.DELETE_SELF) {
-                    if (event != null) {
-                        event.trigger();
-                    }
                     finish();
                 }
             }
@@ -97,6 +90,8 @@ private boolean cancelTimeout() {
 
     private void showRequest() {
 
+        Logger.debug("Show request");
+
         switch (magiskManager.suResponseType) {
             case AUTO_DENY:
                 handleAction(Policy.DENY, 0);
@@ -108,6 +103,12 @@ private void showRequest() {
             default:
         }
 
+        // If not interactive, response directly
+        if (policy.policy != Policy.INTERACTIVE) {
+            handleAction();
+            return;
+        }
+
         setContentView(R.layout.activity_request);
         ButterKnife.bind(this);
 
@@ -128,13 +129,19 @@ public void onTick(long millisUntilFinished) {
             @Override
             public void onFinish() {
                 deny_btn.setText(getString(R.string.deny_with_str, "(0)"));
-                event.trigger();
+                handleAction(Policy.DENY);
             }
         };
 
-        grant_btn.setOnClickListener(v -> handleAction(Policy.ALLOW));
-        deny_btn.setOnClickListener(v -> handleAction(Policy.DENY));
-        suPopup.setOnClickListener((v) -> cancelTimeout());
+        grant_btn.setOnClickListener(v -> {
+            handleAction(Policy.ALLOW);
+            timer.cancel();
+        });
+        deny_btn.setOnClickListener(v -> {
+            handleAction(Policy.DENY);
+            timer.cancel();
+        });
+        suPopup.setOnClickListener(v -> cancelTimeout());
         timeout.setOnTouchListener((v, event) -> cancelTimeout());
 
         if (hasTimeout) {
@@ -146,19 +153,25 @@ public void onFinish() {
 
     @Override
     public void onBackPressed() {
-        event.trigger();
+        if (policy != null) {
+            handleAction(Policy.DENY);
+        }
+        finish();
     }
 
-    @Override
-    public void onTrigger(CallbackEvent<Policy> event) {
-        Policy policy = event.getResult();
-        String response = "socket:DENY";
-        if (policy != null &&policy.policy == Policy.ALLOW ) {
+    void handleAction() {
+        String response;
+        if (policy.policy == Policy.ALLOW) {
             response = "socket:ALLOW";
+        } else {
+            response = "socket:DENY";
         }
         try {
             socket.getOutputStream().write((response).getBytes());
-        } catch (Exception ignored) {}
+            socket.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
         finish();
     }
 
@@ -168,16 +181,16 @@ void handleAction(int action) {
 
     void handleAction(int action, int time) {
         policy.policy = action;
-        event.trigger(policy);
         if (time >= 0) {
-            policy.until = time == 0 ? 0 : (System.currentTimeMillis() / 1000 + time * 60);
+            policy.until = (time == 0) ? 0 : (System.currentTimeMillis() / 1000 + time * 60);
             new SuDatabaseHelper(this).addPolicy(policy);
         }
+        handleAction();
     }
 
     private class SocketManager extends ParallelTask<Void, Void, Boolean> {
 
-        public SocketManager(Activity context) {
+        SocketManager(Activity context) {
             super(context);
         }
 
@@ -188,40 +201,33 @@ protected Boolean doInBackground(Void... params) {
                 socket.connect(new LocalSocketAddress(socketPath, LocalSocketAddress.Namespace.FILESYSTEM));
 
                 DataInputStream is = new DataInputStream(socket.getInputStream());
-
                 ContentValues payload = new ContentValues();
 
-                for (int i = 0; i < SU_PROTOCOL_PARAM_MAX; i++) {
-
+                while (true) {
                     int nameLen = is.readInt();
-                    if (nameLen > SU_PROTOCOL_NAME_MAX)
-                        throw new IllegalArgumentException("name length too long: " + nameLen);
-
                     byte[] nameBytes = new byte[nameLen];
                     is.readFully(nameBytes);
-
                     String name = new String(nameBytes);
-
                     if (TextUtils.equals(name, "eof"))
                         break;
 
                     int dataLen = is.readInt();
-                    if (dataLen > SU_PROTOCOL_VALUE_MAX)
-                        throw new IllegalArgumentException(name + " data length too long: " + dataLen);
-
                     byte[] dataBytes = new byte[dataLen];
                     is.readFully(dataBytes);
-
                     String data = new String(dataBytes);
-
                     payload.put(name, data);
                 }
 
-                if (payload.getAsInteger("uid") == null)
+                if (payload.getAsInteger("uid") == null) {
                     return false;
-                uid = payload.getAsInteger("uid");
+                }
 
-            } catch (IOException e) {
+                int uid = payload.getAsInteger("uid");
+                policy = suDB.getPolicy(uid);
+                if (policy == null) {
+                    policy = new Policy(uid, pm);
+                }
+            } catch (Exception e) {
                 e.printStackTrace();
                 return false;
             }
@@ -230,35 +236,10 @@ protected Boolean doInBackground(Void... params) {
 
         @Override
         protected void onPostExecute(Boolean result) {
-            if (!result) {
+            if (result) {
+                showRequest();
+            } else {
                 finish();
-                return;
-            }
-            boolean showRequest = false;
-            event = magiskManager.uidSuRequest.get(uid);
-            if (event == null) {
-                showRequest = true;
-                event = new CallbackEvent<Policy>() {
-                    @Override
-                    public void trigger(Policy result) {
-                        super.trigger(result);
-                        unRegister();
-                        magiskManager.uidSuRequest.remove(uid);
-                    }
-                };
-                magiskManager.uidSuRequest.put(uid, event);
-            }
-            event.register(self);
-            try {
-                if (showRequest) {
-                    policy = new Policy(uid, pm);
-                    showRequest();
-                } else {
-                    finish();
-                }
-            } catch (PackageManager.NameNotFoundException e) {
-                e.printStackTrace();
-                event.trigger();
             }
         }
     }

From 29096eb5d7ca76c45046d1f6aad8bbe98c7201bf Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Wed, 31 May 2017 16:31:33 +0800
Subject: [PATCH 07/16] Monitor package (un)install events

---
 app/src/main/AndroidManifest.xml              | 16 +++++--
 .../com/topjohnwu/magisk/MagiskManager.java   | 13 ++++--
 .../magisk/adapters/PolicyAdapter.java        | 10 ++---
 .../magisk/database/SuDatabaseHelper.java     | 35 +++++++++++-----
 .../magisk/receivers/PackageReceiver.java     | 42 +++++++++++++++++++
 .../magisk/superuser/RequestActivity.java     |  2 +-
 .../magisk/superuser/SuReceiver.java          |  2 +-
 .../magisk/superuser/SuRequestActivity.java   |  3 --
 app/src/main/res/values/strings.xml           |  2 +
 app/src/main/res/xml/app_settings.xml         | 16 +++----
 10 files changed, 107 insertions(+), 34 deletions(-)
 create mode 100644 app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ea3d526a..f003aa17 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.topjohnwu.magisk"
-          xmlns:android="http://schemas.android.com/apk/res/android"
-
-          xmlns:tools="http://schemas.android.com/tools">
+<manifest
+    package="com.topjohnwu.magisk"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -61,6 +61,14 @@
             </intent-filter>
         </receiver>
 
+        <receiver android:name=".receivers.PackageReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_ADDED" />
+                <action android:name="android.intent.action.PACKAGE_REMOVED" />
+                <data android:scheme="package" />
+            </intent-filter>
+        </receiver>
+
         <service android:name=".services.BootupIntentService" />
 
         <service
diff --git a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
index 1893358e..52dcec89 100644
--- a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
@@ -72,6 +72,7 @@ public class MagiskManager extends Application {
     public boolean magiskHide;
     public boolean isDarkTheme;
     public boolean updateNotification;
+    public boolean suReauth;
     public int suRequestTimeout;
     public int suLogTimeout = 14;
     public int suAccessState;
@@ -129,6 +130,7 @@ public void init() {
                 .putBoolean("notification", updateNotification)
                 .putBoolean("hosts", new File("/magisk/.core/hosts").exists())
                 .putBoolean("disable", Utils.itemExist(MAGISK_DISABLE_FILE))
+                .putBoolean("su_reauth", suReauth)
                 .putString("su_request_timeout", String.valueOf(suRequestTimeout))
                 .putString("su_auto_response", String.valueOf(suResponseType))
                 .putString("su_notification", String.valueOf(suNotificationType))
@@ -140,13 +142,18 @@ public void init() {
         Shell.su("PATH=$PATH:" + busybox.getParent());
     }
 
+    public void initSUConfig() {
+        suRequestTimeout = Utils.getPrefsInt(prefs, "su_request_timeout", 10);
+        suResponseType = Utils.getPrefsInt(prefs, "su_auto_response", 0);
+        suNotificationType = Utils.getPrefsInt(prefs, "su_notification", 1);
+        suReauth = prefs.getBoolean("su_reauth", false);
+    }
+
     public void initSU() {
         // Create the app data directory, so su binary can work properly
         new File(getApplicationInfo().dataDir).mkdirs();
 
-        suRequestTimeout = Utils.getPrefsInt(prefs, "su_request_timeout", 10);
-        suResponseType = Utils.getPrefsInt(prefs, "su_auto_response", 0);
-        suNotificationType = Utils.getPrefsInt(prefs, "su_notification", 1);
+        initSUConfig();
 
         List<String> ret = Shell.sh("su -v");
         if (Utils.isValidShellResponse(ret)) {
diff --git a/app/src/main/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java b/app/src/main/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
index 63aaff33..524a2faf 100644
--- a/app/src/main/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
+++ b/app/src/main/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
@@ -72,7 +72,7 @@ public void onBindViewHolder(ViewHolder holder, int position) {
                     String message = v.getContext().getString(
                             isChecked ? R.string.su_snack_grant : R.string.su_snack_deny, policy.appName);
                     SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                    dbHelper.addPolicy(policy);
+                    dbHelper.updatePolicy(policy);
                 }
             });
             holder.notificationSwitch.setOnCheckedChangeListener((v, isChecked) -> {
@@ -82,7 +82,7 @@ public void onBindViewHolder(ViewHolder holder, int position) {
                     String message = v.getContext().getString(
                             isChecked ? R.string.su_snack_notif_on : R.string.su_snack_notif_off, policy.appName);
                     SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                    dbHelper.addPolicy(policy);
+                    dbHelper.updatePolicy(policy);
                 }
             });
             holder.loggingSwitch.setOnCheckedChangeListener((v, isChecked) -> {
@@ -92,7 +92,7 @@ public void onBindViewHolder(ViewHolder holder, int position) {
                     String message = v.getContext().getString(
                             isChecked ? R.string.su_snack_log_on : R.string.su_snack_log_off, policy.appName);
                     SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                    dbHelper.addPolicy(policy);
+                    dbHelper.updatePolicy(policy);
                 }
             });
             holder.delete.setOnClickListener(v -> new AlertDialogBuilder(v.getContext())
@@ -104,7 +104,7 @@ public void onBindViewHolder(ViewHolder holder, int position) {
                         notifyItemRangeChanged(position, policyList.size());
                         SnackbarMaker.make(holder.itemView, v.getContext().getString(R.string.su_snack_revoke, policy.appName),
                                 Snackbar.LENGTH_SHORT).show();
-                        dbHelper.deletePolicy(policy.uid);
+                        dbHelper.deletePolicy(policy);
                     })
                     .setNegativeButton(R.string.no_thanks, null)
                     .setCancelable(true)
@@ -118,7 +118,7 @@ public void onBindViewHolder(ViewHolder holder, int position) {
 
         } catch (PackageManager.NameNotFoundException e) {
             policyList.remove(position);
-            dbHelper.deletePolicy(policy.uid);
+            dbHelper.deletePolicy(policy);
             onBindViewHolder(holder, position);
         }
     }
diff --git a/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java b/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
index 7ab22304..ab03a58f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
+++ b/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
@@ -37,11 +37,11 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         // Currently new database, no upgrading
     }
 
-    public boolean deletePolicy(int uid) {
+    public boolean deletePolicy(Policy policy) {
         SQLiteDatabase db = getWritableDatabase();
-        db.delete(TABLE_NAME, "uid=?", new String[] { String.valueOf(uid) });
+        db.delete(TABLE_NAME, "package_name=?", new String[] { policy.packageName });
         db.close();
-        return getPolicy(uid) == null;
+        return getPolicy(policy.packageName) == null;
     }
 
     public Policy getPolicy(int uid) {
@@ -56,27 +56,42 @@ public Policy getPolicy(int uid) {
         return policy;
     }
 
+    public Policy getPolicy(String pkg) {
+        Policy policy = null;
+        SQLiteDatabase db = getReadableDatabase();
+        try (Cursor c = db.query(TABLE_NAME, null, "package_name=?", new String[] { pkg }, null, null, null)) {
+            if (c.moveToNext()) {
+                policy = new Policy(c);
+            }
+        }
+        db.close();
+        return policy;
+    }
+
     public void addPolicy(Policy policy) {
         SQLiteDatabase db = getWritableDatabase();
         db.replace(TABLE_NAME, null, policy.getContentValues());
         db.close();
     }
 
+    public void updatePolicy(Policy policy) {
+        SQLiteDatabase db = getWritableDatabase();
+        db.update(TABLE_NAME, policy.getContentValues(), "package_name=?",
+                new String[] { policy.packageName });
+        db.close();
+    }
+
     public List<Policy> getPolicyList(PackageManager pm) {
         List<Policy> ret = new ArrayList<>();
         SQLiteDatabase db = getWritableDatabase();
         Policy policy;
         // Clear outdated policies
-        db.delete(TABLE_NAME, "until > 0 and until < ?", new String[] { String.valueOf(System.currentTimeMillis()) });
+        db.delete(TABLE_NAME, "until > 0 AND until < ?",
+                new String[] { String.valueOf(System.currentTimeMillis()) });
         try (Cursor c = db.query(TABLE_NAME, null, null, null, null, null, "app_name ASC")) {
             while (c.moveToNext()) {
                 policy = new Policy(c);
-                // Package is uninstalled
-                if (pm.getPackagesForUid(policy.uid) == null) {
-                    deletePolicy(policy.uid);
-                } else {
-                    ret.add(policy);
-                }
+                ret.add(policy);
             }
         }
         db.close();
diff --git a/app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java b/app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java
new file mode 100644
index 00000000..d31e6344
--- /dev/null
+++ b/app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java
@@ -0,0 +1,42 @@
+package com.topjohnwu.magisk.receivers;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.database.SuDatabaseHelper;
+import com.topjohnwu.magisk.superuser.Policy;
+import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.utils.Utils;
+
+public class PackageReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        SuDatabaseHelper suDB = new SuDatabaseHelper(context);
+        String pkg = intent.getData().getEncodedSchemeSpecificPart();
+        Policy policy = suDB.getPolicy(pkg);
+        if (policy == null)
+            return;
+
+        MagiskManager magiskManager = Utils.getMagiskManager(context);
+        magiskManager.initSUConfig();
+
+        switch (intent.getAction()) {
+            case Intent.ACTION_PACKAGE_ADDED:
+                int uid = intent.getIntExtra(Intent.EXTRA_UID, -1);
+                // Update the UID if available
+                if (uid > 0) {
+                    policy.uid = uid % 100000;
+                }
+                suDB.updatePolicy(policy);
+                return;
+            case Intent.ACTION_PACKAGE_REMOVED:
+                boolean isUpdate = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);
+                if (!isUpdate || magiskManager.suReauth) {
+                    suDB.deletePolicy(policy);
+                }
+                break;
+        }
+    }
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/RequestActivity.java b/app/src/main/java/com/topjohnwu/magisk/superuser/RequestActivity.java
index 0267e573..c8bc6a57 100644
--- a/app/src/main/java/com/topjohnwu/magisk/superuser/RequestActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/superuser/RequestActivity.java
@@ -17,7 +17,7 @@ protected void onCreate(Bundle savedInstanceState) {
             return;
         }
 
-        getApplicationContext().initSU();
+        getApplicationContext().initSUConfig();
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setClass(this, SuRequestActivity.class);
         startActivity(intent);
         finish();
diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java b/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java
index fbd72f03..d6d1752c 100644
--- a/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java
+++ b/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java
@@ -56,7 +56,7 @@ public void onReceive(Context context, Intent intent) {
             }
         }
 
-        magiskManager.initSU();
+        magiskManager.initSUConfig();
 
         SuLogEntry log = new SuLogEntry(policy);
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java b/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
index d0946fa1..a11358f5 100644
--- a/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
@@ -89,9 +89,6 @@ private boolean cancelTimeout() {
     }
 
     private void showRequest() {
-
-        Logger.debug("Show request");
-
         switch (magiskManager.suResponseType) {
             case AUTO_DENY:
                 handleAction(Policy.DENY, 0);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 936757d9..309e9911 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -161,6 +161,8 @@
     <string name="request_timeout">Request Timeout</string>
     <string name="superuser_notification">Superuser Notification</string>
     <string name="request_timeout_summary">%1$s seconds</string>
+    <string name="settings_su_reauth_title">Re-authenticate after upgrade</string>
+    <string name="settings_su_reauth_summary">Re-authenticate superuser permissions after an application upgrades</string>
 
     <string name="multiuser_mode">Multiuser Mode</string>
     <string name="settings_owner_only">Device Owner Only</string>
diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml
index bfc8e395..182f2def 100644
--- a/app/src/main/res/xml/app_settings.xml
+++ b/app/src/main/res/xml/app_settings.xml
@@ -5,15 +5,14 @@
         android:title="@string/settings_general_category">
 
         <SwitchPreference
-            android:defaultValue="false"
+            android:key="dark_theme"
             android:title="@string/settings_dark_theme_title"
-            android:summary="@string/settings_dark_theme_summary"
-            android:key="dark_theme" />
+            android:summary="@string/settings_dark_theme_summary" />
 
         <SwitchPreference
+            android:key="notification"
             android:title="@string/settings_notification_title"
-            android:summary="@string/settings_notification_summary"
-            android:key="notification" />
+            android:summary="@string/settings_notification_summary" />
 
         <Preference
             android:key="clear"
@@ -33,13 +32,11 @@
 
         <SwitchPreference
             android:key="magiskhide"
-            android:defaultValue="false"
             android:title="@string/magiskhide"
             android:summary="@string/settings_magiskhide_summary" />
 
         <SwitchPreference
             android:key="hosts"
-            android:defaultValue="false"
             android:title="@string/settings_hosts_title"
             android:summary="@string/settings_hosts_summary" />
 
@@ -79,6 +76,11 @@
             android:entries="@array/su_notification"
             android:entryValues="@array/value_array" />
 
+        <SwitchPreference
+            android:key="su_reauth"
+            android:title="@string/settings_su_reauth_title"
+            android:summary="@string/settings_su_reauth_summary"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory

From 27879c3f0131407771e2b33825ba631d54c41d79 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Wed, 31 May 2017 17:43:55 +0800
Subject: [PATCH 08/16] Improve Logger

---
 .../com/topjohnwu/magisk/utils/Logger.java    | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Logger.java b/app/src/main/java/com/topjohnwu/magisk/utils/Logger.java
index 623693ee..51ad587a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/Logger.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/Logger.java
@@ -4,37 +4,30 @@
 
 import com.topjohnwu.magisk.MagiskManager;
 
-public class Logger {
+import java.util.Locale;
 
-    public static final String TAG = "Magisk";
+public class Logger {
 
-    public static void debug(String msg) {
-        Log.d(TAG, "DEBUG: " + msg);
-    }
+    public static final String MAIN_TAG = "Magisk";
+    public static final String DEBUG_TAG = "MagiskManager";
 
-    public static void error(String msg) {
-        Log.e(TAG, "MANAGERERROR: " + msg);
+    public static void debug(String fmt, Object... args) {
+        Log.d(DEBUG_TAG, "DEBUG: " + String.format(Locale.US, fmt, args));
     }
 
-    public static void dev(String msg, Object... args) {
-        if (MagiskManager.devLogging) {
-            if (args.length == 1 && args[0] instanceof Throwable) {
-                Log.d(TAG, "MANAGER: " + msg, (Throwable) args[0]);
-            } else {
-                Log.d(TAG, "MANAGER: " + String.format(msg, args));
-            }
-        }
+    public static void error(String fmt, Object... args) {
+        Log.e(MAIN_TAG, "MANAGERERROR: " + String.format(Locale.US, fmt, args));
     }
 
-    public static void dev(String msg) {
+    public static void dev(String fmt, Object... args) {
         if (MagiskManager.devLogging) {
-            Log.d(TAG, "MANAGER: " + msg);
+            Log.d(DEBUG_TAG, String.format(Locale.US, fmt, args));
         }
     }
 
-    public static void shell(boolean root, String msg) {
+    public static void shell(boolean root, String fmt, Object... args) {
         if (MagiskManager.shellLogging) {
-            Log.d(TAG, (root ? "MANAGERSU " : "MANAGERSH ") + msg);
+            Log.d(DEBUG_TAG, (root ? "MANAGERSU: " : "MANAGERSH: ") + String.format(Locale.US, fmt, args));
         }
     }
 }

From 9a1dc8ee0ee860ac6cf38dd7e241e27facca33f6 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 1 Jun 2017 00:19:52 +0800
Subject: [PATCH 09/16] Refactor su database

---
 .../com/topjohnwu/magisk/MagiskManager.java   |   8 +-
 .../com/topjohnwu/magisk/SuLogFragment.java   |  10 +-
 .../topjohnwu/magisk/SuperuserFragment.java   |   7 +-
 .../magisk/adapters/PolicyAdapter.java        | 136 ++++++++--------
 .../magisk/database/SuDatabaseHelper.java     | 147 +++++++++++++++---
 .../magisk/database/SuLogDatabaseHelper.java  |  76 ---------
 .../magisk/receivers/PackageReceiver.java     |  11 +-
 .../topjohnwu/magisk/superuser/Policy.java    |  22 ++-
 .../magisk/superuser/SuReceiver.java          |  12 +-
 .../magisk/superuser/SuRequestActivity.java   |  12 +-
 10 files changed, 230 insertions(+), 211 deletions(-)
 delete mode 100644 app/src/main/java/com/topjohnwu/magisk/database/SuLogDatabaseHelper.java

diff --git a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
index 52dcec89..d0b1a04d 100644
--- a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
@@ -6,12 +6,11 @@
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
-import android.util.SparseArray;
 import android.widget.Toast;
 
+import com.topjohnwu.magisk.database.SuDatabaseHelper;
 import com.topjohnwu.magisk.module.Module;
 import com.topjohnwu.magisk.module.Repo;
-import com.topjohnwu.magisk.superuser.Policy;
 import com.topjohnwu.magisk.utils.CallbackEvent;
 import com.topjohnwu.magisk.utils.SafetyNetHelper;
 import com.topjohnwu.magisk.utils.Shell;
@@ -24,7 +23,6 @@
 public class MagiskManager extends Application {
 
     public static final String MAGISK_DISABLE_FILE = "/cache/.disable_magisk";
-    public static final String MAGISK_HIDE_PATH = "/magisk/.core/magiskhide/";
     public static final String TMP_FOLDER_PATH = "/dev/tmp";
     public static final String MAGISK_PATH = "/magisk";
     public static final String UNINSTALLER = "magisk_uninstaller.sh";
@@ -43,7 +41,6 @@ public class MagiskManager extends Application {
     public final CallbackEvent<Void> repoLoadDone = new CallbackEvent<>();
     public final CallbackEvent<Void> updateCheckDone = new CallbackEvent<>();
     public final CallbackEvent<Void> safetyNetDone = new CallbackEvent<>();
-    public final SparseArray<CallbackEvent<Policy>> uidSuRequest = new SparseArray<>();
 
     // Info
     public String magiskVersionString;
@@ -80,7 +77,9 @@ public class MagiskManager extends Application {
     public int suResponseType;
     public int suNotificationType;
 
+    // Global resources
     public SharedPreferences prefs;
+    public SuDatabaseHelper suDB;
 
     private static Handler mHandler = new Handler();
 
@@ -88,6 +87,7 @@ public class MagiskManager extends Application {
     public void onCreate() {
         super.onCreate();
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        suDB = new SuDatabaseHelper(this);
     }
 
     public void toast(String msg, int duration) {
diff --git a/app/src/main/java/com/topjohnwu/magisk/SuLogFragment.java b/app/src/main/java/com/topjohnwu/magisk/SuLogFragment.java
index bacaeae1..d060ba90 100644
--- a/app/src/main/java/com/topjohnwu/magisk/SuLogFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SuLogFragment.java
@@ -13,7 +13,6 @@
 
 import com.topjohnwu.magisk.adapters.SuLogAdapter;
 import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.database.SuLogDatabaseHelper;
 import com.topjohnwu.magisk.superuser.SuLogEntry;
 
 import java.util.List;
@@ -28,7 +27,7 @@ public class SuLogFragment extends Fragment {
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
 
     private Unbinder unbinder;
-    private SuLogDatabaseHelper dbHelper;
+    private MagiskManager magiskManager;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -48,8 +47,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         // Inflate the layout for this fragment
         View v = inflater.inflate(R.layout.fragment_su_log, container, false);
         unbinder = ButterKnife.bind(this, v);
-
-        dbHelper = new SuLogDatabaseHelper(getActivity());
+        magiskManager = getApplication();
 
         updateList();
 
@@ -57,7 +55,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     }
 
     private void updateList() {
-        List<SuLogEntry> logs = dbHelper.getLogList();
+        List<SuLogEntry> logs = magiskManager.suDB.getLogList();
 
         if (logs.size() == 0) {
             emptyRv.setVisibility(View.VISIBLE);
@@ -76,7 +74,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 updateList();
                 return true;
             case R.id.menu_clear:
-                dbHelper.clearLogs();
+                magiskManager.suDB.clearLogs();
                 updateList();
                 return true;
             default:
diff --git a/app/src/main/java/com/topjohnwu/magisk/SuperuserFragment.java b/app/src/main/java/com/topjohnwu/magisk/SuperuserFragment.java
index 08adb511..53c4b018 100644
--- a/app/src/main/java/com/topjohnwu/magisk/SuperuserFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SuperuserFragment.java
@@ -11,7 +11,6 @@
 
 import com.topjohnwu.magisk.adapters.PolicyAdapter;
 import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.database.SuDatabaseHelper;
 import com.topjohnwu.magisk.superuser.Policy;
 
 import java.util.List;
@@ -33,15 +32,15 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         unbinder = ButterKnife.bind(this, view);
 
         PackageManager pm = getActivity().getPackageManager();
+        MagiskManager magiskManager = getApplication();
 
-        SuDatabaseHelper dbHelper = new SuDatabaseHelper(getActivity());
-        List<Policy> policyList = dbHelper.getPolicyList(pm);
+        List<Policy> policyList = magiskManager.suDB.getPolicyList(pm);
 
         if (policyList.size() == 0) {
             emptyRv.setVisibility(View.VISIBLE);
             recyclerView.setVisibility(View.GONE);
         } else {
-            recyclerView.setAdapter(new PolicyAdapter(policyList, dbHelper, pm));
+            recyclerView.setAdapter(new PolicyAdapter(policyList, magiskManager.suDB, pm));
             emptyRv.setVisibility(View.GONE);
             recyclerView.setVisibility(View.VISIBLE);
         }
diff --git a/app/src/main/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java b/app/src/main/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
index 524a2faf..b9bc401c 100644
--- a/app/src/main/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
+++ b/app/src/main/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java
@@ -49,78 +49,72 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
         Policy policy = policyList.get(position);
-        try {
-            holder.setExpanded(expandList.contains(policy));
-
-            holder.itemView.setOnClickListener(view -> {
-                if (holder.mExpanded) {
-                    holder.collapse();
-                    expandList.remove(policy);
-                } else {
-                    holder.expand();
-                    expandList.add(policy);
-                }
-            });
 
-            holder.appName.setText(policy.appName);
-            holder.packageName.setText(policy.packageName);
-            holder.appIcon.setImageDrawable(pm.getPackageInfo(policy.packageName, 0).applicationInfo.loadIcon(pm));
-            holder.masterSwitch.setOnCheckedChangeListener((v, isChecked) -> {
-                if ((isChecked && policy.policy == Policy.DENY) ||
-                        (!isChecked && policy.policy == Policy.ALLOW)) {
-                    policy.policy = isChecked ? Policy.ALLOW : Policy.DENY;
-                    String message = v.getContext().getString(
-                            isChecked ? R.string.su_snack_grant : R.string.su_snack_deny, policy.appName);
-                    SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                    dbHelper.updatePolicy(policy);
-                }
-            });
-            holder.notificationSwitch.setOnCheckedChangeListener((v, isChecked) -> {
-                if ((isChecked && !policy.notification) ||
-                        (!isChecked && policy.notification)) {
-                    policy.notification = isChecked;
-                    String message = v.getContext().getString(
-                            isChecked ? R.string.su_snack_notif_on : R.string.su_snack_notif_off, policy.appName);
-                    SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                    dbHelper.updatePolicy(policy);
-                }
-            });
-            holder.loggingSwitch.setOnCheckedChangeListener((v, isChecked) -> {
-                if ((isChecked && !policy.logging) ||
-                        (!isChecked && policy.logging)) {
-                    policy.logging = isChecked;
-                    String message = v.getContext().getString(
-                            isChecked ? R.string.su_snack_log_on : R.string.su_snack_log_off, policy.appName);
-                    SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                    dbHelper.updatePolicy(policy);
-                }
-            });
-            holder.delete.setOnClickListener(v -> new AlertDialogBuilder(v.getContext())
-                    .setTitle(R.string.su_revoke_title)
-                    .setMessage(v.getContext().getString(R.string.su_revoke_msg, policy.appName))
-                    .setPositiveButton(R.string.yes, (dialog, which) -> {
-                        policyList.remove(position);
-                        notifyItemRemoved(position);
-                        notifyItemRangeChanged(position, policyList.size());
-                        SnackbarMaker.make(holder.itemView, v.getContext().getString(R.string.su_snack_revoke, policy.appName),
-                                Snackbar.LENGTH_SHORT).show();
-                        dbHelper.deletePolicy(policy);
-                    })
-                    .setNegativeButton(R.string.no_thanks, null)
-                    .setCancelable(true)
-                    .show());
-            holder.masterSwitch.setChecked(policy.policy == Policy.ALLOW);
-            holder.notificationSwitch.setChecked(policy.notification);
-            holder.loggingSwitch.setChecked(policy.logging);
-
-            // Hide for now
-            holder.moreInfo.setVisibility(View.GONE);
-
-        } catch (PackageManager.NameNotFoundException e) {
-            policyList.remove(position);
-            dbHelper.deletePolicy(policy);
-            onBindViewHolder(holder, position);
-        }
+        holder.setExpanded(expandList.contains(policy));
+
+        holder.itemView.setOnClickListener(view -> {
+            if (holder.mExpanded) {
+                holder.collapse();
+                expandList.remove(policy);
+            } else {
+                holder.expand();
+                expandList.add(policy);
+            }
+        });
+
+        holder.appName.setText(policy.appName);
+        holder.packageName.setText(policy.packageName);
+        holder.appIcon.setImageDrawable(policy.info.loadIcon(pm));
+        holder.masterSwitch.setOnCheckedChangeListener((v, isChecked) -> {
+            if ((isChecked && policy.policy == Policy.DENY) ||
+                    (!isChecked && policy.policy == Policy.ALLOW)) {
+                policy.policy = isChecked ? Policy.ALLOW : Policy.DENY;
+                String message = v.getContext().getString(
+                        isChecked ? R.string.su_snack_grant : R.string.su_snack_deny, policy.appName);
+                SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
+                dbHelper.updatePolicy(policy);
+            }
+        });
+        holder.notificationSwitch.setOnCheckedChangeListener((v, isChecked) -> {
+            if ((isChecked && !policy.notification) ||
+                    (!isChecked && policy.notification)) {
+                policy.notification = isChecked;
+                String message = v.getContext().getString(
+                        isChecked ? R.string.su_snack_notif_on : R.string.su_snack_notif_off, policy.appName);
+                SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
+                dbHelper.updatePolicy(policy);
+            }
+        });
+        holder.loggingSwitch.setOnCheckedChangeListener((v, isChecked) -> {
+            if ((isChecked && !policy.logging) ||
+                    (!isChecked && policy.logging)) {
+                policy.logging = isChecked;
+                String message = v.getContext().getString(
+                        isChecked ? R.string.su_snack_log_on : R.string.su_snack_log_off, policy.appName);
+                SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
+                dbHelper.updatePolicy(policy);
+            }
+        });
+        holder.delete.setOnClickListener(v -> new AlertDialogBuilder(v.getContext())
+                .setTitle(R.string.su_revoke_title)
+                .setMessage(v.getContext().getString(R.string.su_revoke_msg, policy.appName))
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                    policyList.remove(position);
+                    notifyItemRemoved(position);
+                    notifyItemRangeChanged(position, policyList.size());
+                    SnackbarMaker.make(holder.itemView, v.getContext().getString(R.string.su_snack_revoke, policy.appName),
+                            Snackbar.LENGTH_SHORT).show();
+                    dbHelper.deletePolicy(policy);
+                })
+                .setNegativeButton(R.string.no_thanks, null)
+                .setCancelable(true)
+                .show());
+        holder.masterSwitch.setChecked(policy.policy == Policy.ALLOW);
+        holder.notificationSwitch.setChecked(policy.notification);
+        holder.loggingSwitch.setChecked(policy.logging);
+
+        // Hide for now
+        holder.moreInfo.setVisibility(View.GONE);
     }
 
     @Override
diff --git a/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java b/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
index ab03a58f..b0e3a298 100644
--- a/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
+++ b/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
@@ -6,18 +6,30 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
+import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.superuser.Policy;
+import com.topjohnwu.magisk.superuser.SuLogEntry;
+import com.topjohnwu.magisk.utils.Utils;
 
+import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class SuDatabaseHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VER = 1;
-    private static final String TABLE_NAME = "policies";
+    private static final int DATABASE_VER = 2;
+    private static final String POLICY_TABLE = "policies";
+    private static final String LOG_TABLE = "logs";
+    private static final String SETTINGS_TABLE = "settings";
+
+    private MagiskManager magiskManager;
+    private PackageManager pm;
 
     public SuDatabaseHelper(Context context) {
         super(context, "su.db", null, DATABASE_VER);
+        magiskManager = Utils.getMagiskManager(context);
+        pm = context.getPackageManager();
     }
 
     @Override
@@ -28,29 +40,78 @@ public void onCreate(SQLiteDatabase db) {
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         if (oldVersion == 0) {
+            createTables(db);
+            oldVersion = 2;
+        }
+        if (oldVersion == 1) {
+            // We're dropping column app_name, rename and re-construct table
+            db.execSQL("ALTER TABLE " + POLICY_TABLE + " RENAME TO " + POLICY_TABLE + "_old");
+
+            // Create the new tables
+            createTables(db);
+
+            // Migrate old data to new tables
             db.execSQL(
-                    "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " " +
-                    "(uid INT, package_name TEXT, app_name TEXT, policy INT, " +
-                    "until INT, logging INT, notification INT, " +
-                    "PRIMARY KEY(uid))");
+                    "INSERT INTO " + POLICY_TABLE + " SELECT " +
+                    "uid, package_name, policy, until, logging, notification " +
+                    "FROM " + POLICY_TABLE + "_old");
+            db.execSQL("DROP TABLE " + POLICY_TABLE + "_old");
+
+            File oldDB = magiskManager.getDatabasePath("sulog.db");
+            if (oldDB.exists()) {
+                migrateLegacyLogList(oldDB, db);
+                magiskManager.deleteDatabase("sulog.db");
+            }
+            ++oldVersion;
         }
-        // Currently new database, no upgrading
     }
 
-    public boolean deletePolicy(Policy policy) {
+    private void createTables(SQLiteDatabase db) {
+        // Policies
+        db.execSQL(
+                "CREATE TABLE IF NOT EXISTS " + POLICY_TABLE + " " +
+                "(uid INT, package_name TEXT, policy INT, " +
+                "until INT, logging INT, notification INT, " +
+                "PRIMARY KEY(uid))");
+
+        // Logs
+        db.execSQL(
+                "CREATE TABLE IF NOT EXISTS " + LOG_TABLE + " " +
+                "(from_uid INT, package_name TEXT, app_name TEXT, from_pid INT, " +
+                "to_uid INT, action INT, time INT, command TEXT)");
+
+        // Settings
+        db.execSQL(
+                "CREATE TABLE IF NOT EXISTS " + SETTINGS_TABLE + " " +
+                "(key TEXT, value INT, PRIMARY KEY(key))");
+    }
+
+    public void deletePolicy(Policy policy) {
+        deletePolicy(policy.packageName);
+    }
+
+    public void deletePolicy(String pkg) {
         SQLiteDatabase db = getWritableDatabase();
-        db.delete(TABLE_NAME, "package_name=?", new String[] { policy.packageName });
+        db.delete(POLICY_TABLE, "package_name=?", new String[] { pkg });
+        db.close();
+    }
+
+    public void deletePolicy(int uid) {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(POLICY_TABLE, "uid=?", new String[]{String.valueOf(uid)});
         db.close();
-        return getPolicy(policy.packageName) == null;
     }
 
     public Policy getPolicy(int uid) {
         Policy policy = null;
         SQLiteDatabase db = getReadableDatabase();
-        try (Cursor c = db.query(TABLE_NAME, null, "uid=?", new String[] { String.valueOf(uid) }, null, null, null)) {
+        try (Cursor c = db.query(POLICY_TABLE, null, "uid=?", new String[] { String.valueOf(uid) }, null, null, null)) {
             if (c.moveToNext()) {
-                policy = new Policy(c);
+                policy = new Policy(c, pm);
             }
+        } catch (PackageManager.NameNotFoundException e) {
+            deletePolicy(uid);
+            return null;
         }
         db.close();
         return policy;
@@ -59,10 +120,13 @@ public Policy getPolicy(int uid) {
     public Policy getPolicy(String pkg) {
         Policy policy = null;
         SQLiteDatabase db = getReadableDatabase();
-        try (Cursor c = db.query(TABLE_NAME, null, "package_name=?", new String[] { pkg }, null, null, null)) {
+        try (Cursor c = db.query(POLICY_TABLE, null, "package_name=?", new String[] { pkg }, null, null, null)) {
             if (c.moveToNext()) {
-                policy = new Policy(c);
+                policy = new Policy(c, pm);
             }
+        } catch (PackageManager.NameNotFoundException e) {
+            deletePolicy(pkg);
+            return null;
         }
         db.close();
         return policy;
@@ -70,13 +134,13 @@ public Policy getPolicy(String pkg) {
 
     public void addPolicy(Policy policy) {
         SQLiteDatabase db = getWritableDatabase();
-        db.replace(TABLE_NAME, null, policy.getContentValues());
+        db.replace(POLICY_TABLE, null, policy.getContentValues());
         db.close();
     }
 
     public void updatePolicy(Policy policy) {
         SQLiteDatabase db = getWritableDatabase();
-        db.update(TABLE_NAME, policy.getContentValues(), "package_name=?",
+        db.update(POLICY_TABLE, policy.getContentValues(), "package_name=?",
                 new String[] { policy.packageName });
         db.close();
     }
@@ -86,15 +150,60 @@ public List<Policy> getPolicyList(PackageManager pm) {
         SQLiteDatabase db = getWritableDatabase();
         Policy policy;
         // Clear outdated policies
-        db.delete(TABLE_NAME, "until > 0 AND until < ?",
+        db.delete(POLICY_TABLE, "until > 0 AND until < ?",
                 new String[] { String.valueOf(System.currentTimeMillis()) });
-        try (Cursor c = db.query(TABLE_NAME, null, null, null, null, null, "app_name ASC")) {
+        try (Cursor c = db.query(POLICY_TABLE, null, null, null, null, null, null)) {
             while (c.moveToNext()) {
-                policy = new Policy(c);
+                policy = new Policy(c, pm);
                 ret.add(policy);
             }
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        db.close();
+        Collections.sort(ret);
+        return ret;
+    }
+
+    private List<SuLogEntry> getLogList(SQLiteDatabase db, String selection) {
+        List<SuLogEntry> ret = new ArrayList<>();
+        // Clear outdated logs
+        db.delete(LOG_TABLE, "time < ?", new String[] { String.valueOf(
+                System.currentTimeMillis() / 1000 - magiskManager.suLogTimeout * 86400) });
+        try (Cursor c = db.query(LOG_TABLE, null, selection, null, null, null, "time DESC")) {
+            while (c.moveToNext()) {
+                ret.add(new SuLogEntry(c));
+            }
         }
         db.close();
         return ret;
     }
+
+    private void migrateLegacyLogList(File oldDB, SQLiteDatabase newDB) {
+        SQLiteDatabase db = SQLiteDatabase.openDatabase(oldDB.getPath(), null, SQLiteDatabase.OPEN_READWRITE);
+        List<SuLogEntry> logs = getLogList(db, null);
+        for (SuLogEntry log : logs) {
+            newDB.insert(LOG_TABLE, null, log.getContentValues());
+        }
+    }
+
+    public List<SuLogEntry> getLogList() {
+        return getLogList(null);
+    }
+
+    public List<SuLogEntry> getLogList(String selection) {
+        return getLogList(getWritableDatabase(), selection);
+    }
+
+    public void addLog(SuLogEntry log) {
+        SQLiteDatabase db = getWritableDatabase();
+        db.insert(LOG_TABLE, null, log.getContentValues());
+        db.close();
+    }
+
+    public void clearLogs() {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(LOG_TABLE, null, null);
+        db.close();
+    }
 }
diff --git a/app/src/main/java/com/topjohnwu/magisk/database/SuLogDatabaseHelper.java b/app/src/main/java/com/topjohnwu/magisk/database/SuLogDatabaseHelper.java
deleted file mode 100644
index d5ba28b7..00000000
--- a/app/src/main/java/com/topjohnwu/magisk/database/SuLogDatabaseHelper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.topjohnwu.magisk.database;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.superuser.SuLogEntry;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SuLogDatabaseHelper extends SQLiteOpenHelper {
-
-    private static final int DATABASE_VER = 1;
-    private static final String TABLE_NAME = "logs";
-
-    private MagiskManager magiskManager;
-
-    public SuLogDatabaseHelper(Context context) {
-        super(context, "sulog.db", null, DATABASE_VER);
-        magiskManager = (MagiskManager) context.getApplicationContext();
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        onUpgrade(db, 0, DATABASE_VER);
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        if (oldVersion == 0) {
-            db.execSQL(
-                    "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " (id INTEGER PRIMARY KEY AUTOINCREMENT, " +
-                    "from_uid INT, package_name TEXT, app_name TEXT, from_pid INT, " +
-                    "to_uid INT, action INT, time INT, command TEXT)");
-        }
-        // Currently new database, no upgrading
-    }
-
-    public void addLog(SuLogEntry log) {
-        SQLiteDatabase db = getWritableDatabase();
-        db.insert(TABLE_NAME, null, log.getContentValues());
-        db.close();
-    }
-
-    public void clearLogs() {
-        SQLiteDatabase db = getWritableDatabase();
-        db.delete(TABLE_NAME, null, null);
-        db.close();
-    }
-
-    public List<SuLogEntry> getLogList() {
-        return getLogList(null);
-    }
-
-    public List<SuLogEntry> getLogList(int uid) {
-        return getLogList("uid=" + uid);
-    }
-
-    public List<SuLogEntry> getLogList(String selection) {
-        List<SuLogEntry> ret = new ArrayList<>();
-        SQLiteDatabase db = getWritableDatabase();
-        // Clear outdated logs
-        db.delete(TABLE_NAME, "time < ?", new String[] { String.valueOf(
-                System.currentTimeMillis() / 1000 - magiskManager.suLogTimeout * 86400) });
-        try (Cursor c = db.query(TABLE_NAME, null, selection, null, null, null, "time DESC")) {
-            while (c.moveToNext()) {
-                ret.add(new SuLogEntry(c));
-            }
-        }
-        db.close();
-        return ret;
-    }
-}
diff --git a/app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java b/app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java
index d31e6344..9ad4d370 100644
--- a/app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java
+++ b/app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java
@@ -5,21 +5,18 @@
 import android.content.Intent;
 
 import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.database.SuDatabaseHelper;
 import com.topjohnwu.magisk.superuser.Policy;
-import com.topjohnwu.magisk.utils.Logger;
 import com.topjohnwu.magisk.utils.Utils;
 
 public class PackageReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        SuDatabaseHelper suDB = new SuDatabaseHelper(context);
+        MagiskManager magiskManager = Utils.getMagiskManager(context);
         String pkg = intent.getData().getEncodedSchemeSpecificPart();
-        Policy policy = suDB.getPolicy(pkg);
+        Policy policy = magiskManager.suDB.getPolicy(pkg);
         if (policy == null)
             return;
 
-        MagiskManager magiskManager = Utils.getMagiskManager(context);
         magiskManager.initSUConfig();
 
         switch (intent.getAction()) {
@@ -29,12 +26,12 @@ public void onReceive(Context context, Intent intent) {
                 if (uid > 0) {
                     policy.uid = uid % 100000;
                 }
-                suDB.updatePolicy(policy);
+                magiskManager.suDB.updatePolicy(policy);
                 return;
             case Intent.ACTION_PACKAGE_REMOVED:
                 boolean isUpdate = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);
                 if (!isUpdate || magiskManager.suReauth) {
-                    suDB.deletePolicy(policy);
+                    magiskManager.suDB.deletePolicy(policy);
                 }
                 break;
         }
diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java b/app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java
index 34f9266e..6580978c 100644
--- a/app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java
+++ b/app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java
@@ -1,12 +1,13 @@
 package com.topjohnwu.magisk.superuser;
 
 import android.content.ContentValues;
-import android.content.pm.PackageInfo;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
+import android.support.annotation.NonNull;
 
 
-public class Policy {
+public class Policy implements Comparable<Policy>{
     public static final int INTERACTIVE = 0;
     public static final int DENY = 1;
     public static final int ALLOW = 2;
@@ -15,37 +16,42 @@ public class Policy {
     public long until;
     public boolean logging = true, notification = true;
     public String packageName, appName;
-    public PackageInfo info;
+    public ApplicationInfo info;
 
     public Policy(int uid, PackageManager pm) throws PackageManager.NameNotFoundException {
         String[] pkgs = pm.getPackagesForUid(uid);
         if (pkgs != null && pkgs.length > 0) {
-            info = pm.getPackageInfo(pkgs[0], 0);
             this.uid = uid;
             packageName = pkgs[0];
-            appName = info.applicationInfo.loadLabel(pm).toString();
+            info = pm.getApplicationInfo(packageName, 0);
+            appName = info.loadLabel(pm).toString();
         } else throw new PackageManager.NameNotFoundException();
     }
 
-    public Policy(Cursor c) {
+    public Policy(Cursor c, PackageManager pm) throws PackageManager.NameNotFoundException {
         uid = c.getInt(c.getColumnIndex("uid"));
         packageName = c.getString(c.getColumnIndex("package_name"));
-        appName = c.getString(c.getColumnIndex("app_name"));
         policy = c.getInt(c.getColumnIndex("policy"));
         until = c.getLong(c.getColumnIndex("until"));
         logging = c.getInt(c.getColumnIndex("logging")) != 0;
         notification = c.getInt(c.getColumnIndex("notification")) != 0;
+        info = pm.getApplicationInfo(packageName, 0);
+        appName = info.loadLabel(pm).toString();
     }
     
     public ContentValues getContentValues() {
         ContentValues values = new ContentValues();
         values.put("uid", uid);
         values.put("package_name", packageName);
-        values.put("app_name", appName);
         values.put("policy", policy);
         values.put("until", until);
         values.put("logging", logging ? 1 : 0);
         values.put("notification", notification ? 1 : 0);
         return values;
     }
+
+    @Override
+    public int compareTo(@NonNull Policy policy) {
+        return appName.toLowerCase().compareTo(policy.appName.toLowerCase());
+    }
 }
diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java b/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java
index d6d1752c..deb5f6ef 100644
--- a/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java
+++ b/app/src/main/java/com/topjohnwu/magisk/superuser/SuReceiver.java
@@ -3,13 +3,12 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Process;
 import android.widget.Toast;
 
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.database.SuDatabaseHelper;
-import com.topjohnwu.magisk.database.SuLogDatabaseHelper;
 
 import java.util.Date;
 
@@ -46,12 +45,12 @@ public void onReceive(Context context, Intent intent) {
         action = intent.getStringExtra("action");
         if (action == null) return;
 
-        SuDatabaseHelper suDbHelper = new SuDatabaseHelper(context);
-        policy = suDbHelper.getPolicy(fromUid);
+        policy = magiskManager.suDB.getPolicy(fromUid);
         if (policy == null) {
             try {
                 policy = new Policy(fromUid, context.getPackageManager());
-            } catch (Throwable throwable) {
+            } catch (PackageManager.NameNotFoundException e) {
+                e.printStackTrace();
                 return;
             }
         }
@@ -89,8 +88,7 @@ public void onReceive(Context context, Intent intent) {
             log.fromPid = pid;
             log.command = command;
             log.date = new Date();
-            SuLogDatabaseHelper logDbHelper = new SuLogDatabaseHelper(context);
-            logDbHelper.addLog(log);
+            magiskManager.suDB.addLog(log);
         }
     }
 }
diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java b/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
index a11358f5..8bfa1cda 100644
--- a/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
@@ -21,13 +21,9 @@
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.asyncs.ParallelTask;
 import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.database.SuDatabaseHelper;
-import com.topjohnwu.magisk.utils.CallbackEvent;
-import com.topjohnwu.magisk.utils.Logger;
 
 import java.io.DataInputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -51,7 +47,6 @@ public class SuRequestActivity extends Activity {
     private LocalSocket socket;
     private PackageManager pm;
     private MagiskManager magiskManager;
-    private SuDatabaseHelper suDB;
 
     private boolean hasTimeout;
     private Policy policy;
@@ -64,7 +59,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         pm = getPackageManager();
         magiskManager = getApplicationContext();
-        suDB = new SuDatabaseHelper(this);
 
         Intent intent = getIntent();
         socketPath = intent.getStringExtra("socket");
@@ -109,7 +103,7 @@ private void showRequest() {
         setContentView(R.layout.activity_request);
         ButterKnife.bind(this);
 
-        appIcon.setImageDrawable(policy.info.applicationInfo.loadIcon(pm));
+        appIcon.setImageDrawable(policy.info.loadIcon(pm));
         appNameView.setText(policy.appName);
         packageNameView.setText(policy.packageName);
 
@@ -180,7 +174,7 @@ void handleAction(int action, int time) {
         policy.policy = action;
         if (time >= 0) {
             policy.until = (time == 0) ? 0 : (System.currentTimeMillis() / 1000 + time * 60);
-            new SuDatabaseHelper(this).addPolicy(policy);
+            magiskManager.suDB.addPolicy(policy);
         }
         handleAction();
     }
@@ -220,7 +214,7 @@ protected Boolean doInBackground(Void... params) {
                 }
 
                 int uid = payload.getAsInteger("uid");
-                policy = suDB.getPolicy(uid);
+                policy = magiskManager.suDB.getPolicy(uid);
                 if (policy == null) {
                     policy = new Policy(uid, pm);
                 }

From 44e7d79d4cef414629dac4e81f6496acdda6e4f7 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 1 Jun 2017 00:41:36 +0800
Subject: [PATCH 10/16] Add Arabic translation Credits to @xx6600xx

---
 app/src/main/res/values-ar/strings.xml | 210 +++++++++++++++++++++++++
 1 file changed, 210 insertions(+)
 create mode 100644 app/src/main/res/values-ar/strings.xml

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
new file mode 100644
index 00000000..4e0d25c0
--- /dev/null
+++ b/app/src/main/res/values-ar/strings.xml
@@ -0,0 +1,210 @@
+<resources>
+    <!--Universal-->
+
+    <!--Welcome Activity-->
+    <string name="navigation_drawer_open">فتح درج التنقل</string>
+    <string name="navigation_drawer_close">إغلاق درج التنقل</string>
+    <string name="modules">الإضافات</string>
+    <string name="downloads">التنزيلات</string>
+    <string name="superuser">Superuser</string>
+    <string name="log">السجل</string>
+    <string name="settings">الإعدادات</string>
+    <string name="status">الحالة</string>
+    <string name="install">التثبيت</string>
+
+    <!--Status Fragment-->
+    <string name="magisk_version">المثبت Magisk v%1$s</string>
+    <string name="magisk_version_core_only">المثبت Magisk v%1$s (الوضع الأساسي فقط)</string>
+    <string name="magisk_version_error">Magisk غير مثبت</string>
+
+    <string name="checking_for_updates">البحث عن تحديثات…</string>
+    <string name="magisk_update_available">Magisk v%1$s متاح!</string>
+    <string name="cannot_check_updates">لا يمكن التحقق من التحديثات، لا يوجد إنترنت؟</string>
+    <string name="up_to_date">تم تثبيت أحدث إصدار من %1$s</string>
+    <string name="root_error">مروت لكن لا يوجد إذن الروت، غير مسموح به؟</string>
+    <string name="not_rooted">غير مروت</string>
+    <string name="proper_root">مروت فعلاً</string>
+    <string name="safetyNet_check_text">انقر لبدء فحص SafetyNet</string>
+    <string name="checking_safetyNet_status">التحقق من حالة SafetyNet…</string>
+    <string name="safetyNet_check_success">نجح فحص SafetyNet</string>
+    <string name="safetyNet_connection_failed">لا يمكن الاتصال بـ Google API</string>
+    <string name="safetyNet_connection_suspended">تم تعليق الاتصال بـ Google API</string>
+    <string name="safetyNet_no_response">لا يمكن التحقق من SafetyNet، لا يوجد إنترنت؟</string>
+    <string name="safetyNet_fail">فشل SafetyNet: عدم تطابق التشكيل الجانبي CTS</string>
+    <string name="safetyNet_pass">SafetyNet تخطى</string>
+    <string name="safetyNet_network_loss">فقدان الاتصال بالشبكة</string>
+    <string name="safetyNet_service_disconnected">تم إنهاء الخدمة</string>
+    <string name="safetyNet_res_invalid">الاستجابة غير صالحه</string>
+    <string name="root_info_warning">وظائف محدودة إلى حد كبير</string>
+
+    <!--Install Fragment-->
+    <string name="auto_detect">(تلقائي) %1$s</string>
+    <string name="cannot_auto_detect">(لا يمكن الكشف التلقائي)</string>
+    <string name="boot_image_title">موقع ملف الإقلاع</string>
+    <string name="detect_button">تحقق</string>
+    <string name="advanced_settings_title">إعدادات متقدمة</string>
+    <string name="keep_force_encryption">الحفاظ علي قوه التشفير</string>
+    <string name="keep_dm_verity">إبقاء dm-verity</string>
+    <string name="current_magisk_title">نسخة Magisk المثبته: %1$s</string>
+    <string name="install_magisk_title">آخر نسخة Magisk: %1$s</string>
+    <string name="uninstall">إلغاء التثبيت</string>
+    <string name="reboot_countdown">إعادة التشغيل في %1$d</string>
+    <string name="uninstall_magisk_title">إلغاء تثبيت Magisk</string>
+    <string name="uninstall_magisk_msg">سيؤدي هذا إلى إزالة جميع الإضافات، MagiskSU، وربما تشفير البيانات الخاصة بك إذا لم يتم تشفيرها\nهل أنت متأكد من الاستمرار؟</string>
+    <string name="version_none">(بدون)</string>
+
+    <!--Module Fragment-->
+    <string name="no_info_provided">(لم يتم توفير أي معلومات)</string>
+    <string name="no_modules_found">لم يعثر على الإضافات</string>
+    <string name="update_file_created">سيتم تحديث الإضافة في إعادة التشغيل التالي</string>
+    <string name="remove_file_created">سيتم حذف الإضافة في إعادة التشغيل التالي</string>
+    <string name="remove_file_deleted">لن يتم حذف الإضافة في إعادة التشغيل التالي</string>
+    <string name="disable_file_created">سيتم تعطيل الإضافة في إعادة التشغيل التالي</string>
+    <string name="disable_file_removed">سيتم تمكين الإضافة في إعادة التشغيل التالي</string>
+    <string name="author">انشئ بواسطة %1$s</string>
+    <string name="fab_flash_zip">تثبيت الملف المضغوط للإضافة</string>
+
+    <!--Repo Fragment-->
+    <string name="update_available">يتوفر تحديث</string>
+    <string name="installed">مثبت</string>
+    <string name="not_installed">غير مثبت</string>
+
+    <!--Log Fragment-->
+    <string name="menuSaveToSd">حفظ إلى بطاقة ذاكرة SD</string>
+    <string name="menuReload">إعادة تحميل</string>
+    <string name="menuClearLog">حذف السجل الآن</string>
+    <string name="logs_cleared">تم حذف السجل بنجاح</string>
+    <string name="log_is_empty">السجل فارغ</string>
+    <string name="logs_save_failed">لا يمكن كتابة السجل على بطاقة ذاكرة SD:</string>
+
+    <!--About Activity-->
+    <string name="about">حول</string>
+    <string name="app_developers">المطورين الرئيسيين</string>
+    <string name="app_developers_"><![CDATA[التطبيق إنشئ بواسطة <a href="https://github.com/topjohnwu">topjohnwu</a> بالتعاون مع <a href="https://github.com/d8ahazard">Digitalhigh</a> و <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
+    <string name="app_changelog">تغييرات التطبيق</string>
+    <string name="translators">xx6600xx ,silent_6600</string>
+    <string name="app_version">إصدار التطبيق</string>
+    <string name="app_source_code">الشفرة المصدرية</string>
+    <string name="donation">التبرع</string>
+    <string name="app_translators">مترجم التطبيق</string>
+    <string name="support_thread">منتدى الدعم</string>
+
+    <!--Toasts, Dialogs-->
+    <string name="permissionNotGranted">أن هذه الميزة لا تعمل دون الحصول على إذن الكتابة على التخزين الخارجي.</string>
+    <string name="no_thanks">لا شكراً</string>
+    <string name="yes">نعم</string>
+    <string name="ok">موافق</string>
+    <string name="close">إغلاق</string>
+    <string name="repo_install_title">تثبيت %1$s</string>
+    <string name="repo_install_msg">هل تريد تثبيت %1$s ?</string>
+    <string name="download_install">التنزيل &amp; التثبيت</string>
+    <string name="download">التنزيل</string>
+    <string name="goto_install">انتقل إلى قسم \"التثبيت\"</string>
+    <string name="download_file_error">خطأ تنزيل الملف</string>
+    <string name="install_error">خطأ في التثبيت!</string>
+    <string name="invalid_zip">الملف المضغوط ليس إضافة Magisk!!</string>
+    <string name="reboot_title">التثبيت نجح!</string>
+    <string name="reboot_msg">هل تريد إعادة التشغيل الآن؟</string>
+    <string name="reboot">إعادة التشغيل</string>
+    <string name="copying_msg">نسخ الملف المضغوط إلى دليل مؤقت</string>
+    <string name="zip_install_progress_title">التثبيت</string>
+    <string name="zip_unzip_msg">فك الضغط عن الملف المضغوط …</string>
+    <string name="zip_process_msg">معالجة الملف المضغوط …</string>
+    <string name="zip_install_progress_msg">تثبيت %1$s …</string>
+    <string name="no_magisk_title">لا يوجد Magisk مثبت!</string>
+    <string name="no_magisk_msg">هل ترغب في تنزيل وتثبيت Magisk؟</string>
+    <string name="downloading_toast">جاري التنزيل %1$s</string>
+    <string name="magisk_update_title">تحديث Magisk جديد متوفر!</string>
+    <string name="settings_reboot_toast">إعادة التشغيل لتطبيق الإعدادات</string>
+    <string name="release_notes">ملاحظات الإصدار</string>
+    <string name="repo_cache_cleared">تم مسح الذاكرة المؤقته للمستودع</string>
+    <string name="safetyNet_hide_notice">يستخدم هذا التطبيق SafetyNet, تم التعامل معها بالفعل من قبل MagiskHide بشكل افتراضي</string>
+    <string name="start_magiskhide">بدءا إخفاء Magisk …</string>
+    <string name="no_magisksu_title">لا تستخدم MagiskSU!</string>
+    <string name="no_magisksu_msg">غير مروت بأستخدام MagiskSU, إستخدام Magisk أخفاء لوحده قد لا يكون كافياً!\nانه غير معتمدة رسمياً, وأنت بحاجه إلى أدوات اضافيه (مثلاً suhide) لتخطي SafetyNet.</string>
+    <string name="understand">أنا أفهم</string>
+    <string name="process_error">خطأ في العملية</string>
+    <string name="internal_storage">يتم تخزين الملف المضغوط في:\n[التخزين الداخلي]%1$s</string>
+    <string name="zip_process_title">معالجة</string>
+    <string name="manual_boot_image">يرجى تحديد ملف الإقلاع يدوياً!</string>
+
+    <!--Settings Activity -->
+    <string name="settings_general_category">عام</string>
+    <string name="settings_dark_theme_title">السمة الغامقة</string>
+    <string name="settings_dark_theme_summary">تفعيل السمة الغامقة</string>
+    <string name="settings_notification_title">إشعارات التحديث</string>
+    <string name="settings_notification_summary">عرض إشعارات التحديث عند توفر الإصدار الجديد</string>
+    <string name="settings_clear_cache_title">حذف الذاكرة المؤقتة للمستودع</string>
+    <string name="settings_clear_cache_summary">حذف المعلومات المخزنة مؤقتا للمستودع على الانترنت، يجبر التطبيق لتحديث عبر الانترنت</string>
+
+    <string name="settings_core_only_title">Magisk الوضع الأساسي فقط</string>
+    <string name="settings_core_only_summary">تمكين الميزات الأساسية فقط، لن يتم تحميل جميع الإضافات. MagiskSU، MagiskHide، systemless hosts، و busybox لا يزال ممكنا</string>
+    <string name="settings_magiskhide_summary">إخفاء Magisk من مختلف الاكتشافات</string>
+    <string name="settings_busybox_title">تفعيل BusyBox</string>
+    <string name="settings_busybox_summary">ربط تحميل Magisk\'s المدمج في busybox إلى xbin</string>
+    <string name="settings_hosts_title">تمكين المضيفين(الهوست) لـ systemless</string>
+    <string name="settings_hosts_summary">Systemless يدعم تطبيقات حجب الإعلانات</string>
+
+    <string name="settings_su_app_adb">التطبيقات و ADB</string>
+    <string name="settings_su_app">التطبيقات فقط</string>
+    <string name="settings_su_adb">ADB فقط</string>
+    <string name="settings_su_disable">معطل</string>
+    <string name="settings_su_request_10">10 ثواني</string>
+    <string name="settings_su_request_20">20 ثانية</string>
+    <string name="settings_su_request_30">30 ثانية</string>
+    <string name="settings_su_request_60">60 ثانية</string>
+    <string name="superuser_access">Superuser صلاحيات</string>
+    <string name="auto_response">استجابة تلقائية</string>
+    <string name="request_timeout">مهلة الطلب</string>
+    <string name="superuser_notification">Superuser إشعارات</string>
+    <string name="request_timeout_summary">%1$s ثانية</string>
+
+    <string name="multiuser_mode">وضع تعدد المستخدمين</string>
+    <string name="settings_owner_only">مالك الجهاز فقط</string>
+    <string name="settings_owner_manage">إدارة مالك الجهاز</string>
+    <string name="settings_user_independent">مستخدم مستقل</string>
+    <string name="owner_only_summary">المالك فقط لديه صلاحيات الروت</string>
+    <string name="owner_manage_summary">يمكن للمالك فقط إدارة صلاحيات الروت وتلقي مطالبات الطلب</string>
+    <string name="user_indepenent_summary">كل مستخدم لديه قواعد روت منفصلة خاصة به</string>
+    <string name="multiuser_hint_owner_request">تم إرسال طلب إلى مالك الجهاز. يرجى التبديل إلى المالك ومنح الإذن</string>
+
+    <string name="settings_development_category">تطوير التطبيق</string>
+    <string name="settings_developer_logging_title">تمكين تصحيح السجلات المتقدمة</string>
+    <string name="settings_developer_logging_summary">حدد هذا الخيار لتمكين سجل مطول أكثر.</string>
+    <string name="settings_shell_logging_title">تمكين سجل تصحيح الأوامر الدفعية</string>
+    <string name="settings_shell_logging_summary">حدد هذا الخيار لتمكين سجل جميع الأوامر الدفعية والمخرجات</string>
+
+    <!--Superuser-->
+    <string name="su_request_title">Superuser طلبات</string>
+    <string name="deny_with_str">رفض%1$s</string>
+    <string name="deny">رفض</string>
+    <string name="prompt">طلب</string>
+    <string name="grant">سماح</string>
+    <string name="su_warning">منح حق الوصول الكامل إلى جهازك.\nرفض إذا كنت غير متأكد!</string>
+    <string name="forever">للابد</string>
+    <string name="once">مره</string>
+    <string name="tenmin">10 دقائق</string>
+    <string name="twentymin">20 دقائق</string>
+    <string name="thirtymin">30 دقائق</string>
+    <string name="sixtymin">60 دقائق</string>
+    <string name="su_allow_toast">%1$s يتم منح صلاحيات Superuser</string>
+    <string name="su_deny_toast">%1$s يتم رفض صلاحيات Superuser</string>
+    <string name="no_apps_found">لا توجد تطبيقات</string>
+    <string name="su_snack_grant">Superuser الصلاحيات لـ %1$s تم منحها</string>
+    <string name="su_snack_deny">Superuser الصلاحيات لـ %1$s تم رفضها</string>
+    <string name="su_snack_notif_on">الإشعارات لـ %1$s تم تفعيلها</string>
+    <string name="su_snack_notif_off">الإشعارات لـ %1$s تم تعطيلها</string>
+    <string name="su_snack_log_on">السجلات لـ %1$s تم تفعيلها</string>
+    <string name="su_snack_log_off">السجلات لـ %1$s تم تعطيلها</string>
+    <string name="su_snack_revoke">%1$s الصلاحيات سحبت</string>
+    <string name="su_revoke_title">سحب؟</string>
+    <string name="su_revoke_msg">تأكيد لسحب صلاحيات %1$s ?</string>
+    <string name="toast">نخب</string>
+    <string name="none">بدون</string>
+
+    <!--Superuser logs-->
+    <string name="pid">PID:\u0020</string>
+    <string name="target_uid">الهدف UID:\u0020</string>
+    <string name="command">الأمر:\u0020</string>
+
+</resources>
\ No newline at end of file

From abda8cfa325695229422bf9ab67be91a7b575ab2 Mon Sep 17 00:00:00 2001
From: Exalm <exalm7659@gmail.com>
Date: Wed, 31 May 2017 21:43:48 +0500
Subject: [PATCH 11/16] Updated russian translation

---
 app/src/main/res/values-ru/strings.xml | 27 ++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c8757d81..39500cac 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -12,6 +12,7 @@
 
     <!--Status Fragment-->
     <string name="magisk_version">Установлен Magisk v%1$s</string>
+    <string name="magisk_version_core_only">Установлен v%1$s (Базовый режим)</string>
     <string name="magisk_version_error">Magisk не установлен</string>
 
     <string name="checking_for_updates">Проверка обновлений…</string>
@@ -23,15 +24,20 @@
     <string name="proper_root">Рут получен правильно</string>
     <string name="safetyNet_check_text">Нажмите для запуска проверки SafetyNet</string>
     <string name="checking_safetyNet_status">Проверка статуса SafetyNet…</string>
+    <string name="safetyNet_check_success">Проверка SafetyNet пройдена</string>
     <string name="safetyNet_connection_failed">Невозможно соединиться с API Google</string>
     <string name="safetyNet_connection_suspended">Соединение с API Google было приостановлено</string>
     <string name="safetyNet_no_response">Невозможно выполнить проверку SafetyNet, нет соединения?</string>
     <string name="safetyNet_fail">SafetyNet не пройден: несовпадение профиля CTS</string>
     <string name="safetyNet_pass">SafetyNet пройден</string>
+    <string name="safetyNet_network_loss">Потеря сетевого соединения</string>
+    <string name="safetyNet_service_disconnected">Служба была остановлена</string>
+    <string name="safetyNet_res_invalid">Некорректный ответ</string>
     <string name="root_info_warning">Функциональность значительно ограничена</string>
 
     <!--Install Fragment-->
     <string name="auto_detect">(Авто) %1$s</string>
+    <string name="cannot_auto_detect">(Невозможно определить)</string>
     <string name="boot_image_title">Местоположение образа Boot</string>
     <string name="detect_button">Определить</string>
     <string name="advanced_settings_title">Дополнительные настройки</string>
@@ -41,6 +47,9 @@
     <string name="install_magisk_title">Последняя версия Magisk: %1$s</string>
     <string name="uninstall">Удалить</string>
     <string name="reboot_countdown">Перезагрузка через %1$d</string>
+    <string name="uninstall_magisk_title">Удалить Magisk</string>
+    <string name="uninstall_magisk_msg">Это удалит все модули, MagiskSU, и может зашифровать ваши данные, если они не зашифрованы\nПродолжить?</string>
+    <string name="version_none">(Нет)</string>
 
     <!--Module Fragment-->
     <string name="no_info_provided">(Нет информации)</string>
@@ -51,7 +60,7 @@
     <string name="disable_file_created">Модуль будет выключён при перезагрузке</string>
     <string name="disable_file_removed">Модуль будет включён при перезагрузке</string>
     <string name="author">Автор: %1$s</string>
-    <string name="fab_flash_zip">Прошить модуль из zip-архива</string>
+    <string name="fab_flash_zip">Прошить zip-архив</string>
 
     <!--Repo Fragment-->
     <string name="update_available">Доступно обновление</string>
@@ -82,13 +91,15 @@
     <string name="permissionNotGranted">Это не будет работать без доступа к внешнему хранилищу</string>
     <string name="no_thanks">Нет, спасибо</string>
     <string name="yes">Да</string>
+    <string name="ok">OK</string>
+    <string name="close">Закрыть</string>
     <string name="repo_install_title">Установить %1$s</string>
     <string name="repo_install_msg">Вы хотите установить %1$s ?</string>
     <string name="download_install">Скачать и установить</string>
+    <string name="download">Скачать</string>
     <string name="goto_install">Перейти в раздел «Установка»</string>
     <string name="download_file_error">Ошибка при скачивании файла</string>
     <string name="install_error">Ошибка при установке!</string>
-    а
     <string name="invalid_zip">Этот архив не содержит модуль Magisk!!</string>
     <string name="reboot_title">Установка успешна!</string>
     <string name="reboot_msg">Вы хотите перезагрузиться?</string>
@@ -110,14 +121,22 @@
     <string name="no_magisksu_title">MagiskSU не используется!</string>
     <string name="no_magisksu_msg">Если рут получен не через MagiskSU, использования MagiskHide может не хватить!\nЭто официально не поддерживается, и вам могут понадобиться дополнительные инструменты (например, suhide), чтобы пройти SafetyNet.</string>
     <string name="understand">Я понимаю</string>
+    <string name="process_error">Ошибка обработки</string>
+    <string name="internal_storage">Этот архив расположен в:\n[Внутреннее хранилище]%1$s</string>
+    <string name="zip_process_title">Обработка</string>
+    <string name="manual_boot_image">Выберите образ Boot вручную!</string>
 
     <!--Settings Activity -->
     <string name="settings_general_category">Основные</string>
     <string name="settings_dark_theme_title">Тёмная тема</string>
     <string name="settings_dark_theme_summary">Включить тёмную тему</string>
+    <string name="settings_notification_title">Уведомления об обновлениях</string>
+    <string name="settings_notification_summary">Показывать уведомления при наличии новых версий</string>
     <string name="settings_clear_cache_title">Очистить кэш репозиториев</string>
     <string name="settings_clear_cache_summary">Удалить сохранённую информацию о сетевых репозиториях, чтобы приложение обновило информацию из сети</string>
 
+    <string name="settings_core_only_title">Базовый режим</string>
+    <string name="settings_core_only_summary">Включить только основные функции, не загружать модули. MagiskSU, MagiskHide, Systemless hosts, и BusyBox будут включены</string>
     <string name="settings_magiskhide_summary">Скрыть Magisk от различных проверок</string>
     <string name="settings_busybox_title">Включить BusyBox</string>
     <string name="settings_busybox_summary">Примонтировать встроенный busybox из Magisk в xbin</string>
@@ -149,7 +168,7 @@
     <string name="deny_with_str">Отказать %1$s</string>
     <string name="deny">Отказать</string>
     <string name="prompt">Запрос</string>
-    <string name="grant">Предоставить</string>
+    <string name="grant">Разрешить</string>
     <string name="su_warning">Предоставить полный доступ к устройству.\nОтклоните, если не уверены!</string>
     <string name="forever">Навсегда</string>
     <string name="once">Один раз</string>
@@ -174,7 +193,7 @@
 
     <!--Superuser logs-->
     <string name="pid">PID:\u0020</string>
-    <string name="target_uid">Идентификатор UID:\u0020</string>
+    <string name="target_uid">UID:\u0020</string>
     <string name="command">Команда:\u0020</string>
 
 </resources>

From 29c2d785b5b688984f6c89ae5babebab1f9f3248 Mon Sep 17 00:00:00 2001
From: gh2923 <gggghhhh2925@163.com>
Date: Tue, 23 May 2017 21:18:08 +0800
Subject: [PATCH 12/16] Update Simplified Chinese Translation

---
 app/src/main/res/values-zh-rCN/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2ad1ba10..ae64b44e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -26,11 +26,15 @@
     <string name="proper_root">已正确 ROOT</string>
     <string name="safetyNet_check_text">点击启动 SafetyNet 检查</string>
     <string name="checking_safetyNet_status">正在检查 SafetyNet 状态…</string>
+    <string name="safetyNet_check_success">SafetyNet 检查成功</string>
     <string name="safetyNet_connection_failed">无法连接至 Google API</string>
     <string name="safetyNet_connection_suspended">与 Google API 的连接已暂停</string>
     <string name="safetyNet_no_response">无法检查 SafetyNet，没有网络连接？</string>
     <string name="safetyNet_fail">SafetyNet 失败：CTS 配置文件不匹配</string>
     <string name="safetyNet_pass">SafetyNet 已通过</string>
+    <string name="safetyNet_network_loss">网络断线</string>
+    <string name="safetyNet_service_disconnected">服务已被取消</string>
+    <string name="safetyNet_res_invalid">回传值无效</string>
     <string name="root_info_warning">功能严重受限</string>
 
     <!--Install Fragment-->

From 029be5ccca7a30f5c9055ea5ab0956bae8061e10 Mon Sep 17 00:00:00 2001
From: gh2923 <gggghhhh2925@163.com>
Date: Sun, 28 May 2017 21:29:53 +0800
Subject: [PATCH 13/16] Update Simplified Chinese Translation

---
 app/src/main/res/values-zh-rCN/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ae64b44e..7a77ed37 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -159,6 +159,15 @@
     <string name="superuser_notification">超级用户通知</string>
     <string name="request_timeout_summary">%1$s 秒</string>
 
+    <string name="multiuser_mode">多用户模式</string>
+    <string name="settings_owner_only">仅设备所有者</string>
+    <string name="settings_owner_manage">由设备所有者管理</string>
+    <string name="settings_user_independent">各用户独立</string>
+    <string name="owner_only_summary">仅设备所有者账户有超级用户权限</string>
+    <string name="owner_manage_summary">仅设备所有者账户能管理超级用户并接收权限请求提示</string>
+    <string name="user_indepenent_summary">每个用户有独立的权限规则</string>
+    <string name="multiuser_hint_owner_request">已发送权限请求到设备所有者账户中。请切换到所有者账户授予权限</string>
+
     <string name="settings_development_category">开发</string>
     <string name="settings_developer_logging_title">启用高级日志记录</string>
     <string name="settings_developer_logging_summary">勾选此项以启用更加详细的日志记录。</string>

From b5d1d8cdad70712299cebd1a3b5a88dfc7f268ec Mon Sep 17 00:00:00 2001
From: Igor Sorocean <igor_sorocean@hotmail.com>
Date: Wed, 31 May 2017 19:44:37 +0300
Subject: [PATCH 14/16] Update romanian translation

---
 app/src/main/res/values-ro/strings.xml | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index fe3355ba..d33743c7 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -12,7 +12,7 @@
 
     <!--Status Fragment-->
     <string name="magisk_version">Magisk instalat v%1$s</string>
-    <string name="magisk_version_core_only">Magisk instalat v%1$s (Mod Doar Nucleu)</string>
+    <string name="magisk_version_core_only">Magisk instalat v%1$s (Mod de bază)</string>
     <string name="magisk_version_error">Magisk nu este instalat</string>
 
     <string name="checking_for_updates">Verificare actualizări…</string>
@@ -112,10 +112,10 @@
     <string name="settings_reboot_toast">Reporniți pentru a aplica setările</string>
     <string name="release_notes">Note de lansare</string>
     <string name="repo_cache_cleared">Arhive cache eliminate</string>
-    <string name="safetyNet_hide_notice">Această aplicație utilizează SafetyNet\nDeja manipulat de MagiskHide în mod implicit</string>
+    <string name="safetyNet_hide_notice">Această aplicație utilizează SafetyNet\nDeja gestionat de MagiskHide în mod implicit</string>
     <string name="start_magiskhide">Pornire MagiskHide…</string>
     <string name="no_magisksu_title">Nu se utilizează MagiskSU!</string>
-    <string name="no_magisksu_msg">Nu aţi obţinut root cu MagiskSU, utilizarea MagiskHide s-ar putea să nu fie suficientă!\nNu este susținută oficial și veți avea nevoie de instrumente suplimentare (de ex. suhide) pentru a trece Safety Net.</string>
+    <string name="no_magisksu_msg">Nu aţi obţinut acces la root cu MagiskSU, utilizarea MagiskHide s-ar putea să nu fie suficientă!\nNu este susținută oficial și veți avea nevoie de instrumente suplimentare (de ex. suhide) pentru a trece Safety Net.</string>
     <string name="understand">Înţeleg</string>
     <string name="process_error">Eroare de proces</string>
     <string name="internal_storage">Zip stocat în:\n[Stocare internă]%1$s</string>
@@ -131,7 +131,7 @@
     <string name="settings_clear_cache_title">Eliminare cache</string>
     <string name="settings_clear_cache_summary">Ștergeți informațiile memorate în cache, forțează actualizarea aplicației online</string>
 
-    <string name="settings_core_only_title">Mod Doar nucleu</string>
+    <string name="settings_core_only_title">Mod de bază</string>
     <string name="settings_core_only_summary">Se activează numai caracteristicile principale, toate modulele nu vor fi încărcate. MagiskSU, MagiskHide, systemless hosts şi busybox vor fi în continuare activate</string>
     <string name="settings_magiskhide_summary">Ascundeţi Magisk de la diferite detectări</string>
     <string name="settings_busybox_title">Activare BusyBox</string>
@@ -152,6 +152,17 @@
     <string name="request_timeout">Expirare</string>
     <string name="superuser_notification">Notificare Superuser</string>
     <string name="request_timeout_summary">%1$s secunde</string>
+    <string name="settings_su_reauth_title">Reautentificare după actualizare</string>
+    <string name="settings_su_reauth_summary">Reautentificare permisiuni pentru superuser după o actualizare a aplicației</string>
+ 
+    <string name="multiuser_mode">Mod Multiutilizator</string>
+    <string name="settings_owner_only">Numai proprietarul dispozitivului</string>
+    <string name="settings_owner_manage">Gestionat de proprietarul dispozitivului</string>
+    <string name="settings_user_independent">Utilizator independent</string>
+    <string name="owner_only_summary">Numai proprietarul are acces la root</string>
+    <string name="owner_manage_summary">Numai proprietarul poate gestiona accesul la root și să primească solicitări</string>
+    <string name="user_indepenent_summary">Fiecare utilizator are propriile reguli de acces la root</string>
+    <string name="multiuser_hint_owner_request">A fost trimisă o solicitare proprietarului dispozitivului. Comutaţi la proprietar și acordați permisiunea</string>
 
     <string name="settings_development_category">Dezvoltare aplicaţie</string>
     <string name="settings_developer_logging_title">Activați logarea avansată de depanare</string>

From 1e4425b30fb44e2d852ab7dc069ca94a20c9115b Mon Sep 17 00:00:00 2001
From: RoySchutte <roy-schutte@hotmail.com>
Date: Wed, 31 May 2017 18:45:02 +0200
Subject: [PATCH 15/16] Update strings-nl.xml

---
 app/src/main/res/values-nl/strings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 52f57868..f7dc7580 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -158,12 +158,23 @@
     <string name="request_timeout">Verzoek time-out</string>
     <string name="superuser_notification">Superuser melding</string>
     <string name="request_timeout_summary">%1$s seconden</string>
+    <string name="settings_su_reauth_title">Opnieuw verzoeken na bijwerken</string>
+    <string name="settings_su_reauth_summary">Superuser rechten opnieuw opvragen na bijwerken applicatie</string>
 
     <string name="settings_development_category">App-ontwikkeling</string>
     <string name="settings_developer_logging_title">Geavanceerde debug logs inschakelen</string>
     <string name="settings_developer_logging_summary">Aanvinken om uitgebreide logs in te schakelen</string>
     <string name="settings_shell_logging_title">Shell-opdracht debug logs inschakelen</string>
     <string name="settings_shell_logging_summary">Aanvinken om alle shell-opdracht en uitvoer logs in te schakelen</string>
+    
+    <string name="multiuser_mode">Multi-gebruiker modus</string>
+    <string name="settings_owner_only">Alleen apparaateigenaar</string>
+    <string name="settings_owner_manage">Beheerd door apparaateigenaar</string>
+    <string name="settings_user_independent">Gebruiker onafhankelijk</string>
+    <string name="owner_only_summary">Alleen eigenaar heeft roottoegang</string>
+    <string name="owner_manage_summary">Alleen eigenaar kan roottoegang beheren en prompt verzoeken ontvangen</string>
+    <string name="user_indepenent_summary">Iedere gebruiker heeft eigen afzonderlijke rootregels</string>
+    <string name="multiuser_hint_owner_request">Een verzoek is naar de apparaateigenaar verstuurd. Wissel van gebruiker en sta de rechten toe</string>
 
     <!--Superuser-->
     <string name="su_request_title">Superuser verzoek</string>

From ff6938280e5e37bba7965b2fc59c76b2c6bc7c65 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 1 Jun 2017 03:18:41 +0800
Subject: [PATCH 16/16] Switch to DB based su configs

---
 .../com/topjohnwu/magisk/MagiskManager.java   | 14 ++---------
 .../topjohnwu/magisk/SettingsActivity.java    | 19 +++-----------
 .../magisk/database/SuDatabaseHelper.java     | 25 +++++++++++++++++++
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
index d0b1a04d..c9dc25c1 100644
--- a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
@@ -161,18 +161,8 @@ public void initSU() {
             isSuClient = suVersion.toUpperCase().contains("MAGISK");
         }
         if (isSuClient) {
-            ret = Shell.sh("getprop " + ROOT_ACCESS_PROP);
-            if (Utils.isValidShellResponse(ret)) {
-                suAccessState = Integer.parseInt(ret.get(0));
-            } else {
-                suAccessState = 0;
-            }
-            ret = Shell.sh("getprop " + MULTIUSER_MODE_PROP);
-            if (Utils.isValidShellResponse(ret)) {
-                multiuserMode = Integer.parseInt(ret.get(0));
-            } else {
-                multiuserMode = 0;
-            }
+            suAccessState = suDB.getSettings(SuDatabaseHelper.ROOT_ACCESS, 3);
+            multiuserMode = suDB.getSettings(SuDatabaseHelper.MULTIUSER_MODE, 0);
         }
     }
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
index fd345455..217db873 100644
--- a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
@@ -15,6 +15,7 @@
 import com.topjohnwu.magisk.asyncs.SerialTask;
 import com.topjohnwu.magisk.components.Activity;
 import com.topjohnwu.magisk.components.AlertDialogBuilder;
+import com.topjohnwu.magisk.database.SuDatabaseHelper;
 import com.topjohnwu.magisk.utils.Logger;
 import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
@@ -188,24 +189,12 @@ protected Void doInBackground(Void... voids) {
                     }.exec();
                     break;
                 case "su_access":
-                    magiskManager.suAccessState = Utils.getPrefsInt(prefs, "su_access", 0);
-                    new SerialTask<Void, Void, Void>(getActivity()) {
-                        @Override
-                        protected Void doInBackground(Void... params) {
-                            Shell.su("setprop " + MagiskManager.ROOT_ACCESS_PROP + " " + magiskManager.suAccessState);
-                            return null;
-                        }
-                    }.exec();
+                    magiskManager.suAccessState = Utils.getPrefsInt(prefs, "su_access", 3);
+                    magiskManager.suDB.setSettings(SuDatabaseHelper.ROOT_ACCESS, magiskManager.suAccessState);
                     break;
                 case "multiuser_mode":
                     magiskManager.multiuserMode = Utils.getPrefsInt(prefs, "multiuser_mode", 0);
-                    new SerialTask<Void, Void, Void>(getActivity()) {
-                        @Override
-                        protected Void doInBackground(Void... params) {
-                            Shell.su("setprop " + MagiskManager.MULTIUSER_MODE_PROP + " " + magiskManager.multiuserMode);
-                            return null;
-                        }
-                    }.exec();
+                    magiskManager.suDB.setSettings(SuDatabaseHelper.MULTIUSER_MODE, magiskManager.multiuserMode);
                 case "su_request_timeout":
                     magiskManager.suRequestTimeout = Utils.getPrefsInt(prefs, "su_request_timeout", 10);
                     break;
diff --git a/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java b/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
index b0e3a298..b8f49916 100644
--- a/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
+++ b/app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk.database;
 
+import android.content.ContentValues;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
@@ -18,6 +19,9 @@
 
 public class SuDatabaseHelper extends SQLiteOpenHelper {
 
+    public static final String ROOT_ACCESS = "root_access";
+    public static final String MULTIUSER_MODE = "multiuser_mode";
+
     private static final int DATABASE_VER = 2;
     private static final String POLICY_TABLE = "policies";
     private static final String LOG_TABLE = "logs";
@@ -206,4 +210,25 @@ public void clearLogs() {
         db.delete(LOG_TABLE, null, null);
         db.close();
     }
+
+    public void setSettings(String key, int value) {
+        ContentValues data = new ContentValues();
+        data.put("key", key);
+        data.put("value", value);
+        SQLiteDatabase db = getWritableDatabase();
+        db.replace(SETTINGS_TABLE, null, data);
+        db.close();
+    }
+
+    public int getSettings(String key, int defaultValue) {
+        SQLiteDatabase db = getReadableDatabase();
+        int value = defaultValue;
+        try (Cursor c = db.query(SETTINGS_TABLE, null, "key=?", new String[] { key }, null, null, null)) {
+            while (c.moveToNext()) {
+                value = c.getInt(c.getColumnIndex("value"));
+            }
+        }
+        db.close();
+        return value;
+    }
 }