From 85d9bd910697f4df211fe1f3a4d178f4cfbc6c84 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 23 Aug 2019 00:30:21 +0800
Subject: [PATCH] Fix compile errors

---
 .../magisk/ui/base/BasePreferenceFragment.kt  |  4 --
 .../magisk/ui/settings/SettingsFragment.kt    | 40 +++++++++----------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/base/BasePreferenceFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/base/BasePreferenceFragment.kt
index 885a91c14..2642494cd 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/base/BasePreferenceFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/base/BasePreferenceFragment.kt
@@ -59,8 +59,4 @@ abstract class BasePreferenceFragment : PreferenceFragmentCompat(),
         else
             view.setPadding(0, view.paddingTop, view.paddingRight, view.paddingBottom)
     }
-
-    protected fun <T: Preference> findPref(key: CharSequence): T {
-        return findPreference(key) as T
-    }
 }
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
index d7b1a706f..0f5f82aba 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
@@ -57,46 +57,46 @@ class SettingsFragment : BasePreferenceFragment() {
         preferenceManager.setStorageDeviceProtected()
         setPreferencesFromResource(R.xml.app_settings, rootKey)
 
-        updateChannel = findPref(Config.Key.UPDATE_CHANNEL)
-        rootConfig = findPref(Config.Key.ROOT_ACCESS)
-        autoRes = findPref(Config.Key.SU_AUTO_RESPONSE)
-        requestTimeout = findPref(Config.Key.SU_REQUEST_TIMEOUT)
-        suNotification = findPref(Config.Key.SU_NOTIFICATION)
-        multiuserConfig = findPref(Config.Key.SU_MULTIUSER_MODE)
-        nsConfig = findPref(Config.Key.SU_MNT_NS)
-        val reauth = findPreference(Config.Key.SU_REAUTH) as SwitchPreferenceCompat
-        val fingerprint = findPreference(Config.Key.SU_FINGERPRINT) as SwitchPreferenceCompat
-        val generalCatagory = findPreference("general") as PreferenceCategory
-        val magiskCategory = findPreference("magisk") as PreferenceCategory
-        val suCategory = findPreference("superuser") as PreferenceCategory
-        val hideManager = findPreference("hide")
+        updateChannel = findPreference(Config.Key.UPDATE_CHANNEL)!!
+        rootConfig = findPreference(Config.Key.ROOT_ACCESS)!!
+        autoRes = findPreference(Config.Key.SU_AUTO_RESPONSE)!!
+        requestTimeout = findPreference(Config.Key.SU_REQUEST_TIMEOUT)!!
+        suNotification = findPreference(Config.Key.SU_NOTIFICATION)!!
+        multiuserConfig = findPreference(Config.Key.SU_MULTIUSER_MODE)!!
+        nsConfig = findPreference(Config.Key.SU_MNT_NS)!!
+        val reauth = findPreference<SwitchPreferenceCompat>(Config.Key.SU_REAUTH)!!
+        val fingerprint = findPreference<SwitchPreferenceCompat>(Config.Key.SU_FINGERPRINT)!!
+        val generalCatagory = findPreference<PreferenceCategory>("general")!!
+        val magiskCategory = findPreference<PreferenceCategory>("magisk")!!
+        val suCategory = findPreference<PreferenceCategory>("superuser")!!
+        val hideManager = findPreference<Preference>("hide")!!
         hideManager.setOnPreferenceClickListener {
             PatchAPK.hideManager(requireContext())
             true
         }
-        val restoreManager = findPreference("restore")
-        restoreManager.setOnPreferenceClickListener {
+        val restoreManager = findPreference<Preference>("restore")
+        restoreManager?.setOnPreferenceClickListener {
             DownloadService(requireContext()) {
                 subject = DownloadSubject.Manager(Configuration.APK.Restore)
             }
             true
         }
-        findPreference("clear").setOnPreferenceClickListener {
+        findPreference<Preference>("clear")?.setOnPreferenceClickListener {
             Completable.fromAction { repoDB.clear() }.subscribeK {
                 Utils.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT)
             }
             true
         }
-        findPreference("hosts").setOnPreferenceClickListener {
+        findPreference<Preference>("hosts")?.setOnPreferenceClickListener {
             Shell.su("add_hosts_module").submit {
                 Utils.toast(R.string.settings_hosts_toast, Toast.LENGTH_SHORT)
             }
             true
         }
 
-        findPreference(Config.Key.DOWNLOAD_PATH).apply {
+        findPreference<Preference>(Config.Key.DOWNLOAD_PATH)?.apply {
             summary = Config.downloadPath
-        }.setOnPreferenceClickListener { preference ->
+        }?.setOnPreferenceClickListener { preference ->
             activity.withExternalRW {
                 onSuccess {
                     showDownloadDialog {
@@ -122,7 +122,7 @@ class SettingsFragment : BasePreferenceFragment() {
             true
         }
 
-        setLocalePreference(findPreference(Config.Key.LOCALE) as ListPreference)
+        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 */