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

fixed crash

This commit is contained in:
X1nto 2020-06-01 21:15:13 +04:00
parent 04889412e2
commit 6dffaea15a
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/vanced/manager/core/installer/RootSplitInstallerService.kt
View File

@ -7,6 +7,7 @@ import android.os.AsyncTask
import android.os.Build import android.os.Build
import android.os.IBinder import android.os.IBinder
import android.util.Log import android.util.Log
import androidx.annotation.Nullable
import androidx.annotation.WorkerThread import androidx.annotation.WorkerThread
import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.localbroadcastmanager.content.LocalBroadcastManager
import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.Shell
@ -129,7 +130,8 @@ class RootSplitInstallerService: Service() {
return result return result
} }
@Nullable
override fun onBind(intent: Intent?): IBinder? { override fun onBind(intent: Intent?): IBinder? {
TODO("Not yet implemented") return null
} }
} }

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

@ -100,7 +100,7 @@ class HomeFragment : Home() {
val vancedRemoteCode = val vancedRemoteCode =
GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/vanced.json") GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/vanced.json")
.get("version").asInt .get("versionCode").asInt
val microgRemoteCode = val microgRemoteCode =
GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/microg.json") GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/microg.json")
.get("versionCode").asInt .get("versionCode").asInt
@ -139,30 +139,34 @@ class HomeFragment : Home() {
if (vancedStatus!!) { if (vancedStatus!!) {
val vancedVerCode = val vancedVerCode =
if (prefs?.getString("vanced_variant", "nonroot") == "root") { if (variant == "root") {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
pm.getPackageInfo( pm.getPackageInfo(
"com.google.android.youtube", "com.google.android.youtube",
0 0
).longVersionCode.and(0xFFFFFFFF).toInt() ).longVersionCode.and(0xFFFFFFFF).toInt()
else }
else {
pm.getPackageInfo( pm.getPackageInfo(
"com.google.android.youtube", "com.google.android.youtube",
0 0
).versionCode ).versionCode
} }
}
else { else {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
pm.getPackageInfo( pm.getPackageInfo(
"com.vanced.android.youtube", "com.vanced.android.youtube",
0 0
).longVersionCode.and(0xFFFFFFFF).toInt() ).longVersionCode.and(0xFFFFFFFF).toInt()
else }
else {
pm.getPackageInfo( pm.getPackageInfo(
"com.vanced.android.youtube", "com.vanced.android.youtube",
0 0
).versionCode ).versionCode
} }
}
when { when {
vancedRemoteCode > vancedVerCode -> { vancedRemoteCode > vancedVerCode -> {