etc
/
VancedManager
mirror of https://github.com/YTVanced/VancedManager
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

exception handling and resource cleanup

This commit is contained in:
X1nto 2020-07-01 13:17:32 +04:00
parent f303d2e8e6
commit a959daf515
17 changed files with 6 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/vanced/manager/core/Main.kt
View File

@ -53,7 +53,7 @@ open class Main: AppCompatActivity() {
}
private fun checkUpdates() {
val checkPrefs = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("auto_check_update", false)
val checkPrefs = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("auto_check_update", true)
if (checkPrefs) {
if (GetJson().isConnected(this) && InternetTools.isUpdateAvailable()) {
UpdateCheckFragment().show(supportFragmentManager, "Update")

5
app/src/main/java/com/vanced/manager/utils/InternetTools.kt
View File

@ -10,6 +10,7 @@ import com.vanced.manager.BuildConfig
import com.vanced.manager.R
import java.lang.Exception
import java.lang.IllegalStateException
import java.util.concurrent.ExecutionException
object InternetTools {
@ -29,7 +30,7 @@ object InternetTools {
GetJson().AsJSONObject("$installUrl/$json").get(obj).asString
} catch (e: Exception) {
when (e) {
is InterruptedException, is IllegalStateException -> GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/$json").get(obj).asString
is InterruptedException, is ExecutionException -> GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/$json").get(obj).asString
else -> throw e
}
@ -46,7 +47,7 @@ object InternetTools {
GetJson().AsJSONObject("$installUrl/$json").get(obj).asInt
} catch (e: Exception) {
when (e) {
is InterruptedException, is IllegalStateException -> GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/$json").get(obj).asInt
is InterruptedException, is ExecutionException -> GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/$json").get(obj).asInt
else -> throw e
}

4
app/src/main/java/com/vanced/manager/utils/MiuiHelper.kt
View File

@ -7,9 +7,7 @@ import java.io.InputStreamReader
object MiuiHelper {
fun isMiui(): Boolean {
return !TextUtils.isEmpty(getSystemProps("ro.miui.ui.version.name"))
}
fun isMiui(): Boolean = !TextUtils.isEmpty(getSystemProps("ro.miui.ui.version.name"))
fun isMiuiOptimisationsDisabled(): Boolean {
return if (isMiui())

9
app/src/main/res/drawable/ic_security_black_24dp.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="29dp"
android:height="29dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="?attr/colorPrimary"
android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"/>
</vector>

10
app/src/main/res/drawable/outline_cloud_done_24.xml
View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
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.96zM19,18L6,18c-2.21,0 -4,-1.79 -4,-4 0,-2.05 1.53,-3.76 3.56,-3.97l1.07,-0.11 0.5,-0.95C8.08,7.14 9.94,6 12,6c2.62,0 4.88,1.86 5.39,4.43l0.3,1.5 1.53,0.11c1.56,0.1 2.78,1.41 2.78,2.96 0,1.65 -1.35,3 -3,3zM10,14.18l-2.09,-2.09L6.5,13.5 10,17l6.01,-6.01 -1.41,-1.41z"/>
</vector>

10
app/src/main/res/drawable/outline_cloud_download_24.xml
View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
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.96zM19,18L6,18c-2.21,0 -4,-1.79 -4,-4 0,-2.05 1.53,-3.76 3.56,-3.97l1.07,-0.11 0.5,-0.95C8.08,7.14 9.94,6 12,6c2.62,0 4.88,1.86 5.39,4.43l0.3,1.5 1.53,0.11c1.56,0.1 2.78,1.41 2.78,2.96 0,1.65 -1.35,3 -3,3zM13.45,10h-2.9v3L8,13l4,4 4,-4h-2.55z"/>
</vector>

13
app/src/main/res/menu/secret_settings_menu.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/secret_settings"
android:title="Secret Settings"
android:icon="@drawable/ic_secret_settings_black_24dp"
app:showAsAction="always"
tools:ignore="HardcodedText" />
</menu>

2
app/src/main/res/values-ar/strings.xml
View File

@ -24,7 +24,6 @@
<string name="network_error">اتصاا الشبكة غير متاح</string>
<string name="update">تحديث</string>
<string name="useful_links">روابط المفيدة</string>
<string name="vanced_medias">Vanced على توصيل اجتماعي فانسد على توصيل اجتماعي</string>
<string name="website_text">الموقع رسمي لفانسد</string>
<string name="support_us">ادعمنا بتريق تنزيل بريف</string>
@ -58,7 +57,6 @@
<string name="next">ثانية</string>
<!-- About Page -->
<string name="manager_devs">مدير مطورين</string>
<string name="sources">مصادر</string>
<string name="vanced_team">فريق فانسد</string>
</resources>

2
app/src/main/res/values-fr/strings.xml
View File

@ -20,7 +20,6 @@
<string name="network_error">Connection réseau indisponible</string>
<string name="update">Mettre à jour</string>
<string name="useful_links">Liens utiles</string>
<string name="vanced_medias">Vanced sur les Résaux Sociaux</string>
<string name="website_text">Le site web officiel de Vanced</string>
<string name="support_us">Supporte nous en téléchargeant Brave</string>
@ -53,7 +52,6 @@
<string name="next">Suivant</string>
<!-- About Page -->
<string name="manager_devs">Dévéloppeurs du Manager</string>
<string name="sources">Sources</string>
<string name="vanced_team">Équipe Vanced</string>
<string name="security_context">Assurez-vous d\'avoir téléchargé l\'application sur vanced.app, le serveur Discord de Vanced ou sur le github officiel.</string>

3
app/src/main/res/values-ka/strings.xml
View File

@ -16,14 +16,12 @@
<string name="changelogs">ცვლილებები</string>
<string name="install">ინსტალაცია</string>
<string name="version_installed">დაინსტალირებული:</string>
<string name="button_installed">დაინსტალირებულია</string>
<string name="latest">უახლესი:</string>
<string name="loading">იტვირთება…</string>
<string name="network_error">კავშირი არ არის</string>
<string name="unavailable">ხელმიუწვდომელია</string>
<string name="update">განახლება</string>
<string name="useful_links">საჭირო ლინკები</string>
<string name="vanced_medias">Vanced სოციალურ ქსელებზე</string>
<string name="website_text">Vanced-ის ოფიციალური ვებსაიტი</string>
<string name="support_us">დაგვიჭირეთ მხარი Brave-ის გადმოწერით</string>
@ -57,7 +55,6 @@
<string name="next">შემდეგი</string>
<!-- About Page -->
<string name="manager_devs">Manager-ის დეველოპერები</string>
<string name="sources">წყაროები</string>
<string name="vanced_team">Vanced-ის გუნდი</string>

2
app/src/main/res/values-pt-rPT/strings.xml
View File

@ -21,7 +21,6 @@
<string name="network_error">Conexão de rede indisponível</string>
<string name="update">Atualizar</string>
<string name="useful_links">Links Importantes</string>
<string name="vanced_medias">Vanced nas Redes Sociais</string>
<string name="website_text">Site oficial do Vanced</string>
@ -55,7 +54,6 @@
<string name="next">Próximo</string>
<!-- About Page -->
<string name="manager_devs">Desenvolvedores Gerentes</string>
<string name="sources">Fontes</string>
<string name="vanced_team">Equipa Vanced</string>
</resources>

2
app/src/main/res/values-tr/strings.xml
View File

@ -21,7 +21,6 @@
<string name="network_error">Ağ bağlantısı yok</string>
<string name="update">Güncellemek</string>
<string name="useful_links">Faydalı Bağlantılar</string>
<string name="vanced_medias">Sosyal Medyada Vanced</string>
<string name="website_text">Vanced\'in resmi web sitesi</string>
<string name="support_us">Brave Tarayıcısı\'nı indirerek bizi destekleyebilirsiniz</string>
@ -55,7 +54,6 @@
<string name="next">Sonraki</string>
<!-- About Page -->
<string name="manager_devs">Manager Yapımcıları</string>
<string name="sources">Kaynaklar</string>
<string name="vanced_team">Vanced Ekibi</string>
</resources>

2
app/src/main/res/values-uk/strings.xml
View File

@ -21,7 +21,6 @@
<string name="network_error">Немає з\'єднання з мережею</string>
<string name="update">Оновлення</string>
<string name="useful_links">Корисні сторінки</string>
<string name="vanced_medias">Vanced в соціальних мережах</string>
<string name="website_text">Офіційний веб-сайт Vanced</string>
<string name="support_us">Підтримай нас завантаживши браузер Brave</string>
@ -55,7 +54,6 @@
<string name="next">Наступна</string>
<!-- About Page -->
<string name="manager_devs">Розробники Менеджера</string>
<string name="sources">Джерела</string>
<string name="vanced_team">Команда Vanced</string>

15
app/src/main/res/values/arrays.xml
View File

@ -29,19 +29,4 @@
<item>Purple</item>
</string-array>
<string-array name="vanced_variant">
<item>nonroot</item>
<item>root</item>
</string-array>
<string-array name="syke">
<item>SYKE</item>
</string-array>
<string-array name="yomama">
<item>Yo</item>
<item>mama</item>
<item>fat</item>
</string-array>
</resources>

2
app/src/main/res/values/colors.xml
View File

@ -8,8 +8,6 @@
<color name="Reddit">#FF4500</color>
<color name="GitHub">#17191A</color>
<color name="Black">#000000</color>
<color name="Red">#CC0047</color>
<color name="Green">#00CC7A</color>
</resources>

5
app/src/main/res/values/strings.xml
View File

@ -5,7 +5,6 @@
<string name="close">Close</string>
<string name="reset">Reset</string>
<string name="save">Save</string>
<string name="cancel">Cancel</string>
<!-- Main Activity -->
<string name="title_about">About</string>
@ -17,7 +16,6 @@
<!-- Home Page -->
<string name="changelogs">Changelogs</string>
<string name="check">Check</string>
<string name="downloading_file">Downloading %1$s</string>
<string name="failed_uninstall">Failed to uninstall package %1$s</string>
<string name="error_downloading">Error Downloading %1$s</string>
@ -40,7 +38,6 @@
<string name="successfully_installed">Successfully installed %1$s</string>
<string name="network_error">Network connection unavailable</string>
<string name="no_microg">No Microg!</string>
<string name="unable_download">Unable to download %1$s</string>
<string name="unavailable">Unavailable</string>
<string name="update">Update</string>
<string name="useful_links">Useful Links</string>
@ -83,7 +80,7 @@
<string name="miui_two_title">I\'m gonna stop you right there!</string>
<string name="miui_two">Looks like you did NOT disable MiUI optimisations. Please disable it. However, if you are on 20.2.20 ROM that\'s based on xiaomi.eu, you can safely ignore this warning.</string>
<string name="error">Error</string>
<string name="security_context">Please make sure you downloaded app from vanced.app, Vanced Discord server or GitHub</string>
<string name="security_context">Please make sure you downloaded the app from vanced.app, Vanced Discord server or GitHub</string>
<string name="success">Success!</string>
<string name="vanced_installed">Vanced has been successfully installed, do you want to launch it now?</string>
<string name="launch">Launch</string>

10
app/src/main/res/values/styles.xml
View File

@ -15,11 +15,6 @@
<item name="fontFamily">@font/exo_bold</item>
</style>
<style name="DisabledButtonStyle" parent="ButtonStyle">
<item name="backgroundTint">?colorDisabled</item>
<item name="android:textColor">#e8e8e8</item>
</style>
<style name="InstallButtonStyle" parent="ButtonStyle">
<item name="android:layout_marginEnd">6dp</item>
<item name="android:layout_gravity">end</item>
@ -37,11 +32,6 @@
<item name="iconTint">#ffffff</item>
</style>
<style name="LinkButtonStyle" parent="ButtonStyle">
<item name="android:layout_width">match_parent</item>
<item name="cornerRadius">8dp</item>
</style>
<style name="MaterialCard" parent="Widget.MaterialComponents.CardView">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>