Merge remote-tracking branch 'john/master' into feature/redesign

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/topjohnwu/magisk/ClassMap.kt
#	app/src/main/java/com/topjohnwu/magisk/Info.kt
#	app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt
#	app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
#	app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
#	app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt

app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt

@@ -7,8 +7,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavTransactionOptions
-import com.topjohnwu.magisk.ClassMap
-import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.Const.Key.OPEN_SECTION
 import com.topjohnwu.magisk.Info
 import com.topjohnwu.magisk.R
@@ -17,6 +15,7 @@ import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.ActivityMainBinding
 import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
 import com.topjohnwu.magisk.extensions.snackbar
+import com.topjohnwu.magisk.intent
 import com.topjohnwu.magisk.model.events.*
 import com.topjohnwu.magisk.model.navigation.MagiskAnimBuilder
 import com.topjohnwu.magisk.model.navigation.MagiskNavigationEvent
@@ -61,7 +60,7 @@ open class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Na
 
     override fun onCreate(savedInstanceState: Bundle?) {
         if (!SplashActivity.DONE) {
-            startActivity(Intent(this, ClassMap[SplashActivity::class.java]))
+            startActivity(intent(SplashActivity::class.java))
             finish()
         }
 
@@ -155,11 +154,11 @@ open class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Na
     private fun checkHideSection() {
         val menu = binding.navView.menu
         menu.findItem(R.id.magiskHideFragment).isVisible =
-            Shell.rootAccess() && Config.magiskHide
+            Shell.rootAccess() && Info.env.magiskHide
         menu.findItem(R.id.modulesFragment).isVisible =
-            Shell.rootAccess() && Info.magiskVersionCode >= 0
+            Shell.rootAccess() && Info.env.magiskVersionCode >= 0
         menu.findItem(R.id.reposFragment).isVisible =
-            (viewModel.isConnected.value && Shell.rootAccess() && Info.magiskVersionCode >= 0)
+            (viewModel.isConnected.value && Shell.rootAccess() && Info.env.magiskVersionCode >= 0)
         menu.findItem(R.id.logFragment).isVisible =
             Shell.rootAccess()
         menu.findItem(R.id.superuserFragment).isVisible =

app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt

@@ -2,14 +2,12 @@ package com.topjohnwu.magisk.ui
 
 import android.app.Activity
 import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
 import androidx.appcompat.app.AlertDialog
 import com.topjohnwu.magisk.*
 import com.topjohnwu.magisk.model.navigation.Navigation
 import com.topjohnwu.magisk.utils.Utils
-import com.topjohnwu.magisk.utils.wrap
 import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
@@ -24,11 +22,11 @@ open class SplashActivity : Activity() {
         super.onCreate(savedInstanceState)
 
         Shell.getShell {
-            if (Info.magiskVersionCode > 0 && Info.magiskVersionCode < Const.MagiskVersion.MIN_SUPPORT) {
+            if (Info.env.magiskVersionCode > 0 && Info.env.magiskVersionCode < Const.Version.MIN_SUPPORT) {
                 AlertDialog.Builder(this)
                     .setTitle(R.string.unsupport_magisk_title)
                     .setMessage(R.string.unsupport_magisk_message)
-                    .setNegativeButton(R.string.ok, null)
+                    .setNegativeButton(android.R.string.ok, null)
                     .setOnDismissListener { finish() }
                     .show()
             } else {

app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt

@@ -6,12 +6,12 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.toUri
-import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.databinding.ActivityFlashBinding
 import com.topjohnwu.magisk.extensions.snackbar
+import com.topjohnwu.magisk.intent
 import com.topjohnwu.magisk.model.events.BackPressEvent
 import com.topjohnwu.magisk.model.events.PermissionEvent
 import com.topjohnwu.magisk.model.events.SnackbarEvent
@@ -60,7 +60,7 @@ open class FlashActivity : BaseActivity<FlashViewModel, ActivityFlashBinding>()
 
     companion object {
 
-        private fun intent(context: Context) = Intent(context, ClassMap[FlashActivity::class.java])
+        private fun intent(context: Context) = context.intent(FlashActivity::class.java)
             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         private fun intent(context: Context, file: File) = intent(context).setData(file.toUri())
 

app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt

@@ -87,8 +87,8 @@ class HomeFragment : BaseFragment<HomeViewModel, FragmentMagiskBinding>(),
             .setTitle(R.string.proprietary_title)
             .setMessage(R.string.proprietary_notice)
             .setCancelable(false)
-            .setPositiveButton(R.string.yes) { _, _ -> download() }
-            .setNegativeButton(R.string.no_thanks) { _, _ -> viewModel.finishSafetyNetCheck(-2) }
+            .setPositiveButton(android.R.string.yes) { _, _ -> download() }
+            .setNegativeButton(android.R.string.no) { _, _ -> viewModel.finishSafetyNetCheck(-2) }
             .show()
     }
 

app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt

@@ -107,10 +107,10 @@ class HomeViewModel(
             Info.recovery = it ?: return@addOnPropertyChangedCallback
         }
         isConnected.addOnPropertyChangedCallback {
-            if (it == true) refresh()
+            if (it == true) refresh(false)
         }
 
-        refresh()
+        refresh(false)
     }
 
     fun paypalPressed() = OpenLinkEvent(Const.Url.PAYPAL_URL).publish()
@@ -170,7 +170,11 @@ class HomeViewModel(
         }
     }
 
-    fun refresh() {
+    @JvmOverloads
+    fun refresh(invalidate: Boolean = true) {
+        if (invalidate)
+            Info.envRef.invalidate()
+
         hasRoot.value = Shell.rootAccess()
 
         val fetchUpdate = if (isConnected.value)
@@ -179,7 +183,8 @@ class HomeViewModel(
             Completable.complete()
 
         Completable.fromAction {
-            Info.loadMagiskInfo()
+            // Ensure value is ready
+            Info.env
         }.andThen(fetchUpdate)
         .applyViewModel(this)
         .doOnSubscribeUi {
@@ -197,33 +202,40 @@ class HomeViewModel(
 
     private fun refreshVersions() {
         magiskCurrentVersion.value = if (magiskState.value != MagiskState.NOT_INSTALLED) {
-            version.format(Info.magiskVersionString, Info.magiskVersionCode)
+            VERSION_FMT.format(Info.env.magiskVersionString, Info.env.magiskVersionCode)
         } else {
             ""
         }
 
-        managerCurrentVersion.value = version
-            .format(BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)
+        managerCurrentVersion.value = if (isRunningAsStub) MGR_VER_FMT
+            .format(BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, Info.stub!!.version)
+        else
+            VERSION_FMT.format(BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)
     }
 
     private fun updateSelf() {
-        magiskState.value = when (Info.magiskVersionCode) {
+        magiskState.value = when (Info.env.magiskVersionCode) {
             in Int.MIN_VALUE until 0 -> MagiskState.NOT_INSTALLED
-            !in Info.remote.magisk.versionCode..Int.MAX_VALUE -> MagiskState.OBSOLETE
+            in 1 until (Info.remote.magisk.versionCode - 1) -> MagiskState.OBSOLETE
             else -> MagiskState.UP_TO_DATE
         }
 
-        magiskLatestVersion.value = version
-            .format(Info.remote.magisk.version, Info.remote.magisk.versionCode)
+        magiskLatestVersion.value =
+            VERSION_FMT.format(Info.remote.magisk.version, Info.remote.magisk.versionCode)
 
         _managerState.value = when (Info.remote.app.versionCode) {
             in Int.MIN_VALUE until 0 -> MagiskState.NOT_INSTALLED //wrong update channel
-            in (BuildConfig.VERSION_CODE + 1)..Int.MAX_VALUE -> MagiskState.OBSOLETE
-            else -> MagiskState.UP_TO_DATE
+            in (BuildConfig.VERSION_CODE + 1) until Int.MAX_VALUE -> MagiskState.OBSOLETE
+            else -> {
+                if (isRunningAsStub && Info.stub!!.version < Info.remote.stub.versionCode)
+                    MagiskState.OBSOLETE
+                else
+                    MagiskState.UP_TO_DATE
+            }
         }
 
-        managerLatestVersion.value = version
-            .format(Info.remote.app.version, Info.remote.app.versionCode)
+        managerLatestVersion.value = MGR_VER_FMT
+            .format(Info.remote.app.version, Info.remote.app.versionCode, Info.remote.stub.versionCode)
     }
 
     private fun ensureEnv() {
@@ -240,7 +252,8 @@ class HomeViewModel(
     }
 
     companion object {
-        private const val version = "%s (%d)"
+        private const val VERSION_FMT = "%s (%d)"
+        private const val MGR_VER_FMT = "%s (%d) (%d)"
     }
 
 }

app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt

@@ -8,12 +8,12 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
-import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.databinding.FragmentModulesBinding
 import com.topjohnwu.magisk.extensions.reboot
+import com.topjohnwu.magisk.intent
 import com.topjohnwu.magisk.model.events.OpenFilePickerEvent
 import com.topjohnwu.magisk.model.events.ViewEvent
 import com.topjohnwu.magisk.ui.flash.FlashActivity
@@ -28,7 +28,7 @@ class ModulesFragment : BaseFragment<ModuleViewModel, FragmentModulesBinding>()
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == Const.ID.FETCH_ZIP && resultCode == Activity.RESULT_OK && data != null) {
             // Get the URI of the selected file
-            val intent = Intent(activity, ClassMap[FlashActivity::class.java])
+            val intent = activity.intent(FlashActivity::class.java)
             intent.setData(data.data).putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP)
             startActivity(intent)
         }

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt

@@ -13,20 +13,17 @@ import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
 import androidx.preference.SwitchPreferenceCompat
-import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.Config
-import com.topjohnwu.magisk.Const
-import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.*
 import com.topjohnwu.magisk.base.BasePreferenceFragment
 import com.topjohnwu.magisk.data.database.RepoDao
 import com.topjohnwu.magisk.databinding.CustomDownloadDialogBinding
+import com.topjohnwu.magisk.databinding.DialogCustomNameBinding
 import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.extensions.toLangTag
 import com.topjohnwu.magisk.model.download.DownloadService
 import com.topjohnwu.magisk.model.entity.internal.Configuration
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.observer.Observer
-import com.topjohnwu.magisk.net.Networking
 import com.topjohnwu.magisk.utils.*
 import com.topjohnwu.magisk.view.dialogs.FingerprintAuthDialog
 import com.topjohnwu.superuser.Shell
@@ -58,6 +55,7 @@ class SettingsFragment : BasePreferenceFragment() {
 
         findPreference<PreferenceCategory>("redesign_cat")?.isVisible = BuildConfig.DEBUG
 
+        // Get preferences
         updateChannel = findPreference(Config.Key.UPDATE_CHANNEL)!!
         rootConfig = findPreference(Config.Key.ROOT_ACCESS)!!
         autoRes = findPreference(Config.Key.SU_AUTO_RESPONSE)!!
@@ -71,17 +69,68 @@ class SettingsFragment : BasePreferenceFragment() {
         val magiskCategory = findPreference<PreferenceCategory>("magisk")!!
         val suCategory = findPreference<PreferenceCategory>("superuser")!!
         val hideManager = findPreference<Preference>("hide")!!
-        hideManager.setOnPreferenceClickListener {
-            PatchAPK.hideManager(requireContext())
-            true
+        val restoreManager = findPreference<Preference>("restore")!!
+
+        // Remove/Disable entries
+
+        // Only show canary channels if user is already on canary channel
+        // or the user have already chosen canary channel
+        if (!Utils.isCanary && Config.updateChannel < Config.Value.CANARY_CHANNEL) {
+            // Remove the last 2 entries
+            val entries = updateChannel.entries
+            updateChannel.entries = entries.copyOf(entries.size - 2)
         }
-        val restoreManager = findPreference<Preference>("restore")
-        restoreManager?.setOnPreferenceClickListener {
-            DownloadService(requireContext()) {
-                subject = DownloadSubject.Manager(Configuration.APK.Restore)
+
+        // Remove dangerous settings in secondary user
+        if (Const.USER_ID > 0) {
+            suCategory.removePreference(multiuserConfig)
+        }
+
+        // Remove re-authentication option on Android O, it will not work
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            suCategory.removePreference(reauth)
+        }
+
+        // Disable fingerprint option if not possible
+        if (!FingerprintHelper.canUseFingerprint()) {
+            fingerprint.isEnabled = false
+            fingerprint.isChecked = false
+            fingerprint.setSummary(R.string.disable_fingerprint)
+        }
+
+        if (Const.USER_ID == 0 && Info.isConnected.value && Shell.rootAccess()) {
+            if (activity.packageName == BuildConfig.APPLICATION_ID) {
+                generalCatagory.removePreference(restoreManager)
+                hideManager.setOnPreferenceClickListener {
+                    showManagerNameDialog {
+                        PatchAPK.hideManager(requireContext(), it)
+                    }
+                    true
+                }
+            } else {
+                generalCatagory.removePreference(hideManager)
+                restoreManager.setOnPreferenceClickListener {
+                    DownloadService(requireContext()) {
+                        subject = DownloadSubject.Manager(Configuration.APK.Restore)
+                    }
+                    true
+                }
             }
-            true
+        } else {
+            // Remove if not primary user, no connection, or no root
+            generalCatagory.removePreference(restoreManager)
+            generalCatagory.removePreference(hideManager)
         }
+
+        if (!Utils.showSuperUser()) {
+            preferenceScreen.removePreference(suCategory)
+        }
+
+        if (!Shell.rootAccess()) {
+            preferenceScreen.removePreference(magiskCategory)
+            generalCatagory.removePreference(hideManager)
+        }
+
         findPreference<Preference>("clear")?.setOnPreferenceClickListener {
             Completable.fromAction { repoDB.clear() }.subscribeK {
                 Utils.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT)
@@ -125,58 +174,7 @@ class SettingsFragment : BasePreferenceFragment() {
 
         setLocalePreference(findPreference(Config.Key.LOCALE)!!)
 
-        /* We only show canary channels if user is already on canary channel
-         * or the user have already chosen canary channel */
-        if (!Utils.isCanary && Config.updateChannel < Config.Value.CANARY_CHANNEL) {
-            // Remove the last 2 entries
-            val entries = updateChannel.entries
-            updateChannel.entries = entries.copyOf(entries.size - 2)
-
-        }
-
         setSummary()
-
-        // Disable dangerous settings in secondary user
-        if (Const.USER_ID > 0) {
-            suCategory.removePreference(multiuserConfig)
-        }
-
-        // Disable re-authentication option on Android O, it will not work
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            reauth.isEnabled = false
-            reauth.isChecked = false
-            reauth.setSummary(R.string.android_o_not_support)
-        }
-
-        // Disable fingerprint option if not possible
-        if (!FingerprintHelper.canUseFingerprint()) {
-            fingerprint.isEnabled = false
-            fingerprint.isChecked = false
-            fingerprint.setSummary(R.string.disable_fingerprint)
-        }
-
-        if (Shell.rootAccess() && Const.USER_ID == 0) {
-            if (activity.packageName == BuildConfig.APPLICATION_ID) {
-                generalCatagory.removePreference(restoreManager)
-            } else {
-                if (!Networking.checkNetworkStatus(requireContext())) {
-                    generalCatagory.removePreference(restoreManager)
-                }
-                generalCatagory.removePreference(hideManager)
-            }
-        } else {
-            generalCatagory.removePreference(restoreManager)
-            generalCatagory.removePreference(hideManager)
-        }
-
-        if (!Utils.showSuperUser()) {
-            preferenceScreen.removePreference(suCategory)
-        }
-
-        if (!Shell.rootAccess()) {
-            preferenceScreen.removePreference(magiskCategory)
-            generalCatagory.removePreference(hideManager)
-        }
     }
 
     override fun onSharedPreferenceChanged(prefs: SharedPreferences, key: String) {
@@ -299,8 +297,8 @@ class SettingsFragment : BasePreferenceFragment() {
         AlertDialog.Builder(requireActivity())
             .setTitle(R.string.settings_update_custom)
             .setView(v)
-            .setPositiveButton(R.string.ok) { _, _ -> onSuccess(url.text.toString()) }
-            .setNegativeButton(R.string.close) { _, _ -> onCancel() }
+            .setPositiveButton(android.R.string.ok) { _, _ -> onSuccess(url.text.toString()) }
+            .setNegativeButton(android.R.string.cancel) { _, _ -> onCancel() }
             .setOnCancelListener { onCancel() }
             .show()
     }
@@ -324,11 +322,35 @@ class SettingsFragment : BasePreferenceFragment() {
         AlertDialog.Builder(requireActivity())
             .setTitle(R.string.settings_download_path_title)
             .setView(binding.root)
-            .setPositiveButton(R.string.ok) { _, _ ->
+            .setPositiveButton(android.R.string.ok) { _, _ ->
                 Utils.ensureDownloadPath(data.text.value)?.let { onSuccess(data.text.value) }
                     ?: Utils.toast(R.string.settings_download_path_error, Toast.LENGTH_SHORT)
             }
-            .setNegativeButton(R.string.close, null)
+            .setNegativeButton(android.R.string.cancel, null)
             .show()
     }
-}
+
+    private inline fun showManagerNameDialog(
+        crossinline onSuccess: (String) -> Unit
+    ) {
+        val data = ManagerNameData()
+        val view = DialogCustomNameBinding
+            .inflate(LayoutInflater.from(requireContext()))
+            .also { it.data = data }
+
+        AlertDialog.Builder(requireActivity())
+            .setTitle(R.string.settings_app_name)
+            .setView(view.root)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                if (view.dialogNameInput.error.isNullOrBlank()) {
+                    onSuccess(data.name.value)
+                }
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .show()
+    }
+
+    inner class ManagerNameData {
+        val name = KObservableField(resources.getString(R.string.re_app_name))
+    }
+}

app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt

@@ -84,8 +84,8 @@ class SuperuserViewModel(
                 CustomAlertDialog(this)
                     .setTitle(R.string.su_revoke_title)
                     .setMessage(getString(R.string.su_revoke_msg, item.item.appName))
-                    .setPositiveButton(R.string.yes) { _, _ -> updateState() }
-                    .setNegativeButton(R.string.no_thanks, null)
+                    .setPositiveButton(android.R.string.yes) { _, _ -> updateState() }
+                    .setNegativeButton(android.R.string.no, null)
                     .setCancelable(true)
                     .show()
             }
@@ -144,4 +144,4 @@ class SuperuserViewModel(
     private fun deletePolicy(policy: MagiskPolicy) =
         policyDB.delete(policy.uid).andThen(Single.just(policy))
 
-}
+}

app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt

@@ -3,7 +3,6 @@ package com.topjohnwu.magisk.ui.surequest
 import android.content.pm.ActivityInfo
 import android.os.Build
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.Window
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.base.BaseActivity
@@ -31,19 +30,17 @@ open class SuRequestActivity : BaseActivity<SuRequestViewModel, ActivityRequestB
         super.onCreate(savedInstanceState)
 
         val intent = intent
-        val action = intent.action
 
-        if (TextUtils.equals(action, GeneralReceiver.REQUEST)) {
-            if (!viewModel.handleRequest(intent))
-                finish()
-            return
+        when (intent?.action) {
+            GeneralReceiver.REQUEST -> {
+                if (!viewModel.handleRequest(intent))
+                    finish()
+                return
+            }
+            GeneralReceiver.LOG -> SuLogger.handleLogs(this, intent)
+            GeneralReceiver.NOTIFY -> SuLogger.handleNotify(this, intent)
         }
 
-        if (TextUtils.equals(action, GeneralReceiver.LOG))
-            SuLogger.handleLogs(intent)
-        else if (TextUtils.equals(action, GeneralReceiver.NOTIFY))
-            SuLogger.handleNotify(intent)
-
         finish()
     }