bug fixes
This commit is contained in:
X1nto
parent
971b08df35
commit
3f874ce5ed
|
|
@ -16,6 +16,7 @@ import com.vanced.manager.utils.InternetTools.getFileNameFromUrl
|
|||
import com.vanced.manager.utils.NotificationHelper
|
||||
import java.lang.Exception
|
||||
import java.lang.IllegalStateException
|
||||
import java.lang.RuntimeException
|
||||
import java.util.concurrent.ExecutionException
|
||||
|
||||
class MicrogDownloadService: Service() {
|
||||
|
|
@ -25,7 +26,7 @@ class MicrogDownloadService: Service() {
|
|||
downloadMicrog()
|
||||
} catch (e: Exception) {
|
||||
when (e) {
|
||||
is ExecutionException, is IllegalStateException -> Toast.makeText(this, "Unable to download Vanced", Toast.LENGTH_SHORT).show()
|
||||
is ExecutionException, is RuntimeException -> Toast.makeText(this, "Unable to download Vanced", Toast.LENGTH_SHORT).show()
|
||||
else -> throw e
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,18 +19,17 @@ import com.vanced.manager.utils.InternetTools.getLatestVancedUrl
|
|||
import com.vanced.manager.utils.NotificationHelper.displayDownloadNotif
|
||||
import java.lang.Exception
|
||||
import java.lang.IllegalStateException
|
||||
import java.lang.RuntimeException
|
||||
import java.util.concurrent.ExecutionException
|
||||
|
||||
class VancedDownloadService: Service() {
|
||||
|
||||
private val baseUrl = PreferenceManager.getDefaultSharedPreferences(this).getString("install_url", getLatestVancedUrl(this))
|
||||
|
||||
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
|
||||
try {
|
||||
downloadSplits()
|
||||
} catch (e: Exception) {
|
||||
when (e) {
|
||||
is ExecutionException, is IllegalStateException -> Toast.makeText(this, "Unable to download Vanced", Toast.LENGTH_SHORT).show()
|
||||
is ExecutionException, is RuntimeException -> Toast.makeText(this, "Unable to download Vanced", Toast.LENGTH_SHORT).show()
|
||||
else -> throw e
|
||||
}
|
||||
|
||||
|
|
@ -42,6 +41,7 @@ class VancedDownloadService: Service() {
|
|||
private fun downloadSplits(
|
||||
type: String = "arch"
|
||||
) {
|
||||
val baseUrl = PreferenceManager.getDefaultSharedPreferences(this).getString("install_url", getLatestVancedUrl(this))
|
||||
val prefs = getSharedPreferences("installPrefs", Context.MODE_PRIVATE)
|
||||
prefs?.edit()?.putBoolean("isVancedDownloading", true)?.apply()
|
||||
val variant = PreferenceManager.getDefaultSharedPreferences(this)
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import androidx.annotation.Nullable
|
|||
import androidx.localbroadcastmanager.content.LocalBroadcastManager
|
||||
import com.vanced.manager.R
|
||||
import com.vanced.manager.ui.MainActivity
|
||||
import com.vanced.manager.utils.MiuiHelper.isMiui
|
||||
|
||||
class SplitInstallerService: Service() {
|
||||
|
||||
|
|
@ -49,7 +50,12 @@ class SplitInstallerService: Service() {
|
|||
PackageInstaller.STATUS_FAILURE_INVALID -> getString(R.string.installation_invalid)
|
||||
PackageInstaller.STATUS_FAILURE_INCOMPATIBLE -> getString(R.string.installation_incompatible)
|
||||
PackageInstaller.STATUS_FAILURE_CONFLICT -> getString(R.string.installation_conflict)
|
||||
else -> getString(R.string.installation_failed)
|
||||
else ->
|
||||
if (isMiui())
|
||||
getString(R.string.installation_miui)
|
||||
else
|
||||
getString(R.string.installation_failed)
|
||||
|
||||
}
|
||||
|
||||
val mIntent = Intent(MainActivity.INSTALL_FAILED)
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import androidx.core.content.ContextCompat.startActivity
|
|||
import androidx.preference.PreferenceManager
|
||||
import com.vanced.manager.R
|
||||
import com.vanced.manager.ui.MainActivity
|
||||
import com.vanced.manager.utils.InternetTools.openUrl
|
||||
import com.vanced.manager.utils.MiuiHelper
|
||||
|
||||
object DialogContainer {
|
||||
|
|
@ -33,11 +34,15 @@ object DialogContainer {
|
|||
}
|
||||
|
||||
private fun showMiuiDialog(context: Context) {
|
||||
basicAlertBuilder(
|
||||
context.getString(R.string.miui_one_title),
|
||||
context.getString(R.string.miui_one),
|
||||
context
|
||||
)
|
||||
AlertDialog.Builder(context)
|
||||
.setTitle(context.getString(R.string.miui_one_title))
|
||||
.setMessage(context.getString(R.string.miui_one))
|
||||
.setPositiveButton(context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() }
|
||||
.setNeutralButton(context.getString(R.string.guide)) { _, _ ->
|
||||
openUrl("https://telegra.ph/How-to-install-v15-on-MIUI-02-11", R.color.Telegram, context)
|
||||
}
|
||||
.create()
|
||||
.show()
|
||||
}
|
||||
|
||||
fun showRootDialog(activity: Activity) {
|
||||
|
|
@ -48,6 +53,9 @@ object DialogContainer {
|
|||
dialog.dismiss()
|
||||
PreferenceManager.getDefaultSharedPreferences(activity).edit().putBoolean("show_root_dialog", false).apply()
|
||||
}
|
||||
.setNeutralButton(activity.getString(R.string.guide)) { _, _ ->
|
||||
openUrl("https://lmgtfy.com/?q=andnixsh+apk+verification+disable", R.color.Twitter, activity)
|
||||
}
|
||||
.create()
|
||||
.show()
|
||||
}
|
||||
|
|
@ -57,6 +65,9 @@ object DialogContainer {
|
|||
.setTitle(context.getString(R.string.miui_two_title))
|
||||
.setMessage(context.getString(R.string.miui_two))
|
||||
.setPositiveButton(context.getString(R.string.button_fine)) { dialog, _ -> dialog.dismiss() }
|
||||
.setNeutralButton(context.getString(R.string.guide)) { _, _ ->
|
||||
openUrl("https://telegra.ph/How-to-install-v15-on-MIUI-02-11", R.color.Telegram, context)
|
||||
}
|
||||
.create()
|
||||
.show()
|
||||
}
|
||||
|
|
@ -74,15 +85,6 @@ object DialogContainer {
|
|||
prefs.edit().putBoolean("statement", true).apply()
|
||||
}
|
||||
|
||||
private fun basicAlertBuilder(title: String, msg: String, context: Context) {
|
||||
AlertDialog.Builder(context)
|
||||
.setTitle(title)
|
||||
.setMessage(msg)
|
||||
.setPositiveButton("close") { dialog, _ -> dialog.dismiss() }
|
||||
.create()
|
||||
.show()
|
||||
}
|
||||
|
||||
fun installAlertBuilder(msg: String, context: Context) {
|
||||
AlertDialog.Builder(context)
|
||||
.setTitle(context.getString(R.string.error))
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ class URLChangeFragment : DialogFragment() {
|
|||
if (dialog != null && dialog?.window != null) {
|
||||
dialog?.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
|
||||
}
|
||||
return inflater.inflate(R.layout.fragment_update_check, container, false)
|
||||
return inflater.inflate(R.layout.fragment_custom_url, container, false)
|
||||
}
|
||||
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ class HomeViewModel(application: Application): AndroidViewModel(application) {
|
|||
private fun compareIntDrawable(int1: Int, int2: Int, application: Application): Drawable? {
|
||||
return if (connected)
|
||||
when {
|
||||
int1 > int2 -> application.getDrawable(R.drawable.ic_cloud_upload_black_24dp)
|
||||
int1 > int2 -> application.getDrawable(R.drawable.ic_update)
|
||||
int2 == int1 -> application.getDrawable(R.drawable.outline_cloud_done_24)
|
||||
else -> application.getDrawable(R.drawable.outline_cloud_download_24)
|
||||
} else application.getDrawable(R.drawable.outline_cloud_download_24)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,24 @@
|
|||
package com.vanced.manager.utils
|
||||
|
||||
import android.content.Context
|
||||
import android.net.Uri
|
||||
import android.view.View
|
||||
import androidx.browser.customtabs.CustomTabsIntent
|
||||
import androidx.core.content.ContextCompat
|
||||
import com.dezlum.codelabs.getjson.GetJson
|
||||
import com.vanced.manager.BuildConfig
|
||||
import com.vanced.manager.R
|
||||
import java.lang.IllegalStateException
|
||||
|
||||
object InternetTools {
|
||||
|
||||
fun openUrl(Url: String, color: Int, context: Context) {
|
||||
val builder = CustomTabsIntent.Builder()
|
||||
builder.setToolbarColor(ContextCompat.getColor(context, color))
|
||||
val customTabsIntent = builder.build()
|
||||
customTabsIntent.launchUrl(context, Uri.parse(Url))
|
||||
}
|
||||
|
||||
fun getFileNameFromUrl(url: String) = url.substring(url.lastIndexOf('/')+1, url.length)
|
||||
|
||||
fun displayJsonString(json: String, obj: String, context: Context): String {
|
||||
|
|
|
|||
|
|
@ -7,9 +7,7 @@ import java.io.InputStreamReader
|
|||
|
||||
object MiuiHelper {
|
||||
|
||||
fun isMiui(): Boolean {
|
||||
return !TextUtils.isEmpty(getSystemProps("ro.miui.system.version.name"))
|
||||
}
|
||||
fun isMiui(): Boolean = !TextUtils.isEmpty(getSystemProps("ro.miui.system.version.name"))
|
||||
|
||||
private fun getSystemProps(propname: String): String? {
|
||||
val line: String
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ object NotificationHelper {
|
|||
notifBuilder.apply {
|
||||
setContentTitle(context.getString(R.string.app_name))
|
||||
setContentText(context.getString(R.string.downloading_file, filename))
|
||||
setSmallIcon(R.drawable.ic_stat_name)
|
||||
}
|
||||
val notif = notifBuilder.build()
|
||||
val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="2373.913"
|
||||
android:viewportHeight="2373.913"
|
||||
android:tint="#FFFFFF">
|
||||
<group android:translateX="186.95653"
|
||||
android:translateY="186.95653">
|
||||
<path
|
||||
android:pathData="M1004.92,1881.1c-38.2,0.05 -76.47,-1.45 -114.57,0.42c-51.76,2.55 -81.84,-18.16 -90.74,-70.96c-7.49,-44.41 -13.2,-90.61 -30.51,-131.43c-15.34,-36.18 -40.29,-72.3 -70.22,-97.5c-83.85,-70.62 -178.04,-88.12 -279.91,-36c-16.76,8.57 -36.28,11.64 -54.35,17.76c-44.7,15.15 -76.87,1.99 -100.01,-39.68c-37.07,-66.74 -75.6,-132.69 -114.44,-198.43c-26.16,-44.27 -21.81,-81.72 19.36,-114.5c18.97,-15.11 34.6,-34.64 54.31,-48.55c72.54,-51.21 94,-120.05 91.6,-207.5c-2.02,-73.79 -23.93,-128.07 -79.03,-177.07c-131.04,-116.54 -130.5,-96.77 -38.4,-254.62c19.24,-32.97 38.08,-66.16 57.32,-99.13c41.41,-70.96 54.33,-75.72 134.39,-49.89c34.65,11.18 69.02,23.28 103.91,33.66c101.86,30.29 254.34,-57.92 278.42,-161.01c11.05,-47.28 20.7,-94.88 31.43,-142.24c8.42,-37.18 32.04,-56.47 70.31,-56.57c83.34,-0.23 166.68,0.02 250.01,-0.19c40.55,-0.11 65.26,19.16 73.99,58.78c10.44,47.42 14.73,97.39 33.08,141.51c15.63,37.56 42.09,74.68 73.09,100.99c82.04,69.63 174.55,87.18 274.79,35.85c18.26,-9.35 39.69,-12.3 59.29,-19.26c42.92,-15.23 73.52,-2.18 95.76,37.26c39.19,69.52 79.65,138.32 119.78,207.31c22.41,38.53 18.11,72.63 -15.69,102.47c-13.01,11.49 -24.36,25.49 -38.81,34.62c-105.9,66.87 -127.21,167.78 -109.49,281c5,31.96 22.73,65.36 43.68,90.58c29.68,35.74 67.12,65.23 102.43,96.04c33.98,29.66 40.49,63.13 18.36,101.95c-40.4,70.85 -81.55,141.28 -121.74,212.25c-21.43,37.85 -52.64,47.95 -92.63,35.44c-43.04,-13.47 -85.74,-28.06 -128.91,-41.12c-106.14,-32.11 -256.7,54.16 -281.98,161.54c-10.73,45.58 -20.37,91.42 -30.39,137.17c-8.68,39.59 -32.96,59.33 -73.71,59.05C1084.79,1880.83 1044.85,1881.04 1004.92,1881.1z"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="76"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeLineCap="round">
|
||||
<aapt:attr name="android:strokeColor">
|
||||
<gradient
|
||||
android:startY="1642.6245"
|
||||
android:startX="322.9971"
|
||||
android:endY="287.2871"
|
||||
android:endX="1678.3345"
|
||||
android:type="linear">
|
||||
<item android:offset="1.065558E-7" android:color="#FF2E73FF"/>
|
||||
<item android:offset="1" android:color="#FFFF0032"/>
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
<path
|
||||
android:pathData="M1270.42,895.24L886.12,647.3c-16.68,-9.72 -38.08,-4.08 -47.8,12.59l-0.75,1.28c-9.72,16.67 -4.09,38.07 12.59,47.79l367.49,221.11c23.91,14.39 23.77,49.1 -0.25,63.29l-369.18,218.11c-16.76,9.58 -22.58,30.93 -13,47.69l0.73,1.29c9.58,16.76 30.93,22.57 47.69,12.99l386.24,-244.83C1318.69,997.67 1318.97,926.57 1270.42,895.24z"
|
||||
android:fillColor="#FFFFFF"/>
|
||||
<path
|
||||
android:pathData="M1074.21,926.45L884.98,819.87c-24.49,-13.8 -54.77,3.9 -54.77,32v213.18c0,28.11 30.28,45.8 54.77,32l189.22,-106.59C1099.15,976.41 1099.15,940.5 1074.21,926.45z">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:startY="1058.4124"
|
||||
android:startX="808.329"
|
||||
android:endY="858.5059"
|
||||
android:endX="1008.2355"
|
||||
android:type="linear">
|
||||
<item android:offset="0" android:color="#FF2E73FF"/>
|
||||
<item android:offset="1" android:color="#FFFF0032"/>
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
</group>
|
||||
</vector>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 724 B |
Binary file not shown.
|
After Width: | Height: | Size: 435 B |
Binary file not shown.
|
After Width: | Height: | Size: 1004 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
|
|
@ -0,0 +1,5 @@
|
|||
<vector android:height="24dp" android:tint="#FFFFFF"
|
||||
android:viewportHeight="24.0" android:viewportWidth="24.0"
|
||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#FF000000" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z"/>
|
||||
</vector>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="Vanced">#673AB7</color>
|
||||
<color name="Brave">#FF2600</color>
|
||||
<color name="Brave">#FB542B</color>
|
||||
<color name="Discord">#7289DA</color>
|
||||
<color name="Twitter">#1DA1F2</color>
|
||||
<color name="Telegram">#0088cc</color>
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@
|
|||
<string name="update_notfound">No new updates</string>
|
||||
|
||||
<!-- Dialogs -->
|
||||
<string name="guide">Guide</string>
|
||||
<string name="hold_on">Hold on!</string>
|
||||
<string name="miui_one_title">Detected MiUI user!</string>
|
||||
<string name="miui_one">Hey! Looks like you\'re a MiUI user. in order to properly use Vanced Manager, you will have to disable MiUI optimisations in developer settings\nIf you can\'t find such setting, it means that you are using a new version of ROM which does not need fixing anything.</string>
|
||||
|
|
|
|||
Loading…
Reference in New Issue