etc
/
VancedManager
mirror of https://github.com/YTVanced/VancedManager
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

root mode fixes

This commit is contained in:
X1nto 2020-06-01 21:46:20 +04:00
parent 6dffaea15a
commit b72e5c0baf
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/vanced/manager/core/base/BaseFragment.kt
View File

@ -15,6 +15,7 @@ import androidx.browser.customtabs.CustomTabsIntent
import androidx.core.content.ContextCompat
import androidx.core.content.FileProvider
import androidx.fragment.app.Fragment
import androidx.preference.PreferenceManager
import com.dezlum.codelabs.getjson.GetJson
import com.vanced.manager.core.installer.RootSplitInstallerService
import com.vanced.manager.ui.MainActivity
@ -190,7 +191,7 @@ open class BaseFragment : Fragment() {
dlText.visibility = View.GONE
loadCircle.visibility = View.VISIBLE
prefs?.edit()?.putBoolean("isVancedDownloading", false)?.apply()
if (prefs?.getString("vanced_variant", "nonroot") == "root") {
if (PreferenceManager.getDefaultSharedPreferences(activity).getString("vanced_variant", "nonroot") == "root") {
launchRootInstaller()
} else {
launchInstaller()

20
app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
View File

@ -1,7 +1,6 @@
package com.vanced.manager.ui.fragments
import android.animation.ObjectAnimator
import android.content.Context
import android.os.Build
import android.os.Bundle
import android.view.*
@ -79,8 +78,7 @@ class HomeFragment : Home() {
val vancedinstallbtn = view?.findViewById<MaterialButton>(R.id.vanced_installbtn)
val vancedLatestTxt = view?.findViewById<TextView>(R.id.vanced_latest_version)
val networkErrorLayout = view?.findViewById<MaterialCardView>(R.id.home_network_wrapper)
val prefs = activity?.getSharedPreferences("installPrefs", Context.MODE_PRIVATE)
val variant = prefs?.getString("vanced_variant", "nonroot")
val variant = getDefaultSharedPreferences(activity).getString("vanced_variant", "nonroot")
disposable = ReactiveNetwork.observeInternetConnectivity()
.subscribeOn(Schedulers.io())
@ -122,16 +120,16 @@ class HomeFragment : Home() {
when {
microgRemoteCode > microgVerCode -> {
microginstallbtn?.text =
activity?.getString(R.string.button_installed)
activity?.getString(R.string.update)
microginstallbtn?.icon =
activity?.getDrawable(R.drawable.outline_cloud_done_24)
activity?.getDrawable(R.drawable.ic_cloud_upload_black_24dp)
}
microgRemoteCode == microgVerCode -> {
microginstallbtn?.text =
activity?.getString(R.string.update)
activity?.getString(R.string.button_installed)
microginstallbtn?.icon =
activity?.getDrawable(R.drawable.ic_cloud_upload_black_24dp)
activity?.getDrawable(R.drawable.outline_cloud_done_24)
}
}
}
@ -171,16 +169,16 @@ class HomeFragment : Home() {
when {
vancedRemoteCode > vancedVerCode -> {
vancedinstallbtn?.text =
activity?.getString(R.string.button_installed)
activity?.getString(R.string.update)
vancedinstallbtn?.icon =
activity?.getDrawable(R.drawable.outline_cloud_done_24)
activity?.getDrawable(R.drawable.ic_cloud_upload_black_24dp)
}
vancedRemoteCode == vancedVerCode -> {
vancedinstallbtn?.text =
activity?.getString(R.string.update)
activity?.getString(R.string.button_installed)
vancedinstallbtn?.icon =
activity?.getDrawable(R.drawable.ic_cloud_upload_black_24dp)
activity?.getDrawable(R.drawable.outline_cloud_done_24)
}
}
}

4
app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
View File

@ -39,8 +39,8 @@ class SettingsFragment : PreferenceFragmentCompat() {
val installMode: DropDownPreference? = findPreference("vanced_variant")
installMode?.summary = preferenceScreen.sharedPreferences.getString("vanced_variant", "nonroot")
installMode?.setOnPreferenceChangeListener{ preference, _ ->
when (preference.toString()) {
installMode?.setOnPreferenceChangeListener{ _, _ ->
when (installMode.value) {
"root" -> {
if (!Shell.rootAccess()) {
preferenceScreen.sharedPreferences.edit().putString("vanced_variant", "nonroot").apply()