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 37ff17d2..2b2a686a 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 36df1618..ec2879c2 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 286034f8..4cabb6c3 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 f5fafb97..e37236b8 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