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

replaced variable call

This commit is contained in:
Xinto 2020-10-03 15:34:19 +04:00
parent 0e450bdbad
commit 68e9241ab8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/vanced/manager/utils/PackageHelper.kt
View File

@ -19,6 +19,7 @@ import com.vanced.manager.ui.viewmodels.HomeViewModel.Companion.vancedProgress
import com.vanced.manager.utils.AppUtils.mutableInstall
import com.vanced.manager.utils.AppUtils.sendFailure
import com.vanced.manager.utils.AppUtils.sendRefresh
import com.vanced.manager.utils.AppUtils.vancedRootPkg
import java.io.*
import java.text.SimpleDateFormat
import java.util.*
@ -28,7 +29,6 @@ import kotlin.collections.HashMap
object PackageHelper {
private const val yPkg = "com.google.android.youtube"
private const val apkInstallPath = "/data/adb/Vanced/"
fun isPackageInstalled(packageName: String, packageManager: PackageManager): Boolean {
@ -347,12 +347,12 @@ object PackageHelper {
}
private fun linkVanced(apkFPath: String, path: String): Boolean {
Shell.su("am force-stop $yPkg").exec()
Shell.su("am force-stop $vancedRootPkg").exec()
val umountv = Shell.su("""for i in ${'$'}(ls /data/app/ | grep com.google.android.youtube | tr " "); do umount -l "/data/app/${"$"}i/base.apk"; done """).exec()
//Log.d("umountTest", Shell.su("grep com.google.android.youtube").exec().out.joinToString(" "))
val response = Shell.su("""su -mm -c "mount -o bind $apkFPath $path"""").exec()
Thread.sleep(500)
Shell.su("am force-stop $yPkg").exec()
Shell.su("am force-stop $vancedRootPkg").exec()
return response.isSuccess
}
@ -397,7 +397,7 @@ object PackageHelper {
//uninstall current update and install base that works with patch
private fun fixHigherVer(apkFiles: ArrayList<FileInfo>, context: Context) : Boolean {
if (uninstallApk(yPkg, context)) {
if (uninstallApk(vancedRootPkg, context)) {
return installSplitApkFiles(apkFiles, context)
}
sendFailure(listOf("Failed_Uninstall").toMutableList(), context)
@ -433,7 +433,7 @@ object PackageHelper {
if(apkinF.exists()) {
try {
Shell.su("am force-stop $yPkg").exec()
Shell.su("am force-stop $vancedRootPkg").exec()
//Shell.su("rm -r SuFile.open(path).parent")
@ -470,9 +470,9 @@ object PackageHelper {
private fun getVersionNumber(context: Context): Int? {
try {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
context.packageManager.getPackageInfo(yPkg, 0).longVersionCode.and(0xFFFFFFFF).toInt()
context.packageManager.getPackageInfo(vancedRootPkg, 0).longVersionCode.and(0xFFFFFFFF).toInt()
else
context.packageManager.getPackageInfo(yPkg, 0).versionCode
context.packageManager.getPackageInfo(vancedRootPkg, 0).versionCode
}
catch (e : Exception) {
val execRes = Shell.su("dumpsys package com.google.android.youtube | grep versionCode").exec()
@ -497,7 +497,7 @@ object PackageHelper {
private fun getPackageDir(context: Context): String?
{
return try {
val p = getPkgInfo(yPkg, context)
val p = getPkgInfo(vancedRootPkg, context)
p!!.applicationInfo.sourceDir
} catch (e: Exception) {
val execRes = Shell.su("dumpsys package com.google.android.youtube | grep codePath").exec()