etc/VancedManager
0
0
Fork 0
mirror of https://github.com/YTVanced/VancedManager synced 2024-11-23 19:55:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #171 from ostajic/dev

Browse source 
Root Installer Fix
This commit is contained in:
Zoran Ostojic 2020-09-25 17:54:40 +02:00 committed by GitHub
commit 76bfb8ae93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/com/vanced/manager/utils/PackageHelper.kt
View file

@ -359,9 +359,10 @@ object PackageHelper {
{ {
Shell.su("am force-stop $yPkg").exec() Shell.su("am force-stop $yPkg").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() 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(" ")) //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() val response = Shell.su("""su -mm -c "mount -o bind $apkFPath $path"""").exec()
Thread.sleep(500) Thread.sleep(500)
Shell.su("am force-stop $yPkg").exec()
return response.isSuccess return response.isSuccess
} }
@ -478,24 +479,13 @@ object PackageHelper {
Log.d("ZLog", cmd.toString()) Log.d("ZLog", cmd.toString())
} }
//get path of the installed youtube
private fun getVPath(context: Context): String? {
return try {
val p = getPkgInfo(yPkg, context)
p?.applicationInfo?.sourceDir
} catch (e: Exception) {
null
}
}
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
private fun getVersionNumber(context: Context): Int? { private fun getVersionNumber(context: Context): Int? {
try { try {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
context.packageManager.getPackageInfo(yPkg, 0)?.longVersionCode?.and(0xFFFFFFFF)?.toInt() context.packageManager.getPackageInfo(yPkg, 0).longVersionCode.and(0xFFFFFFFF).toInt()
else else
context.packageManager.getPackageInfo(yPkg, 0)?.versionCode context.packageManager.getPackageInfo(yPkg, 0).versionCode
} }
catch (e : Exception) { catch (e : Exception) {
val execRes = Shell.su("dumpsys package com.google.android.youtube | grep versionCode").exec() val execRes = Shell.su("dumpsys package com.google.android.youtube | grep versionCode").exec()
@ -516,11 +506,12 @@ object PackageHelper {
return null return null
} }
//get path of the installed youtube
private fun getPackageDir(context: Context): String? private fun getPackageDir(context: Context): String?
{ {
return try { return try {
val p = getPkgInfo(yPkg, context) val p = getPkgInfo(yPkg, context)
p?.applicationInfo?.sourceDir p!!.applicationInfo.sourceDir
} catch (e: Exception) { } catch (e: Exception) {
val execRes = Shell.su("dumpsys package com.google.android.youtube | grep codePath").exec() val execRes = Shell.su("dumpsys package com.google.android.youtube | grep codePath").exec()
if(execRes.isSuccess) if(execRes.isSuccess)