Revert "added a signature checker for vanced apps"
This commit is contained in:
parent
f3356f1044
commit
555c5e4c5c
|
@ -27,7 +27,6 @@ android {
|
||||||
|
|
||||||
buildConfigField "String[]", "MANAGER_LANGUAGES", "{" + surroundWithQuotes(langs) + "}"
|
buildConfigField "String[]", "MANAGER_LANGUAGES", "{" + surroundWithQuotes(langs) + "}"
|
||||||
buildConfigField "String[]", "MANAGER_LANGUAGE_NAMES", "{" + surroundWithQuotes(getLanguageNames()) + "}"
|
buildConfigField "String[]", "MANAGER_LANGUAGE_NAMES", "{" + surroundWithQuotes(getLanguageNames()) + "}"
|
||||||
buildConfigField "Boolean", "ENABLE_SIGNATURE_CHECK", "true"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
lintOptions {
|
lintOptions {
|
||||||
|
|
|
@ -14,7 +14,6 @@ import com.vanced.manager.R
|
||||||
import com.vanced.manager.core.App
|
import com.vanced.manager.core.App
|
||||||
import com.vanced.manager.ui.viewmodels.HomeViewModel.Companion.vancedProgress
|
import com.vanced.manager.ui.viewmodels.HomeViewModel.Companion.vancedProgress
|
||||||
import com.vanced.manager.utils.AppUtils.mutableInstall
|
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
|
||||||
import com.vanced.manager.utils.InternetTools.baseUrl
|
import com.vanced.manager.utils.InternetTools.baseUrl
|
||||||
import com.vanced.manager.utils.InternetTools.getFileNameFromUrl
|
import com.vanced.manager.utils.InternetTools.getFileNameFromUrl
|
||||||
|
@ -47,6 +46,7 @@ object VancedDownloader {
|
||||||
private var count: Int = 0
|
private var count: Int = 0
|
||||||
private var hashUrl = ""
|
private var hashUrl = ""
|
||||||
|
|
||||||
|
private const val yPkg = "com.google.android.youtube"
|
||||||
private var vancedVersionCode = 0
|
private var vancedVersionCode = 0
|
||||||
private var vancedVersion: String? = null
|
private var vancedVersion: String? = null
|
||||||
|
|
||||||
|
@ -150,7 +150,7 @@ object VancedDownloader {
|
||||||
|
|
||||||
private fun downloadStockCheck(context: Context) :Boolean {
|
private fun downloadStockCheck(context: Context) :Boolean {
|
||||||
return try {
|
return try {
|
||||||
getPkgVerCode(vancedRootPkg, context.packageManager) != vancedVersionCode
|
getPkgVerCode(yPkg,context.packageManager) != vancedVersionCode
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|
|
@ -132,7 +132,7 @@ class MainActivity : AppCompatActivity() {
|
||||||
private fun initDialogs() {
|
private fun initDialogs() {
|
||||||
val prefs = getDefaultSharedPreferences(this)
|
val prefs = getDefaultSharedPreferences(this)
|
||||||
val variant = prefs.getString("vanced_variant", "nonroot")
|
val variant = prefs.getString("vanced_variant", "nonroot")
|
||||||
//prefs.getBoolean("show_root_dialog", true)
|
prefs.getBoolean("show_root_dialog", true)
|
||||||
|
|
||||||
when {
|
when {
|
||||||
prefs.getBoolean("firstStart", true) -> {
|
prefs.getBoolean("firstStart", true) -> {
|
||||||
|
|
|
@ -12,15 +12,14 @@ import com.vanced.manager.core.downloader.VancedDownloader.downloadVanced
|
||||||
import com.vanced.manager.utils.InternetTools.openUrl
|
import com.vanced.manager.utils.InternetTools.openUrl
|
||||||
import com.vanced.manager.utils.MiuiHelper
|
import com.vanced.manager.utils.MiuiHelper
|
||||||
import com.vanced.manager.utils.PackageHelper.installVanced
|
import com.vanced.manager.utils.PackageHelper.installVanced
|
||||||
import com.vanced.manager.utils.PackageHelper.uninstallApk
|
|
||||||
|
|
||||||
object DialogContainer {
|
object DialogContainer {
|
||||||
|
|
||||||
fun showSecurityDialog(context: Context) {
|
fun showSecurityDialog(context: Context) {
|
||||||
MaterialAlertDialogBuilder(context).apply {
|
MaterialAlertDialogBuilder(context).apply {
|
||||||
setTitle(R.string.welcome)
|
setTitle(context.resources.getString(R.string.welcome))
|
||||||
setMessage(R.string.security_context)
|
setMessage(context.resources.getString(R.string.security_context))
|
||||||
setPositiveButton(R.string.close) { dialog, _ ->
|
setPositiveButton(context.resources.getString(R.string.close)) { dialog, _ ->
|
||||||
dialog.dismiss()
|
dialog.dismiss()
|
||||||
}
|
}
|
||||||
setOnDismissListener {
|
setOnDismissListener {
|
||||||
|
@ -42,10 +41,10 @@ object DialogContainer {
|
||||||
|
|
||||||
private fun showMiuiDialog(context: Context) {
|
private fun showMiuiDialog(context: Context) {
|
||||||
MaterialAlertDialogBuilder(context).apply {
|
MaterialAlertDialogBuilder(context).apply {
|
||||||
setTitle(R.string.miui_one_title)
|
setTitle(context.getString(R.string.miui_one_title))
|
||||||
setMessage(R.string.miui_one)
|
setMessage(context.getString(R.string.miui_one))
|
||||||
setNeutralButton(R.string.close) { dialog, _ -> dialog.dismiss() }
|
setNeutralButton(context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() }
|
||||||
setPositiveButton(R.string.guide) { _, _ ->
|
setPositiveButton(context.getString(R.string.guide)) { _, _ ->
|
||||||
openUrl(
|
openUrl(
|
||||||
"https://telegra.ph/How-to-install-v15-on-MIUI-02-11",
|
"https://telegra.ph/How-to-install-v15-on-MIUI-02-11",
|
||||||
R.color.Telegram,
|
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
|
//TODO
|
||||||
fun installOrDownload(context: Context) {
|
fun installOrDownload(context: Context) {
|
||||||
MaterialAlertDialogBuilder(context).apply {
|
MaterialAlertDialogBuilder(context).apply {
|
||||||
|
|
|
@ -25,11 +25,6 @@ import com.vanced.manager.model.DataModel
|
||||||
import com.vanced.manager.model.ProgressModel
|
import com.vanced.manager.model.ProgressModel
|
||||||
import com.vanced.manager.ui.events.Event
|
import com.vanced.manager.ui.events.Event
|
||||||
import com.vanced.manager.utils.AppUtils.installing
|
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.InternetTools
|
||||||
import com.vanced.manager.utils.PackageHelper.uninstallApk
|
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()
|
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 uninstallMusic() = uninstallApk("com.vanced.android.apps.youtube.music", activity)
|
||||||
fun uninstallMicrog() = uninstallApk("com.mgoogle.android.gms", activity)
|
fun uninstallMicrog() = uninstallApk("com.mgoogle.android.gms", activity)
|
||||||
|
|
||||||
|
@ -156,11 +151,11 @@ open class HomeViewModel(private val activity: Activity): ViewModel() {
|
||||||
|
|
||||||
init {
|
init {
|
||||||
fetching.set(true)
|
fetching.set(true)
|
||||||
vanced.set(DataModel(app.vanced, vancedPkg, activity))
|
vanced.set(DataModel(app.vanced, "com.vanced.android.youtube", activity))
|
||||||
vancedRoot.set(DataModel(app.vanced, vancedRootPkg, activity))
|
vancedRoot.set(DataModel(app.vanced, "com.google.android.youtube", activity))
|
||||||
music.set(DataModel(app.music, musicPkg, activity))
|
music.set(DataModel(app.music, "com.vanced.android.apps.youtube.music", activity))
|
||||||
microg.set(DataModel(app.microg, microgPkg, activity))
|
microg.set(DataModel(app.microg, "com.mgoogle.android.gms", activity))
|
||||||
manager.set(DataModel(app.manager, managerPkg, activity))
|
manager.set(DataModel(app.manager, "com.vanced.manager", activity))
|
||||||
vancedProgress.set(ProgressModel())
|
vancedProgress.set(ProgressModel())
|
||||||
musicProgress.set(ProgressModel())
|
musicProgress.set(ProgressModel())
|
||||||
microgProgress.set(ProgressModel())
|
microgProgress.set(ProgressModel())
|
||||||
|
|
|
@ -22,12 +22,8 @@
|
||||||
<string name="no_microg">microG isn\'t installed</string>
|
<string name="no_microg">microG isn\'t installed</string>
|
||||||
<string name="root_not_granted">Root access not granted</string>
|
<string name="root_not_granted">Root access not granted</string>
|
||||||
<string name="unavailable">Unavailable</string>
|
<string name="unavailable">Unavailable</string>
|
||||||
<string name="uninstall">Uninstall</string>
|
|
||||||
<string name="unofficial">Unofficial</string>
|
|
||||||
<string name="unofficial_app_installed">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?</string>
|
|
||||||
<string name="update">Update</string>
|
<string name="update">Update</string>
|
||||||
<string name="useful_links">Useful Links</string>
|
<string name="useful_links">Useful Links</string>
|
||||||
<string name="warning">Warning!</string>
|
|
||||||
<string name="website_text">Website</string>
|
<string name="website_text">Website</string>
|
||||||
<string name="support_us">Support us!</string>
|
<string name="support_us">Support us!</string>
|
||||||
<string name="version_toast">%1$s version number was copied!</string>
|
<string name="version_toast">%1$s version number was copied!</string>
|
||||||
|
|
Loading…
Reference in New Issue