From ee827937cb7937d8df825c2add63ca1c40b45201 Mon Sep 17 00:00:00 2001 From: X1nto Date: Thu, 2 Jul 2020 18:38:48 +0400 Subject: [PATCH 01/14] fixed auto updater --- .../java/com/vanced/manager/core/fragments/Home.kt | 4 ++-- .../manager/ui/fragments/UpdateCheckFragment.kt | 13 ++++++++----- .../java/com/vanced/manager/utils/PackageHelper.kt | 2 ++ app/src/main/res/values/strings.xml | 1 + 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt index 37ff17d2d2..2b2a686a15 100644 --- a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt +++ b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt @@ -108,7 +108,7 @@ open class Home : BaseFragment(), View.OnClickListener { } else { writeToVariantPref("nonroot", R.anim.slide_in_left, R.anim.slide_out_right) - Toast.makeText(activity, "Root access not granted", Toast.LENGTH_SHORT).show() + Toast.makeText(activity, activity?.getString(R.string.root_not_granted), Toast.LENGTH_SHORT).show() } } } @@ -120,7 +120,7 @@ open class Home : BaseFragment(), View.OnClickListener { startActivity(Intent(activity, MainActivity::class.java)) activity?.overridePendingTransition(animIn, animOut) activity?.finish() - } else Log.d("VMvariant", "$variant is already selected") + } else Log.d("VMVariant", "$variant is already selected") } } \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt index 36df161833..ec2879c2a6 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt @@ -1,7 +1,9 @@ package com.vanced.manager.ui.fragments +import android.content.Intent import android.graphics.Color import android.graphics.drawable.ColorDrawable +import android.net.Uri import android.os.Bundle import android.util.Log import android.view.LayoutInflater @@ -20,6 +22,7 @@ import com.google.android.material.button.MaterialButton import com.vanced.manager.R import com.vanced.manager.utils.InternetTools.isUpdateAvailable import com.vanced.manager.utils.PackageHelper.installApp +import java.io.File class UpdateCheckFragment : DialogFragment() { @@ -60,7 +63,7 @@ class UpdateCheckFragment : DialogFragment() { } private fun upgradeManager() { - val dwnldUrl = "https://github.com/VancedManager/releases/latest/download/manager.apk" + val dwnldUrl = GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/manager.json").get("url").asString val loadBar = view?.findViewById(R.id.update_center_progressbar) PRDownloader.download(dwnldUrl, activity?.filesDir?.path, "manager.apk") @@ -74,10 +77,10 @@ class UpdateCheckFragment : DialogFragment() { .start(object : OnDownloadListener{ override fun onDownloadComplete() { activity?.let { - installApp( - it, - it.filesDir.path + "/manager.apk", - "com.vanced.manager") + val uri = Uri.fromFile(File(activity!!.filesDir.path, "manager.apk")) + val intent = Intent(Intent.ACTION_VIEW) + intent.setDataAndType(uri, "application/vnd.android.package-archive") + startActivity(intent) } } diff --git a/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt b/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt index 286034f871..4cabb6c36a 100644 --- a/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt +++ b/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt @@ -23,6 +23,7 @@ object PackageHelper { } } + /* @Throws(IOException::class) fun installApp( context: Context, @@ -48,6 +49,7 @@ object PackageHelper { outputStream.close() session.commit(pendingIntent.intentSender) } + */ fun uninstallApk(pkg: String, activity: Activity) { val callbackIntent = Intent(activity.applicationContext, AppUninstallerService::class.java) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f5fafb97d5..e37236b8a2 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -35,6 +35,7 @@ Successfully installed %1$s Network connection unavailable No MicroG! + Root access not granted Unavailable Update Useful Links From 4e9d939b2a5e8de7aafd0fab443072221004acfd Mon Sep 17 00:00:00 2001 From: kevinx8 Date: Thu, 2 Jul 2020 15:40:45 +0100 Subject: [PATCH 02/14] updated gradle --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index cd281a7c8e..0e16779977 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d3f4800ce2..cc052dc144 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Mar 15 12:10:20 GET 2020 +#Tue Jun 30 22:45:27 BST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip From 4b89c56433febabdd8f235e0cf6368d7beeb2947 Mon Sep 17 00:00:00 2001 From: X1nto Date: Thu, 2 Jul 2020 18:45:57 +0400 Subject: [PATCH 03/14] fixed build --- .../com/vanced/manager/ui/fragments/UpdateCheckFragment.kt | 1 - app/src/main/java/com/vanced/manager/utils/PackageHelper.kt | 6 ------ 2 files changed, 7 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt index ec2879c2a6..9254cabe64 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt @@ -21,7 +21,6 @@ import com.downloader.PRDownloader import com.google.android.material.button.MaterialButton import com.vanced.manager.R import com.vanced.manager.utils.InternetTools.isUpdateAvailable -import com.vanced.manager.utils.PackageHelper.installApp import java.io.File class UpdateCheckFragment : DialogFragment() { diff --git a/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt b/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt index 4cabb6c36a..0be1e97823 100644 --- a/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt +++ b/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt @@ -2,15 +2,9 @@ package com.vanced.manager.utils import android.app.Activity import android.app.PendingIntent -import android.content.Context import android.content.Intent -import android.content.pm.PackageInstaller.SessionParams import android.content.pm.PackageManager -import com.vanced.manager.core.installer.AppInstallerService import com.vanced.manager.core.installer.AppUninstallerService -import java.io.FileInputStream -import java.io.IOException -import java.io.InputStream object PackageHelper { From aee370aa5fabf7b220240a9b74233581a9fed0c5 Mon Sep 17 00:00:00 2001 From: X1nto Date: Thu, 2 Jul 2020 18:50:02 +0400 Subject: [PATCH 04/14] fixed build again --- .../main/java/com/vanced/manager/ui/fragments/HomeFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt index 46bb046df2..f088c97b9d 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt @@ -92,7 +92,7 @@ class HomeFragment : Home() { when (intent.action) { MICROG_DOWNLOADED -> { view?.findViewById(R.id.microg_installing)?.visibility = View.VISIBLE - activity?.let { installApp(it, it.filesDir.path + "/microg.apk", "com.mgoogle.android.gms") } + //activity?.let { installApp(it, it.filesDir.path + "/microg.apk", "com.mgoogle.android.gms") } } VANCED_DOWNLOADED -> { view?.findViewById(R.id.vanced_installing)?.visibility = View.VISIBLE From 12a1deb3681e5a82037faef1915fcbd07eea379f Mon Sep 17 00:00:00 2001 From: X1nto Date: Thu, 2 Jul 2020 18:50:39 +0400 Subject: [PATCH 05/14] removed import --- .../main/java/com/vanced/manager/ui/fragments/HomeFragment.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt index f088c97b9d..495259f449 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt @@ -25,7 +25,6 @@ import com.vanced.manager.adapter.SectionPageRootAdapter import com.vanced.manager.core.fragments.Home import com.vanced.manager.databinding.FragmentHomeBinding import com.vanced.manager.ui.viewmodels.HomeViewModel -import com.vanced.manager.utils.PackageHelper.installApp class HomeFragment : Home() { From bd562c1df3dd8ad7bf52b466649c39bc57dfe6bb Mon Sep 17 00:00:00 2001 From: X1nto Date: Thu, 2 Jul 2020 19:11:57 +0400 Subject: [PATCH 06/14] fixed uri parsing --- .../vanced/manager/ui/fragments/UpdateCheckFragment.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt index 9254cabe64..7030fe1f24 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.net.Uri +import android.os.Build import android.os.Bundle import android.util.Log import android.view.LayoutInflater @@ -13,6 +14,7 @@ import android.widget.Button import android.widget.ProgressBar import android.widget.TextView import android.widget.Toast +import androidx.core.content.FileProvider import androidx.fragment.app.DialogFragment import com.dezlum.codelabs.getjson.GetJson import com.downloader.Error @@ -76,7 +78,13 @@ class UpdateCheckFragment : DialogFragment() { .start(object : OnDownloadListener{ override fun onDownloadComplete() { activity?.let { - val uri = Uri.fromFile(File(activity!!.filesDir.path, "manager.apk")) + val apk = File(activity!!.filesDir.path, "manager.apk") + val uri = + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) + FileProvider.getUriForFile(activity!!, "${activity!!.packageName}.provider", apk) + else + Uri.fromFile(apk) + val intent = Intent(Intent.ACTION_VIEW) intent.setDataAndType(uri, "application/vnd.android.package-archive") startActivity(intent) From 7828fb0a35a36ad467a9d196f187b5bc41c8e478 Mon Sep 17 00:00:00 2001 From: X1nto Date: Thu, 2 Jul 2020 20:03:49 +0400 Subject: [PATCH 07/14] moved update checker to activity --- .../main/java/com/vanced/manager/core/App.kt | 5 ++++- .../main/java/com/vanced/manager/core/Main.kt | 22 +++++++++++++++---- .../com/vanced/manager/utils/InternetTools.kt | 1 + 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/core/App.kt b/app/src/main/java/com/vanced/manager/core/App.kt index 19b4d6a59d..0cf5930682 100644 --- a/app/src/main/java/com/vanced/manager/core/App.kt +++ b/app/src/main/java/com/vanced/manager/core/App.kt @@ -13,11 +13,12 @@ class App: Application() { override fun onCreate() { super.onCreate() - checkUpdates() + //checkUpdates() PRDownloader.initialize(applicationContext) createNotifChannel(this) } + /* private fun checkUpdates() { val checkPrefs = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("auto_check_update", true) if (checkPrefs) { @@ -28,4 +29,6 @@ class App: Application() { } } + */ + } \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/core/Main.kt b/app/src/main/java/com/vanced/manager/core/Main.kt index dd25b47e44..fe431309aa 100644 --- a/app/src/main/java/com/vanced/manager/core/Main.kt +++ b/app/src/main/java/com/vanced/manager/core/Main.kt @@ -3,11 +3,16 @@ package com.vanced.manager.core import android.annotation.SuppressLint import android.content.Context import android.os.Bundle +import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.preference.PreferenceManager +import com.dezlum.codelabs.getjson.GetJson +import com.vanced.manager.R import com.vanced.manager.ui.dialogs.DialogContainer.showRootDialog import com.vanced.manager.ui.dialogs.DialogContainer.showSecurityDialog import com.vanced.manager.ui.dialogs.DialogContainer.statementFalse +import com.vanced.manager.ui.fragments.UpdateCheckFragment +import com.vanced.manager.utils.InternetTools.isUpdateAvailable // This activity will NOT be used in manifest // since MainActivity will extend it @@ -18,17 +23,17 @@ open class Main: AppCompatActivity() { super.onCreate(savedInstanceState) val prefs = PreferenceManager.getDefaultSharedPreferences(this) - val firstStart = prefs.getBoolean("firstStart", true) - val falseStatement = prefs.getBoolean("statement", true) val variant = prefs.getString("vanced_variant", "nonroot") val showRootDialog = prefs.getBoolean("show_root_dialog", true) when { - firstStart -> showSecurityDialog(this) - !falseStatement -> statementFalse(this) + prefs.getBoolean("firstStart", true) -> showSecurityDialog(this) + !prefs.getBoolean("statement", true) -> statementFalse(this) variant == "root" && showRootDialog -> showRootDialog(this) } + checkUpdates() + } override fun onPause() { @@ -38,4 +43,13 @@ open class Main: AppCompatActivity() { super.onPause() } + private fun checkUpdates() { + if (GetJson().isConnected(this) && isUpdateAvailable()) { + val fm = supportFragmentManager + UpdateCheckFragment().show(fm, "UpdateCheck") + } else { + Toast.makeText(this, getString(R.string.update_notfound), Toast.LENGTH_SHORT).show() + } + } + } \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/utils/InternetTools.kt b/app/src/main/java/com/vanced/manager/utils/InternetTools.kt index 61bc9f63d5..ea9ae7549b 100644 --- a/app/src/main/java/com/vanced/manager/utils/InternetTools.kt +++ b/app/src/main/java/com/vanced/manager/utils/InternetTools.kt @@ -1,5 +1,6 @@ package com.vanced.manager.utils +import android.app.Activity import android.content.Context import android.net.Uri import androidx.browser.customtabs.CustomTabsIntent From eefd85536f1e0e2cbf471c35a311ece40bf6ddba Mon Sep 17 00:00:00 2001 From: X1nto Date: Thu, 2 Jul 2020 20:25:26 +0400 Subject: [PATCH 08/14] manager updater should be fixed --- .../com/vanced/manager/ui/fragments/UpdateCheckFragment.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt index 7030fe1f24..49dbb89824 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt @@ -78,15 +78,17 @@ class UpdateCheckFragment : DialogFragment() { .start(object : OnDownloadListener{ override fun onDownloadComplete() { activity?.let { - val apk = File(activity!!.filesDir.path, "manager.apk") + val apk = File("${activity?.filesDir?.path}/manager.apk") val uri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) - FileProvider.getUriForFile(activity!!, "${activity!!.packageName}.provider", apk) + FileProvider.getUriForFile(activity!!, "${activity?.packageName}.provider", apk) else Uri.fromFile(apk) val intent = Intent(Intent.ACTION_VIEW) intent.setDataAndType(uri, "application/vnd.android.package-archive") + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) startActivity(intent) } } From 92c4b2a5c67968869dbf198035ccbf81da1a66a0 Mon Sep 17 00:00:00 2001 From: X1nto Date: Thu, 2 Jul 2020 22:13:16 +0400 Subject: [PATCH 09/14] added magisk version checking --- .../main/java/com/vanced/manager/core/Main.kt | 10 +++- .../com/vanced/manager/core/fragments/Home.kt | 20 ++----- .../com/vanced/manager/ui/MainActivity.kt | 2 +- .../manager/ui/dialogs/DialogContainer.kt | 9 +++ .../com/vanced/manager/utils/PackageHelper.kt | 31 ++-------- app/src/main/res/values-fr/strings.xml | 60 ------------------- app/src/main/res/values/strings.xml | 2 + 7 files changed, 32 insertions(+), 102 deletions(-) delete mode 100644 app/src/main/res/values-fr/strings.xml diff --git a/app/src/main/java/com/vanced/manager/core/Main.kt b/app/src/main/java/com/vanced/manager/core/Main.kt index fe431309aa..52450f21f1 100644 --- a/app/src/main/java/com/vanced/manager/core/Main.kt +++ b/app/src/main/java/com/vanced/manager/core/Main.kt @@ -8,11 +8,13 @@ import androidx.appcompat.app.AppCompatActivity import androidx.preference.PreferenceManager import com.dezlum.codelabs.getjson.GetJson import com.vanced.manager.R +import com.vanced.manager.ui.dialogs.DialogContainer.basicDialog import com.vanced.manager.ui.dialogs.DialogContainer.showRootDialog import com.vanced.manager.ui.dialogs.DialogContainer.showSecurityDialog import com.vanced.manager.ui.dialogs.DialogContainer.statementFalse import com.vanced.manager.ui.fragments.UpdateCheckFragment import com.vanced.manager.utils.InternetTools.isUpdateAvailable +import com.vanced.manager.utils.PackageHelper.getPackageVersionName // This activity will NOT be used in manifest // since MainActivity will extend it @@ -29,7 +31,13 @@ open class Main: AppCompatActivity() { when { prefs.getBoolean("firstStart", true) -> showSecurityDialog(this) !prefs.getBoolean("statement", true) -> statementFalse(this) - variant == "root" && showRootDialog -> showRootDialog(this) + variant == "root" -> { + if (showRootDialog) + showRootDialog(this) + + if (getPackageVersionName("com.google.android.youtube", packageManager) == "14.21.54") + basicDialog(getString(R.string.hold_on), getString(R.string.magisk_vanced), this) + } } checkUpdates() diff --git a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt index 2b2a686a15..131b09bfe1 100644 --- a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt +++ b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt @@ -81,22 +81,14 @@ open class Home : BaseFragment(), View.OnClickListener { view?.findNavController()?.navigate(R.id.toInstallThemeFragment) } } else { - Toast.makeText( - activity, - "Please wait until installation finishes", - Toast.LENGTH_SHORT - ).show() + Toast.makeText(activity, activity?.getString(R.string.installation_wait), Toast.LENGTH_SHORT).show() } } R.id.microg_installbtn -> { if (!isMicrogDownloading!!) { - try { - activity?.startService(Intent(activity, MicrogDownloadService::class.java)) - } catch (e: Exception) { - Toast.makeText(activity, "Unable to start installation", Toast.LENGTH_SHORT).show() - } + activity?.startService(Intent(activity, MicrogDownloadService::class.java)) } else { - Toast.makeText(activity, "Please wait until installation finishes", Toast.LENGTH_SHORT).show() + Toast.makeText(activity, activity?.getString(R.string.installation_wait), Toast.LENGTH_SHORT).show() } } R.id.microg_uninstallbtn -> activity?.let { uninstallApk("com.mgoogle.android.gms", it) } @@ -105,8 +97,7 @@ open class Home : BaseFragment(), View.OnClickListener { R.id.root_switch -> if (Shell.rootAccess()) { writeToVariantPref("root", R.anim.slide_in_right, R.anim.slide_out_left) - } - else { + } else { writeToVariantPref("nonroot", R.anim.slide_in_left, R.anim.slide_out_right) Toast.makeText(activity, activity?.getString(R.string.root_not_granted), Toast.LENGTH_SHORT).show() } @@ -120,7 +111,8 @@ open class Home : BaseFragment(), View.OnClickListener { startActivity(Intent(activity, MainActivity::class.java)) activity?.overridePendingTransition(animIn, animOut) activity?.finish() - } else Log.d("VMVariant", "$variant is already selected") + } else + Log.d("VMVariant", "$variant is already selected") } } \ No newline at end of file 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 2d14c94c1d..cd3c0ec173 100644 --- a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt +++ b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt @@ -69,7 +69,7 @@ class MainActivity : Main() { restartActivity() Log.d("VMpm", "test") } - APP_NOT_UNINSTALLED -> installAlertBuilder(getString(R.string.failed_uninstall) + intent.getStringExtra("pkgName"), this@MainActivity) + APP_NOT_UNINSTALLED -> installAlertBuilder(getString(R.string.failed_uninstall, intent.getStringExtra("pkgName")), this@MainActivity) } } } 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 89dcad4480..c30b1f2095 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 @@ -106,6 +106,15 @@ object DialogContainer { .show() } + fun basicDialog(title: String, msg: String, activity: Activity) { + AlertDialog.Builder(activity) + .setTitle(title) + .setMessage(msg) + .setPositiveButton(activity.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } + .create() + .show() + } + fun launchVanced(activity: MainActivity) { val intent = Intent() intent.component = diff --git a/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt b/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt index 0be1e97823..d6ec1f3c19 100644 --- a/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt +++ b/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt @@ -17,33 +17,12 @@ object PackageHelper { } } - /* - @Throws(IOException::class) - fun installApp( - context: Context, - path: String, - pkg: String? - ) { - val callbackIntent = Intent(context.applicationContext, AppInstallerService::class.java) - val pendingIntent = PendingIntent.getService(context.applicationContext, 0, callbackIntent, 0) - val packageInstaller = context.packageManager.packageInstaller - val params = SessionParams(SessionParams.MODE_FULL_INSTALL) - params.setAppPackageName(pkg) - val sessionId = packageInstaller.createSession(params) - val session = packageInstaller.openSession(sessionId) - val inputStream: InputStream = FileInputStream(path) - val outputStream = session.openWrite("install", 0, -1) - val buffer = ByteArray(65536) - var c: Int - while (inputStream.read(buffer).also { c = it } != -1) { - outputStream.write(buffer, 0, c) - } - session.fsync(outputStream) - inputStream.close() - outputStream.close() - session.commit(pendingIntent.intentSender) + fun getPackageVersionName(packageName: String, packageManager: PackageManager): String { + return if (isPackageInstalled(packageName, packageManager)) + packageManager.getPackageInfo(packageName, 0).versionName + else + "" } - */ fun uninstallApk(pkg: String, activity: Activity) { val callbackIntent = Intent(activity.applicationContext, AppUninstallerService::class.java) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml deleted file mode 100644 index 1b1517835b..0000000000 --- a/app/src/main/res/values-fr/strings.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - Fermer - Bienvenue - - - À propos - Accueil - Installer - Paramètres - - - Journal des modifications - Installer - Version installée: - Dernière version: - Chargement… - Connection réseau indisponible - Mettre à jour - Liens utiles - Le site web officiel de Vanced - Supporte nous en téléchargeant Brave - - - Couleur d\'accentuation - Choisis ta couleur d\'accentuation préférée - Bleu - Vert - Rouge - Jaune - Vérifier les mises à jour - Interface - Gestion - Thème - Thème sombre - Thème clair - Choisis ton thème préféré - Notifications - Recevoir des notifications quand une nouvelle version est disponible - Revérifier - Centre de mise à jour - - - Choisir votre langue préférée pour Vanced - Note: si vous installer autre chose que l\'anglais, l\'anglais sera toujours installé en langue additionnelle - Choisis le thème de Vanced - Terminer - Clair + Sombre - Clair + Noir - Suivant - - - Sources - Équipe Vanced - Assurez-vous d\'avoir téléchargé l\'application sur vanced.app, le serveur Discord de Vanced ou sur le github officiel. - Suivre le paramètre système - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e37236b8a2..9f67ef6c1a 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -28,6 +28,7 @@ Unexpected error occurred while installing Vanced. Did you disable signature verification? Unexpected error occurred while installing Vanced. Did you disable MIUI Optimisations? Operation failed because there was an error with storage. + Please wait until installation finishes Reinstall Installed: Latest: @@ -73,6 +74,7 @@ Dismiss Guide Hold on! + Looks like you\'re using Magisk version of Vanced. Magisk version is discontinued and manager won\'t be able to update/uninstall it. Please remove module before using manager Detected MIUI user! Hey! Looks like you\'re an MIUI user. in order to properly use Vanced Manager, you will have to disable MiUI optimisations in developer settings. However, if you are on 20.2.20 ROM (Or later) that\'s based on xiaomi.eu, you can safely ignore this warning. Error From 64cd9cbb1726bd56e5e33b565b5146b33a0ae421 Mon Sep 17 00:00:00 2001 From: X1nto Date: Thu, 2 Jul 2020 22:38:03 +0400 Subject: [PATCH 10/14] removed switch from settings --- app/src/main/res/xml/preferences.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 1e1563f0e5..1cbbf43c4e 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -13,12 +13,6 @@ android:title="@string/check_updates" android:icon="@drawable/ic_cloud_upload_black_24dp" /> - - Date: Thu, 2 Jul 2020 20:08:10 +0100 Subject: [PATCH 11/14] update translations --- app/src/main/res/values-de/strings.xml | 23 +++++----- app/src/main/res/values-es/strings.xml | 26 ++++++----- app/src/main/res/values-hi-rIN/strings.xml | 7 ++- app/src/main/res/values-id/strings.xml | 38 ++++++++-------- app/src/main/res/values-in/strings.xml | 38 ++++++++-------- app/src/main/res/values-it/strings.xml | 51 +++++++++++----------- app/src/main/res/values-ja/strings.xml | 7 ++- app/src/main/res/values-ru/strings.xml | 7 ++- app/src/main/res/values-vi/strings.xml | 9 ++-- app/src/main/res/values-zh-rCN/strings.xml | 14 +++--- app/src/main/res/values-zh-rTW/strings.xml | 48 ++++++++++---------- app/src/main/res/values/strings.xml | 44 ++++++++----------- 12 files changed, 148 insertions(+), 164 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ec3acd61fe..99353b01d5 100755 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -9,7 +9,6 @@ Startseite Installieren Einstellungen - Schließen Changelogs %1$s wird heruntergeladen @@ -18,14 +17,15 @@ Installieren %1$s wird installiert Operation fehlgeschlagen, da der Nutzer sie abgebrochen hat - Operation fehlgeschlagen, da der Nutzer Installation nicht gestattet hat + Operation fehlgeschlagen, da der Nutzer die Installation nicht gestattet hat Operation fehlgeschlagen, da die App mit einer bereits installierten App im Konflikt steht - Operation aus einem unbekannten Grund fehlgeschlagen + Operation aus einem unbekannten Grund fehlgeschlagen. Bitte trete unserem Telegram Chat oder Discord Server bei, um Support zu erhalten. Operation fehlgeschlagen, da die App inkompatibel mit deinem Gerät ist Operation fehlgeschlagen, da die apks Dateien defekt sind Unerwarteter Fehler während der Installation aufgetreten. Hast du die Signatur-Verifikation deaktiviert? - Unerwarteter Fehler während der Installation aufgetreten. Hast du die MiUI-Optimisierungen deaktiviert? - Operation fehlgeschlagen, da ein Storage-Fehler aufgetreten ist. Warte, wie ist das überhaupt möglich? + Unerwarteter Fehler während der Installation aufgetreten. Hast du die MIUI-Optimisierungen deaktiviert? + Operation fehlgeschlagen, da ein Storage-Fehler aufgetreten ist. + Bitte warte, bis die Installation abgeschlossen ist Neu installieren Installiert: Neueste: @@ -33,6 +33,7 @@ %1$s erfolgreich installiert Keine Netzwerkverbindung verfügbar Kein MicroG! + Root-Zugriff nicht erteilt Nicht verfügbar Update Nützliche Links @@ -65,19 +66,21 @@ Update gefunden! Keine neuen Updates + Schließen Guide Warte! - MIUI-Nutzer erkannt! - Hey! Du scheinst ein MIUI-Nutzer zu sein. Damit Vanced Manager richtig funktioniert musst du diese in den Entwicklereinstellungen deines Gerätes deaktivieren.\nSolltest du jedoch auf einem 20.2.20 Betriebssystem sein, das auf xiaomi.eu basiert ist, kannst du diese Warnung ignorieren. + Du nutzt die Magisk-Version von Vanced. Diese ist nicht mehr unterstützt und es ist nicht möglich, sie zu updaten. Bitte entferne sie erst, indem du das Magisk-Modul entfernst. + MIUI erkannt! + Hey! Du scheinst ein MIUI-Nutzer zu sein. Damit Vanced Manager richtig funktioniert musst du die MIUI-Optimisierungen in den Entwicklereinstellungen deines Gerätes deaktivieren. (Du kannst diese Warnung ignorieren, solltest du ein 20.2.20 Betriebssystem haben, das auf xiaomi.eu basiert ist) Fehler Bitte stelle sicher, dass du die App von vanced.app, dem Vanced Discord Server oder GitHub heruntergeldaden hast. Erfolg! - Vanced wurde erfolgreich installiert. Möchtest du es sofort öffnen? + Vanced wurde erfolgreich installiert. Jetzt öffnen? Öffnen Willkommen Wähle deine bevorzugte Sprache für Vanced - Beachte: Solltest du eine andere Sprache als Englisch installieren, wird Englisch trotzdem als zusätzliche Sprache installiert. + Beachte: Englisch wird immer als zusätzliche Sprache installiert Wähle dein bevorzugtes Theme für Vanced Root-Modus erkannt! Um Vanced erfolgreich zu installieren, stelle sicher, dass du die Signatur-Verifikation deaktiviert hast. Abschließen @@ -88,6 +91,4 @@ Manager-Entwickler Quellen Vanced Team - - diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 5013d72203..67dacf3923 100755 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -9,30 +9,31 @@ Hogar Instalar Ajustes - Descartar Actualizaciones Descargando %1$s Falla al desinstalar paquete %1$s - Error Descargando %1$s + Error al Descargar %1$s Instalar Instalando %1$s La operación fallo porque el usuario abortó la instalación La operación fallo porque el usuario bloqueo la instalación La operación fallo porque la app entra en conflicto con una app ya instalada - La operación fallo por no se que wea, simplemente fallo - La operación fallo porque la app es incompatible con tu dispositivo - La operación fallo debido a que los archivos apk son invalidos + La operacion fallo por una razon desconocida, porfavor únete a nuestro grupo de Telegram o Discord para brindar soporte. + La operación fallo porque la app es incompatible con tu dispositivo. + La operación fallo debido a que los archivos apk son inválidos. Un error inesperado ocurrió durante la instalación de Vanced. Has deshabilitado verificación de firmas?(signature verification) - "Un error inesperado ocurrió durante la instalación de Vanced. Has deshabilitado las Optimizaciones de MiUI? " - "Operación fallo porque hubo un error con almacenamiento. Un momento como es eso siquiera posible? " + Un error inesperado ocurrió durante la instalación de Vanced. Has deshabilitado las Optimizaciones de MiUI? + Operación fallo porque hubo un error con almacenamiento. + Porfavor espera hasta que la instalación termine. Reinstalar Instalado: Ultimo: Cargando... Instalación exitosa %1$s Conexion a la red no disponible - "Sin MicroG! " + Sin MicroG! + Acceso root no concedido No Disponible Actualizar Links Utiles @@ -65,10 +66,13 @@ Actualización encontrada! Sin actualizaciónes nuevas + Descartar Guía Un momento! + Parece que estas usando la versión Magisk de Vanced, que está descontinuado y no puede ser actualizada utilizando esta app. Porfavor retírelo primero quitando el módulo magisk. Usuario MiUI detectado! - "Hey! Parece que eres un usuario MiUI. Pará poder usar Vanced Manager apropiadamente necesitarás deshabilitar las Optimizaciones MiUI en configuraciónes de desarrollador.\nSin embargo, si estas en el ROM 20.2.20 que esta basado en xiaomi.eu, entonces puedes ignorar esta advertencia de forma segura. " + "Hey! Parece que eres un usuario MiUI. Pará poder usar Vanced Manager apropiadamente necesitarás deshabilitar las Optimizaciones MiUI en ajustes de desarrollador. +Sin embargo, si estas en el ROM 20.2.20 que esta basado en xiaomi.eu, entonces puedes ignorar esta advertencia de forma segura. " Error Porfavor asegurate de haver descargado la aplicacion mediante vanced.app, el server de Vanced en Discord, o Github "Éxito! " @@ -77,7 +81,7 @@ Bienvenido Elije tu lenguaje preferido para Vanced - Nota: si instalas cualquier cosa ademas de Ingles, Ingles va estar todavia instalado como un lenguaje adicional + Nota: si instalas un idioma ademas de Ingles, Ingles va estar todavia instalado como un lenguaje adicional Elije tu tema preferido para Vanced "Modo root detectado! Pará que el Manager pueda instalar Vanced correctamente, por favor asegúrate de que hayas deshabilitado verificación de firmas(signature verification). " Finalizar @@ -88,6 +92,4 @@ Desarrollador del Manager Fuentes Equipo Vanced - - diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 61f7db1472..7206864d00 100755 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -10,7 +10,6 @@ होम इंस्टॉल सेट्इन्ग - डिस्मिस चेंजलॉग डाउनलोड कर रहा है %1$s @@ -68,10 +67,12 @@ अपडेट मिला! कोई नया अपडेट नहीं + डिस्मिस गाइड रुको! पता लगाया MiUI उपयोगकर्ता! - अरे! लगता है कि आप MiUI उपयोगकर्ता हैं। Vanced Manager को ठीक से उपयोग करने के लिए, आपको डेवलपर सेटिंग में MiUI ऑप्टिमाइज़ेशन को अक्षम करना होगा\nहालाँकि, यदि आप 20.2.20 ROM पर हैं जो xiaomi.eu पर आधारित है, तो आप इस चेतावनी को सुरक्षित रूप से अनदेखा कर सकते हैं। + अरे! लगता है कि आप MiUI उपयोगकर्ता हैं। Vanced Manager को ठीक से उपयोग करने के लिए, आपको डेवलपर सेटिंग में MiUI ऑप्टिमाइज़ेशन को अक्षम करना होगा +हालाँकि, यदि आप 20.2.20 ROM पर हैं जो xiaomi.eu पर आधारित है, तो आप इस चेतावनी को सुरक्षित रूप से अनदेखा कर सकते हैं। इरर कृपया सुनिश्चित करें कि आपने vanced.app, Vanced Discord सर्वर या GitHub से ऐप डाउनलोड किया है सफलता! @@ -92,6 +93,4 @@ सूत्रों का "वांसड टीम " - - diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 9bdcee8804..c26849ff07 100755 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -7,9 +7,8 @@ Tentang Menu utama - Instal + Pasang Pengaturan - Hilangkan Catatan perubahan Mengunduh %1$s @@ -17,16 +16,16 @@ Gagal mengunduh %1$s Pasang Memasang %1$s - Proses gagal karena pengguna membatalkan instalasi - Proses gagal karena pengguna memblokir instalasi - Proses gagal karena terjadi konflik dengan aplikasi yang sudah terinstal - Proses gagal dengan alasan yang tidak diketahui, kirim isu dengan logcat - Proses gagal karena aplikasi tidak didukung oleh perangkat anda - Proses gagal karena apk files tidak valid + Proses gagal karena pengguna membatalkan instalasi. + Proses gagal karena pengguna memblokir instalasi. + Proses gagal karena aplikasi konflik dengan aplikasi yang sudah terpasang. + Proses gagal dengan alasan yang tidak diketahui, kirim isu dengan logcat. + Proses gagal karena aplikasi tidak kompatibel dengan perangkat anda. + Proses gagal karena apk files tidak valid. Kesalahan tidak diduga saat menginstal Vanced. Apakah anda sudah menonaktifkan signature verification? - Kesalahan tidak terduga terjadi saat menginstal Vanced. Apakah anda sudah menonaktifkan Optimisasi MiUI? + Kesalahan tidak terduga terjadi saat memasang Vanced. Apakah anda sudah menonaktifkan Optimisasi MIUI? Proses gagal karena terjadi kesalahan dengan penyimpanan. - Instal ulang + Pasang ulang Terpasang: Terbaru: Memuat... @@ -41,7 +40,7 @@ " Aksen Warna - Pilih aksen warna anda + Pilih aksen warna yang anda inginkan Biru Hijau Ungu @@ -57,7 +56,7 @@ Ikuti sistem Tema gelap Tema terang - Pilih tema anda + Pilih tema yang anda inginkan Perbarui URL channel Notifikasi push Terima notifikasi push saat pembaruan tersedia @@ -66,10 +65,11 @@ Pembaruan ditemukan! Tidak ada pembaruan + Hilangkan Petunjuk Tahan! - Pengguna MiUI terdeteksi! - Hai! Sepertinya kamu pengguna MiUI. Untuk dapat menggunakan Vanced Manager dengan benar, anda harus menonaktifkan optimisasi MiUI di pengaturan developer. Walaupun demikian, jika anda berada di ROM versi 20.2.20 berdasarkan xiaomi.eu, anda dapat mengabaikan peringatan ini. + Pengguna MIUI terdeteksi! + Hai! Sepertinya kamu pengguna MIUI. Untuk dapat menggunakan Vanced Manager dengan benar, anda harus menonaktifkan optimisasi MiUI di pengaturan developer. Walaupun demikian, jika anda berada di ROM versi 20.2.20 (atau lebih) berdasarkan xiaomi.eu, anda dapat mengabaikan peringatan ini. Terjadi kesalahan Pastikan anda mengunduh aplikasi hanya dari vanced.app, Vanced Discord server atau GitHub Berhasil! @@ -77,10 +77,10 @@ Buka Selamat datang - Pilih bahasa anda untuk Vanced - Catatan: jika anda menginstal apapun selain Bahasa Inggris, Bahasa Inggris akan tetap terinstal sebagai bahasa tambahan - Pilih tema anda untuk Vanced - Root terdeteksi! Agar manager dapat menginstal Vanced dengan benar, pastikan anda sudah menonaktifkan signature verfication. + Pilih bahasa yang anda inginkan untuk Vanced + Catatan: jika anda memasang bahasa apapun selain Inggris, bahasa Inggris akan tetap terpasang sebagai bahasa tambahan + Pilih tema yang anda inginkan untuk Vanced + Mode Root terdeteksi! Agar manager dapat memasang Vanced dengan benar, pastikan anda sudah menonaktifkan signature verification. Selesai Terang + Hitam Terang + Gelap @@ -89,6 +89,4 @@ Pembuat manager Sumber Tim Vanced - - diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 9bdcee8804..c26849ff07 100755 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -7,9 +7,8 @@ Tentang Menu utama - Instal + Pasang Pengaturan - Hilangkan Catatan perubahan Mengunduh %1$s @@ -17,16 +16,16 @@ Gagal mengunduh %1$s Pasang Memasang %1$s - Proses gagal karena pengguna membatalkan instalasi - Proses gagal karena pengguna memblokir instalasi - Proses gagal karena terjadi konflik dengan aplikasi yang sudah terinstal - Proses gagal dengan alasan yang tidak diketahui, kirim isu dengan logcat - Proses gagal karena aplikasi tidak didukung oleh perangkat anda - Proses gagal karena apk files tidak valid + Proses gagal karena pengguna membatalkan instalasi. + Proses gagal karena pengguna memblokir instalasi. + Proses gagal karena aplikasi konflik dengan aplikasi yang sudah terpasang. + Proses gagal dengan alasan yang tidak diketahui, kirim isu dengan logcat. + Proses gagal karena aplikasi tidak kompatibel dengan perangkat anda. + Proses gagal karena apk files tidak valid. Kesalahan tidak diduga saat menginstal Vanced. Apakah anda sudah menonaktifkan signature verification? - Kesalahan tidak terduga terjadi saat menginstal Vanced. Apakah anda sudah menonaktifkan Optimisasi MiUI? + Kesalahan tidak terduga terjadi saat memasang Vanced. Apakah anda sudah menonaktifkan Optimisasi MIUI? Proses gagal karena terjadi kesalahan dengan penyimpanan. - Instal ulang + Pasang ulang Terpasang: Terbaru: Memuat... @@ -41,7 +40,7 @@ " Aksen Warna - Pilih aksen warna anda + Pilih aksen warna yang anda inginkan Biru Hijau Ungu @@ -57,7 +56,7 @@ Ikuti sistem Tema gelap Tema terang - Pilih tema anda + Pilih tema yang anda inginkan Perbarui URL channel Notifikasi push Terima notifikasi push saat pembaruan tersedia @@ -66,10 +65,11 @@ Pembaruan ditemukan! Tidak ada pembaruan + Hilangkan Petunjuk Tahan! - Pengguna MiUI terdeteksi! - Hai! Sepertinya kamu pengguna MiUI. Untuk dapat menggunakan Vanced Manager dengan benar, anda harus menonaktifkan optimisasi MiUI di pengaturan developer. Walaupun demikian, jika anda berada di ROM versi 20.2.20 berdasarkan xiaomi.eu, anda dapat mengabaikan peringatan ini. + Pengguna MIUI terdeteksi! + Hai! Sepertinya kamu pengguna MIUI. Untuk dapat menggunakan Vanced Manager dengan benar, anda harus menonaktifkan optimisasi MiUI di pengaturan developer. Walaupun demikian, jika anda berada di ROM versi 20.2.20 (atau lebih) berdasarkan xiaomi.eu, anda dapat mengabaikan peringatan ini. Terjadi kesalahan Pastikan anda mengunduh aplikasi hanya dari vanced.app, Vanced Discord server atau GitHub Berhasil! @@ -77,10 +77,10 @@ Buka Selamat datang - Pilih bahasa anda untuk Vanced - Catatan: jika anda menginstal apapun selain Bahasa Inggris, Bahasa Inggris akan tetap terinstal sebagai bahasa tambahan - Pilih tema anda untuk Vanced - Root terdeteksi! Agar manager dapat menginstal Vanced dengan benar, pastikan anda sudah menonaktifkan signature verfication. + Pilih bahasa yang anda inginkan untuk Vanced + Catatan: jika anda memasang bahasa apapun selain Inggris, bahasa Inggris akan tetap terpasang sebagai bahasa tambahan + Pilih tema yang anda inginkan untuk Vanced + Mode Root terdeteksi! Agar manager dapat memasang Vanced dengan benar, pastikan anda sudah menonaktifkan signature verification. Selesai Terang + Hitam Terang + Gelap @@ -89,6 +89,4 @@ Pembuat manager Sumber Tim Vanced - - diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 49fafecb3d..a2fd5dd28f 100755 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -9,7 +9,6 @@ Pagina principale Installa Impostazioni - Scarta Note di rilascio Download in corso di %1$s @@ -17,39 +16,41 @@ Errore nel download di %1$s Installa Installazione in corso di %1$s - Operazione fallita, l\'utente ha annullato l\'installazione - Operazione fallita, l\'utente ha bloccato l\'installazione - Operazione fallita, l\'app va in conflitto con un\'app già installata - Operazione fallita... perché di sì, che ne so io - Operazione fallita, l\'app non è compatibile con il tuo dispositivo - Operazione fallita, i file apk non sono validi - Si è riscontrato un errore imprevisto durante l\'installazione di Vanced. Hai disattivato la verifica della firma? - Si è riscontrato un errore imprevisto durante l\'installazione di Vanced. Hai disattivato le ottimizzazioni di MiUI? - Operazione fallita, è stato riscontrato un errore con lo spazio di archiviazione. Aspetta, com\'è possibile? + Operazione fallita, l\'utente ha annullato l\'installazione. + Operazione fallita, l\'utente ha bloccato l\'installazione. + Operazione fallita, app in conflitto con un\'app già installata. + Operazione fallita, motivo sconosciuto. Unisciti al gruppo di Telegram o su Discord per ricevere assistenza. + Operazione fallita, l\'app non è compatibile con il dispositivo + Operazione fallita, i file apk non sono validi. + Si è verificato un errore imprevisto durante l\'installazione di Vanced. Hai disattivato la verifica della firma? + Si è verificato un errore imprevisto durante l\'installazione di Vanced. Hai disattivato le ottimizzazioni di MIUI? + Operazione fallita, si è verificato un errore con lo spazio di archiviazione. + Per favore, attendi la conclusione dell\'installazione Installa di nuovo - Installato: + Versione installata: Ultima versione: Caricamento in corso… - %1$s è stato installato con successo + %1$s installato con successo Connessione alla rete non disponibile Senza MicroG! + Non è stato fornito l\'accesso di root Non disponibile Aggiorna Link utili - Sito web ufficiale + Sito web Sostienici! Colore evidenziatore - Seleziona il tuo colore preferito per l\'interfaccia + Imposta il colore evidenziatore preferito Blu Verde Viola Rosso Giallo - Verifica la disponibilità di aggiornamenti + Verifica aggiornamenti Interfaccia Manager - Valori di installazione scelti + Preferenze di installazione scelte Lingua: %1$s Tema: %1$s Tema @@ -65,29 +66,29 @@ Aggiornamento trovato! Non ci sono nuovi aggiornamenti + Ignora Guida Aspetta! - Rilevata l\'interfaccia MiUI! - Ehi! Sembra che tu sia un utente MiUI. Per poter utilizzare correttamente Vanced Manager, devi disattivare le ottimizzazioni di MiUI nelle impostazioni per sviluppatore.\nSe stai utilizzando la ROM 20.2.20 basata su xiaomi.eu, puoi ignorare questo avviso. + Sembra che tu stia utilizzando la versione di Vanced ottenuta con Magisk. La versione Magisk non riceve più aggiornamenti e non può essere aggiornata con quest\'app. Per favore, rimuovi il modulo di Magisk prima di installare la versione con Vanced Manager. + Rilevata l\'interfaccia MIUI! + Ehi! Sembra che tu sia un utente MIUI. Per poter utilizzare correttamente questa applicazione, devi disattivare le ottimizzazioni di MIUI nelle impostazioni per sviluppatore (se stai utilizzando la ROM 20.2.20 basata su xiaomi.eu, puoi ignorare questo avviso). Errore - Assicurati di aver scaricato l\'app da vanced.app, dal server di Discord di Vanced o da GitHub + Assicurati di aver scaricato l\'app da vanced.app, dal server di Discord di Vanced o dalla pagina GitHub di Vanced Fatto! - Vanced è stato installato con successo, vuoi avviarlo ora? + Vanced è stato installato con successo. Vuoi avviarlo ora? Avvia Benvenuto Seleziona la tua lingua preferita per Vanced - Nota: se installi una lingua diversa dall\'inglese, l\'inglese sarà comunque installato come lingua aggiuntiva + Nota: l\'inglese sarà comunque installato, indipendentemente dalla tua scelta Seleziona il tuo tema preferito per Vanced - Modalità root rilevata! Per poter installare correttamente Vanced, assicurati di disattivare la verifica della firma. + Modalità root rilevata! Per poter installare correttamente Vanced, assicurati di disattivare la verifica della firma per gli apk. Concludi Chiaro + nero Chiaro + scuro Avanti Sviluppatori di Manager - Fonti + Codice sorgente Il team di Vanced - - diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 150bcf9ed2..825e126627 100755 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -9,7 +9,6 @@ ホーム インストール 設定 - 閉じる 更新履歴 %1$s をダウンロードしています @@ -65,10 +64,12 @@ アップデートがあります！ アップデートはありません + 閉じる ガイド ちょっと待った！ MIUI ユーザーを検知しました！ - あなたは MIUI ユーザーのようです。Vanced Manager を適切に利用するには、開発者向けオプションから MIUI の最適化を無効にする必要があります。\nただし、xiaomi.eu ベースの 20.2.20 ROM をお使いの場合は、この警告を無視しても問題ありません。 + あなたは MIUI ユーザーのようです。Vanced Manager を適切に利用するには、開発者向けオプションから MIUI の最適化を無効にする必要があります。 +ただし、xiaomi.eu ベースの 20.2.20 ROM をお使いの場合は、この警告を無視しても問題ありません。 エラー vanced.app、Vanced の Discord サーバーまたは GitHub からアプリをダウンロードしたことを確認してください 成功！ @@ -88,6 +89,4 @@ Manager 開発 ソースコード Vanced チーム - - diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 6d5372a2d7..20ff58fba4 100755 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -9,7 +9,6 @@ Главная Установить Настройки - Отклонить Список изменений Загрузка %1$s @@ -65,10 +64,12 @@ Найдено обновление! Обновлений не найдено + Отклонить Руководство Внимание! Обнаружен пользователь MIUI! - Привет! Похоже, вы пользователь MIUI. для правильного использования Vanced Manager вам придется отключить оптимизацию MIUI в настройках разработчика\nЕсли вы используете прошивку версии 20.2.20, основанную на xiaomi.eu, вы можете спокойно проигнорировать это предупреждение. + Привет! Похоже, вы пользователь MIUI. для правильного использования Vanced Manager вам придется отключить оптимизацию MIUI в настройках разработчика +Если вы используете прошивку версии 20.2.20, основанную на xiaomi.eu, вы можете спокойно проигнорировать это предупреждение. Ошибка Пожалуйста, убедитесь, что вы скачали это приложение с vanced.app, сервера Discord Vanced или GitHub Успешно! @@ -88,6 +89,4 @@ Разработчик Исходники Vanced Team - - diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index bdc1ed05ba..d5ebdba753 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -9,7 +9,6 @@ Trang chủ Cài đặt Tùy chỉnh - Bỏ qua Lịch sử thay đổi Đang tải %1$s @@ -65,10 +64,12 @@ Tìm thấy cập nhật! Không có cập nhật mới + Bỏ qua Hướng dẫn Khoan đã! Phát hiện người dùng MiUI - Hình như bạn là 1 người dùng MiUI. Để dùng Vanced hiệu quả, bạn sẽ phải vô hiệu hóa MiUI optimisations trong cài đặt lập trình viên\nTuy nhiên, nếu bạn đang dùng ROM 20.2.20 từ xiaomi.eu, bạn có thể bỏ qua cảnh báo này. + Hình như bạn là 1 người dùng MiUI. Để dùng Vanced hiệu quả, bạn sẽ phải vô hiệu hóa MiUI optimisations trong cài đặt lập trình viên +Tuy nhiên, nếu bạn đang dùng ROM 20.2.20 từ xiaomi.eu, bạn có thể bỏ qua cảnh báo này. Lỗi Hãy đảm bảo bạn tải về app từ vanced.app, Vanced Discord server hoặc GitHub Thành công! @@ -85,9 +86,7 @@ Sáng + Tối Tiếp theo - Manager Dev + Quản lý nhà phát triển Nguồn Đội ngũ Vanced - - diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0b4945d923..dee87d7d27 100755 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -9,7 +9,6 @@ 主菜单 安装 设置 - 关闭 变更日志 %1$s 下载中 @@ -20,16 +19,16 @@ 操作失败因为用户放弃安装 操作失败因为用户封锁安装 操作失败因为软件与已安装的软件出现冲突 - 操作失败因为它失败了，我不清楚 + 未知原因导致操作失败，发送 logcat 报告 操作失败因为它与您的设备不相容 操作失败因为 APK 档案失效 安装 Vanced 时发生意外错误。您有关闭签名验证吗？ 安装 Vanced 时发生意外错误。您有关闭 MiUI 优化吗？ - 操作失败因为存储错误。等等，这怎么可能呢？ + 操作失败因为存储发生错误。 重新安装 已安装： 最新 - 加载中 + 加载中。。。 %1$s 成功安装 网络连接不可用 没有 MicroG！ @@ -48,7 +47,7 @@ 黄色 检查更新 接口 - Manager + 管理员 已选择安装值 语言： %1$s 主题： %1$s @@ -65,10 +64,11 @@ 找到更新！ 没有新的更新 + 关闭 引导 等一下！ 检测到 MiUI 用户！ - 嘿! 您似乎是 MiUI 用户。为了能够正确地使用 Vanced Manager ，您将需要在开发人员设定中禁用 MiUI 优化\n但是，如果您使用的是基于 xiaomi.eu 的20.2.20 ROM ，则可以放心地忽略此警告。 + 嘿! 您似乎是 MiUI 用户。为了能够正确地使用 Vanced Manager ，您将需要在开发人员设定中禁用 MiUI 优化。但是，如果您使用的是基于 xiaomi.eu 的20.2.20 ROM （或更新的版本），则可以放心地忽略此警告。 错误 请确保您的软件下载来自于vanced.app，Vanced Discord服务器或Github 成功！ @@ -88,6 +88,4 @@ Manager 的开发者 来源 Vanced团队 - - diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c760a8724c..0c7dc27ef4 100755 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -9,28 +9,27 @@ 主頁 安裝 設定 - 關閉 更新日誌 - %1$s 下載中 - %1$s 包裝下載失敗 + 下載 %1$s 中 + 未能解除安裝 %1$s %1$s 下載錯誤 安裝 - %1$s 安裝中 - 操作失敗因為用戶放棄安裝 - 操作失敗因為用戶封鎖安裝 - 操作失敗因為應用程式與已安裝的應用程式出現衝突 - 操作失敗因為它失敗了，我不清楚 - 操作失敗因為它與您的設備不兼容 - 操作失敗因為 APK 檔案無效 + 安裝 %1$s 中 + 操作失敗因為用戶放棄安裝。 + 操作失敗因為用戶封鎖安裝。 + 操作失敗因為應用程式與已安裝的應用程式出現衝突。 + 因未知原因導致操作失敗，傳送帶有 logcat 的報告。 + 操作失敗因為它與您的裝置不兼容。 + 操作失敗因為 APK 檔案無效。 安裝 Vanced 時發生意外的錯誤。您有關閉簽名驗證嗎？ - 安裝 Vanced 時發生意外的錯誤。您有關閉 MiUI 優化嗎？ - 操作失敗因為存儲錯誤。等等，這怎麼可能呢？ + 安裝 Vanced 時發生意外的錯誤。您有禁用 MiUI 優化嗎？ + 操作失敗因為存儲出現錯誤。 重新安裝 已安裝： 最新： 正在載入中。。。 - %1$s 安裝成功 + 成功安裝 %1$s 網際網絡無法存取 沒有 MicroG！ 不可用 @@ -48,7 +47,7 @@ 黃色 檢查更新 介面 - Manager + 管理員 已選擇安裝值 語言： %1$s 主題： %1$s @@ -65,29 +64,28 @@ 找到更新！ 沒有新的更新 + 關閉 指南 等一下！ 檢測到 MiUI 用戶！ - 嘿! 您似乎是 MiUI 用戶。 為了能夠正確地使用 Vanced Manager ，您將需要在開發人員設定中禁用 MiUI 優化\n但是，如果您使用的是基於 xiaomi.eu 的20.2.20 ROM ，則可以放心地忽略此警告。 + 嘿! 您似乎是 MiUI 用戶。 為了能夠正確地使用 Vanced Manager ，您將需要在開發人員設定中禁用 MiUI 優化。但是，如果您使用的是基於 xiaomi.eu 的20.2.20 ROM （或更新的版本），則可以放心地忽略此警告。 錯誤 - 請確保您於vanced.app、 Vanced的Discord伺服器或GitHub下載應用程式 + 請確保您於 vanced.app 、 Vanced 的 Discord 伺服器或 GitHub 下載應用程式 成功！ Vanced已成功安裝，您要立即啟動嗎？ 啟動 歡迎 - 為Vanced選擇您偏好的語言 + 為 Vanced 選擇您偏好的語言 備註：如果您安裝了非英語的語言，英語仍然會被安裝作其他語言 - 為Vanced選擇您偏好的主題 - 檢測到 Root 模式！ 為了使 Manager 能夠正確地安裝 Vanced ，請確保您已禁用簽名驗證。 + 為 Vanced 選擇您偏好的主題 + 檢測到 Root ！ 為了使 Manager 能夠正確地安裝 Vanced ，請確保您已禁用簽名驗證。 完成 - 淺色+黑色 - 淺色+深色 + 淺色 + 黑色 + 淺色 + 深色 下一個 Manager 的開發人員 - 資源 - Vanced團隊 - - + 程式碼 + Vanced 團隊 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9f67ef6c1a..46c85e3756 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,17 +1,14 @@ - Close Reset Save - About Home Install Settings - Changelogs Downloading %1$s @@ -19,16 +16,16 @@ Error Downloading %1$s Install Installing %1$s - Operation failed because the user aborted installation. - Operation failed because the user blocked installation. - Operation failed because the app conflicts with already installed app. - Operation failed for an unknown reason, send issue with a logcat. + Operation failed because the user aborted the installation. + Operation failed because the user blocked the installation. + Operation failed because the app conflicts with an already installed app. + Operation failed for an unknown reason, please join our Telegram or Discord for support. Operation failed because the app is incompatible with your device. Operation failed because the apk files are invalid. - Unexpected error occurred while installing Vanced. Did you disable signature verification? - Unexpected error occurred while installing Vanced. Did you disable MIUI Optimisations? - Operation failed because there was an error with storage. - Please wait until installation finishes + An unexpected error occurred while installing Vanced. Have you disabled the signature verification? + An unexpected error occurred while installing Vanced. Have you disabled MIUI-Optimisations? + Operation failed due to a storage error. + Please wait until the installation finishes Reinstall Installed: Latest: @@ -42,7 +39,6 @@ Useful Links Website Support us! - Accent Color Choose your preferred accent color @@ -54,7 +50,7 @@ Check for updates Interface Manager - Chosen Installation values + Chosen installation preferences Language: %1$s Theme: %1$s Theme @@ -64,39 +60,35 @@ Choose your preferred theme Update Channel URL Push Notifications - Receive push notifications when update is released + Receive push notifications when an update is released Re-check Update Center Update found! No new updates - Dismiss Guide Hold on! - Looks like you\'re using Magisk version of Vanced. Magisk version is discontinued and manager won\'t be able to update/uninstall it. Please remove module before using manager - Detected MIUI user! - Hey! Looks like you\'re an MIUI user. in order to properly use Vanced Manager, you will have to disable MiUI optimisations in developer settings. However, if you are on 20.2.20 ROM (Or later) that\'s based on xiaomi.eu, you can safely ignore this warning. + Looks like you\'re using the Magisk version of Vanced, which is discontinued and can not be updated using this app. Please remove it first by removing the magisk module. + MIUI detected! + Hey! it looks like you\'re a MIUI user. in order to properly use this application, you will have to disable MiUI optimisations in the developer settings. (You can safely ignore this warning if you are on a 20.2.20 or later ROM based on xiaomi.eu) Error - Please make sure you downloaded app from vanced.app, Vanced Discord server or GitHub + Please make sure, that you downloaded the app from vanced.app, the Vanced Discord server or the Vanced GitHub Success! - Vanced has been successfully installed, do you want to launch it now? + Vanced has successfully been installed! Launch now? Launch Welcome - Choose your preferred language for Vanced - Note: if you install anything other than English, English will still be installed as an additional language + Note: English will always be installed as an additional language as well. Choose your preferred theme for Vanced - Root mode detected! In order for manager to install Vanced correctly, please make sure you disabled signature verification. + Root mode detected! To install Vanced, you will need to disable the apk signature verification. Finish Light + Black Light + Dark Next - Manager Dev Sources Vanced Team - - \ No newline at end of file + From 6606d930811b19131bc8c285924380d9706f1308 Mon Sep 17 00:00:00 2001 From: kevinx8 Date: Thu, 2 Jul 2020 20:14:27 +0100 Subject: [PATCH 12/14] hotfix english strings --- app/src/main/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 46c85e3756..4da41c53dd 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -22,8 +22,8 @@ Operation failed for an unknown reason, please join our Telegram or Discord for support. Operation failed because the app is incompatible with your device. Operation failed because the apk files are invalid. - An unexpected error occurred while installing Vanced. Have you disabled the signature verification? - An unexpected error occurred while installing Vanced. Have you disabled MIUI-Optimisations? + An unexpected error occurred while installing Vanced. Have you disabled apk signature verification? + An unexpected error occurred while installing Vanced. Have you disabled MIUI Optimisations? Operation failed due to a storage error. Please wait until the installation finishes Reinstall @@ -71,7 +71,7 @@ Hold on! Looks like you\'re using the Magisk version of Vanced, which is discontinued and can not be updated using this app. Please remove it first by removing the magisk module. MIUI detected! - Hey! it looks like you\'re a MIUI user. in order to properly use this application, you will have to disable MiUI optimisations in the developer settings. (You can safely ignore this warning if you are on a 20.2.20 or later ROM based on xiaomi.eu) + Hey! it looks like you\'re a MIUI user. in order to properly use this application, you will have to disable MIUI optimisations in the developer settings. (You can safely ignore this warning if you are on a 20.2.20 or later ROM based on xiaomi.eu) Error Please make sure, that you downloaded the app from vanced.app, the Vanced Discord server or the Vanced GitHub Success! From 0d5e7f0941c964c2893c0c50a9672cbfccadf7ce Mon Sep 17 00:00:00 2001 From: X1nto Date: Thu, 2 Jul 2020 23:20:45 +0400 Subject: [PATCH 13/14] bumped up version number --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a472569834..af929a28ea 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "com.vanced.manager" minSdkVersion 21 targetSdkVersion 29 - versionCode 9 - versionName "1.0.1" + versionCode 10 + versionName "1.0.2" vectorDrawables.useSupportLibrary = true } From 98a18662f1a7aff6e2edcdbf25e6c2f29021fda9 Mon Sep 17 00:00:00 2001 From: X1nto Date: Thu, 2 Jul 2020 23:59:54 +0400 Subject: [PATCH 14/14] finished georgian translation --- .../main/res/layout/fragment_chosen_preferences.xml | 3 ++- app/src/main/res/values-ka/strings.xml | 9 ++++++--- app/src/main/res/values/strings.xml | 10 +++++++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/layout/fragment_chosen_preferences.xml b/app/src/main/res/layout/fragment_chosen_preferences.xml index c4814c36d6..e6116e79c8 100644 --- a/app/src/main/res/layout/fragment_chosen_preferences.xml +++ b/app/src/main/res/layout/fragment_chosen_preferences.xml @@ -40,7 +40,8 @@ + android:layout_height="wrap_content" + android:layout_gravity="center"> დახურვა Reset - Save + შენახვა შესახებ @@ -28,13 +28,15 @@ გაურკვეველი შეცდომა Vanced-ის დაყენების დროს. ნამდვილად გაქვთ ხელმოწერის ვერიფიკაცია გათიშული? გაურკვეველი შეცდომა Vanced-ის დაყენების დროს. ნამდვილად გამორთეთ MIUI-ის ოპტიმიზაციები? პერაცია ჩაიშალა რადგან შეცდომაა მეხსიერებასთან დაკავშირებით. - Reinstall + გთხოვთ დაიცადოთ ინსტალაციის დასრულებამდე + რეინსტალაცია დაინსტალირებული: უახლესი: იტვირთება… წარმატებით დაყენდა %1$s კავშირი არ არის დააყენეთ MicroG! + Root წვდომა არ არის მინიჭებული ხელმიუწვდომელია განახლება საჭირო ლინკები @@ -72,6 +74,7 @@ დახურვა ინსტრუქცია დაიცა! + როგორც ჩანს თქვენ იყენებთ Vanced-ის Magisk ვერსიას, რომელიც არ იმუშავებს ამ აპთან. გთხოვთ წაშალოთ მოდული მენეჯერის გამოყენებამდე. აღმოჩენილია MIUI-ის მომხმარებელი! როგორც ჩანს ტქვენ MIUI-ის მომხმარებელი ხართ. იმისთვის რომ მენეჯერმა სწორედ იმუშავოს, თქვენ უნდა გამორთოთ MIUI-ის ოპტიმიზაციები დეველოპერის პარამეტრებიდან.\n მაგრამ, თუ თქვენ ხართ სისტემის 20.2.20 (ან უფრო მაღალ) ვერსიაზე რომელიც დაფუძნებულია xiaomi.eu-ზე, შეგიძლიათ დააიგნოროთ ეს გაფრთხილება. შეცდომა @@ -83,7 +86,7 @@ აირჩიეთ სასურველი ენა Vanced-ისთვის - შენიშვნა: თუ თქვენ აირჩევთ სხვა ენას გარდა ინგლისურისა, ინგლისური მაინც იქნება დაყენებული როგორც დამატებითი ენა + შენიშვნა: ინგლისური ყვეალ ვარიანტში იქნება დაყენებული როგორც დამატებითი ენა აირჩიეთ სასურველი თემა Vanced-ისთვის აღმოჩენილია Root რეჟიმი! იმისთვის რომ მენეჯერმა Vanced-ი შეცდომების გარეშე დააყენოს, გთხოვთ დარწმუნდით რომ ხელმოწერის ვერიფიკაცია გამორთული გაქვთ. დასრულება diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4da41c53dd..4c89d0796b 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,14 +1,17 @@ + Close Reset Save + About Home Install Settings + Changelogs Downloading %1$s @@ -39,6 +42,7 @@ Useful Links Website Support us! + Accent Color Choose your preferred accent color @@ -65,6 +69,7 @@ Update Center Update found! No new updates + Dismiss Guide @@ -78,6 +83,7 @@ Vanced has successfully been installed! Launch now? Launch Welcome + Choose your preferred language for Vanced Note: English will always be installed as an additional language as well. @@ -87,8 +93,10 @@ Light + Black Light + Dark Next + Manager Dev Sources Vanced Team - + + \ No newline at end of file