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

fixed suffix

This commit is contained in:
X1nto 2020-05-28 14:00:27 +04:00
parent 37cc8ae766
commit 6f75f025ad
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/vanced/manager/core/fragments/Home.kt
View File

@ -75,7 +75,7 @@ open class Home : BaseFragment() {
val microgVerText = view.findViewById<TextView>(R.id.microg_installed_version)
if (microgStatus!!) {
val microgVer = pm.getPackageInfo("com.mgoogle.android.gms", 0).versionName
val microgVer = pm.getPackageInfo("com.mgoogle.android.gms", 0).versionName.removeSuffix("-dirty")
microguninstallbtn.setOnClickListener {
uninstallApk("com.mgoogle.android.gms")

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

@ -76,32 +76,49 @@ class HomeFragment : Home() {
val vancedRemoteVer =
GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/vanced.json")
.get("version").asString
.get("version").asInt
val microgRemoteVer =
GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/microg.json")
.get("version").asString
vancedLatestTxt?.text = vancedRemoteVer
microgLatestTxt?.text = microgRemoteVer
.get("version").asInt
vancedLatestTxt?.text = vancedRemoteVer.toString()
microgLatestTxt?.text = microgRemoteVer.toString()
if (microgStatus!!) {
val microgVer =
pm.getPackageInfo("com.mgoogle.android.gms", 0).versionName
if (microgRemoteVer == microgVer) {
microginstallbtn?.text =
activity?.getString(com.vanced.manager.R.string.button_installed)
microginstallbtn?.icon =
activity?.getDrawable(com.vanced.manager.R.drawable.outline_cloud_done_24)
pm.getPackageInfo("com.mgoogle.android.gms", 0).versionName.removeSuffix("-dirty").toInt()
when {
microgRemoteVer > microgVer -> {
microginstallbtn?.text =
activity?.getString(R.string.update)
microginstallbtn?.icon =
activity?.getDrawable(R.drawable.ic_cloud_upload_black_24dp)
}
microgRemoteVer == microgVer -> {
microginstallbtn?.text =
activity?.getString(R.string.button_installed)
microginstallbtn?.icon =
activity?.getDrawable(R.drawable.outline_cloud_done_24)
}
}
}
if (vancedStatus!!) {
val vancedVer =
pm.getPackageInfo("com.vanced.android.youtube", 0).versionName
if (vancedRemoteVer == vancedVer) {
vancedinstallbtn?.text =
activity?.getString(R.string.button_installed)
vancedinstallbtn?.icon =
activity?.getDrawable(R.drawable.outline_cloud_done_24)
pm.getPackageInfo("com.vanced.android.youtube", 0).versionName.toInt()
when {
vancedRemoteVer > vancedVer -> {
vancedinstallbtn?.text =
activity?.getString(R.string.update)
vancedinstallbtn?.icon =
activity?.getDrawable(R.drawable.ic_cloud_upload_black_24dp)
}
vancedRemoteVer == vancedVer -> {
vancedinstallbtn?.text =
activity?.getString(R.string.button_installed)
vancedinstallbtn?.icon =
activity?.getDrawable(R.drawable.outline_cloud_done_24)
}
}
}