diff --git a/app/build.gradle b/app/build.gradle
index 853a77c8..860af252 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,7 +27,6 @@ android {
buildConfigField "String[]", "MANAGER_LANGUAGES", "{" + surroundWithQuotes(langs) + "}"
buildConfigField "String[]", "MANAGER_LANGUAGE_NAMES", "{" + surroundWithQuotes(getLanguageNames()) + "}"
- buildConfigField "Boolean", "ENABLE_SIGNATURE_CHECK", "true"
}
lintOptions {
diff --git a/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloader.kt b/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloader.kt
index d8c46a97..5485115e 100644
--- a/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloader.kt
+++ b/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloader.kt
@@ -14,7 +14,6 @@ import com.vanced.manager.R
import com.vanced.manager.core.App
import com.vanced.manager.ui.viewmodels.HomeViewModel.Companion.vancedProgress
import com.vanced.manager.utils.AppUtils.mutableInstall
-import com.vanced.manager.utils.AppUtils.vancedRootPkg
import com.vanced.manager.utils.InternetTools
import com.vanced.manager.utils.InternetTools.baseUrl
import com.vanced.manager.utils.InternetTools.getFileNameFromUrl
@@ -47,6 +46,7 @@ object VancedDownloader {
private var count: Int = 0
private var hashUrl = ""
+ private const val yPkg = "com.google.android.youtube"
private var vancedVersionCode = 0
private var vancedVersion: String? = null
@@ -150,7 +150,7 @@ object VancedDownloader {
private fun downloadStockCheck(context: Context) :Boolean {
return try {
- getPkgVerCode(vancedRootPkg, context.packageManager) != vancedVersionCode
+ getPkgVerCode(yPkg,context.packageManager) != vancedVersionCode
} catch (e: Exception) {
true
}
diff --git a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt
index d8ab3cbd..cd8fe2f3 100644
--- a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt
+++ b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt
@@ -132,7 +132,7 @@ class MainActivity : AppCompatActivity() {
private fun initDialogs() {
val prefs = getDefaultSharedPreferences(this)
val variant = prefs.getString("vanced_variant", "nonroot")
- //prefs.getBoolean("show_root_dialog", true)
+ prefs.getBoolean("show_root_dialog", true)
when {
prefs.getBoolean("firstStart", true) -> {
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt
index 5a3eb71c..8496b484 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt
@@ -12,15 +12,14 @@ import com.vanced.manager.core.downloader.VancedDownloader.downloadVanced
import com.vanced.manager.utils.InternetTools.openUrl
import com.vanced.manager.utils.MiuiHelper
import com.vanced.manager.utils.PackageHelper.installVanced
-import com.vanced.manager.utils.PackageHelper.uninstallApk
object DialogContainer {
fun showSecurityDialog(context: Context) {
MaterialAlertDialogBuilder(context).apply {
- setTitle(R.string.welcome)
- setMessage(R.string.security_context)
- setPositiveButton(R.string.close) { dialog, _ ->
+ setTitle(context.resources.getString(R.string.welcome))
+ setMessage(context.resources.getString(R.string.security_context))
+ setPositiveButton(context.resources.getString(R.string.close)) { dialog, _ ->
dialog.dismiss()
}
setOnDismissListener {
@@ -42,10 +41,10 @@ object DialogContainer {
private fun showMiuiDialog(context: Context) {
MaterialAlertDialogBuilder(context).apply {
- setTitle(R.string.miui_one_title)
- setMessage(R.string.miui_one)
- setNeutralButton(R.string.close) { dialog, _ -> dialog.dismiss() }
- setPositiveButton(R.string.guide) { _, _ ->
+ setTitle(context.getString(R.string.miui_one_title))
+ setMessage(context.getString(R.string.miui_one))
+ setNeutralButton(context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() }
+ setPositiveButton(context.getString(R.string.guide)) { _, _ ->
openUrl(
"https://telegra.ph/How-to-install-v15-on-MIUI-02-11",
R.color.Telegram,
@@ -58,22 +57,6 @@ object DialogContainer {
}
}
- fun showUnofficialAppInstalledDialog(app: String, appPkg: String, context: Context) {
- MaterialAlertDialogBuilder(context).apply {
- setTitle(R.string.warning)
- setMessage(context.getString(R.string.unofficial_app_installed, app))
- setPositiveButton(context.getString(R.string.uninstall)) { _, _ ->
- uninstallApk(appPkg, context)
- }
- setNeutralButton(context.getString(R.string.close)) { dialog, _ ->
- dialog.dismiss()
- }
- setCancelable(false)
- create()
- show()
- }
- }
-
//TODO
fun installOrDownload(context: Context) {
MaterialAlertDialogBuilder(context).apply {
diff --git a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt
index eb784abf..48bad08f 100644
--- a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt
+++ b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt
@@ -25,11 +25,6 @@ import com.vanced.manager.model.DataModel
import com.vanced.manager.model.ProgressModel
import com.vanced.manager.ui.events.Event
import com.vanced.manager.utils.AppUtils.installing
-import com.vanced.manager.utils.AppUtils.managerPkg
-import com.vanced.manager.utils.AppUtils.microgPkg
-import com.vanced.manager.utils.AppUtils.musicPkg
-import com.vanced.manager.utils.AppUtils.vancedPkg
-import com.vanced.manager.utils.AppUtils.vancedRootPkg
import com.vanced.manager.utils.InternetTools
import com.vanced.manager.utils.PackageHelper.uninstallApk
@@ -133,7 +128,7 @@ open class HomeViewModel(private val activity: Activity): ViewModel() {
Toast.makeText(activity, R.string.installation_wait, Toast.LENGTH_SHORT).show()
}
- fun uninstallVanced(variant: String) = uninstallApk(if (variant == "root") vancedRootPkg else vancedPkg, activity)
+ fun uninstallVanced(variant: String) = uninstallApk(if (variant == "root") "com.google.android.youtube" else "com.vanced.android.youtube", activity)
fun uninstallMusic() = uninstallApk("com.vanced.android.apps.youtube.music", activity)
fun uninstallMicrog() = uninstallApk("com.mgoogle.android.gms", activity)
@@ -156,11 +151,11 @@ open class HomeViewModel(private val activity: Activity): ViewModel() {
init {
fetching.set(true)
- vanced.set(DataModel(app.vanced, vancedPkg, activity))
- vancedRoot.set(DataModel(app.vanced, vancedRootPkg, activity))
- music.set(DataModel(app.music, musicPkg, activity))
- microg.set(DataModel(app.microg, microgPkg, activity))
- manager.set(DataModel(app.manager, managerPkg, activity))
+ vanced.set(DataModel(app.vanced, "com.vanced.android.youtube", activity))
+ vancedRoot.set(DataModel(app.vanced, "com.google.android.youtube", activity))
+ music.set(DataModel(app.music, "com.vanced.android.apps.youtube.music", activity))
+ microg.set(DataModel(app.microg, "com.mgoogle.android.gms", activity))
+ manager.set(DataModel(app.manager, "com.vanced.manager", activity))
vancedProgress.set(ProgressModel())
musicProgress.set(ProgressModel())
microgProgress.set(ProgressModel())
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 437aafd3..0056f48f 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,12 +22,8 @@
microG isn\'t installed
Root access not granted
Unavailable
- Uninstall
- Unofficial
- The version of %1$s on your device is not made by Vanced Team, for your own safety, we recommend uninstalling this version. Do you want to proceed?
Update
Useful Links
- Warning!
Website
Support us!
%1$s version number was copied!