From f1c2527ca3a7da9350b78d5e9d3fbda1ab9b28fb Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Wed, 15 Jun 2022 17:13:18 +0300 Subject: [PATCH] fixes --- app/src/main/java/com/vtosters/lite/R.java | 2 +- .../lite/ui/{fragments => dialogs}/OTADialog.java | 4 +--- .../ru/vtosters/lite/ui/fragments/VTSettings.java | 14 ++++++++++++-- .../main/java/ru/vtosters/lite/utils/Globals.java | 14 ++++++++++++++ .../java/ru/vtosters/lite/utils/Preferences.java | 4 ++++ smali/res/values-ru/strings.xml | 4 +++- smali/res/values/public.xml | 2 +- smali/res/values/strings.xml | 5 ++++- .../com/vtosters/lite/MainActivity.smali | 6 +----- 9 files changed, 41 insertions(+), 14 deletions(-) rename app/src/main/java/ru/vtosters/lite/ui/{fragments => dialogs}/OTADialog.java (92%) diff --git a/app/src/main/java/com/vtosters/lite/R.java b/app/src/main/java/com/vtosters/lite/R.java index b4c5e9c75..bcfc8f5aa 100644 --- a/app/src/main/java/com/vtosters/lite/R.java +++ b/app/src/main/java/com/vtosters/lite/R.java @@ -15007,7 +15007,7 @@ public final class R { public static final int dockbar_save = 0x7f11123b; public static final int dockbar_selected_items = 0x7f11123c; public static final int dockbar_unselected_items = 0x7f11123d; - public static final int download_latest_vtl = 0x7f11123e; + public static final int checkforupdates = 0x7f11123e; public static final int other_fix_dynamic_colors = 0x7f11123f; public static final int other_reset_settings = 0x7f111240; public static final int other_reset_settings_summary = 0x7f111241; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/OTADialog.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java similarity index 92% rename from app/src/main/java/ru/vtosters/lite/ui/fragments/OTADialog.java rename to app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java index 13d98dd5a..12aac90b9 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/OTADialog.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java @@ -1,8 +1,6 @@ -package ru.vtosters.lite.ui.fragments; +package ru.vtosters.lite.ui.dialogs; import android.app.Activity; -import android.app.ProgressDialog; -import android.content.Context; import android.widget.Toast; import com.vk.core.dialogs.VKProgressDialog; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java index 06bfabeff..722afcbbf 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java @@ -56,6 +56,7 @@ import com.vtosters.lite.fragments.k.BlacklistFragment; import com.vtosters.lite.fragments.money.music.control.subscription.MusicSubscriptionControlFragment; import ru.vtosters.lite.ui.PreferencesUtil; +import ru.vtosters.lite.ui.dialogs.OTADialog; import ru.vtosters.lite.ui.fragments.dockbar.DockBarFragment; import ru.vtosters.lite.ui.fragments.dockbar.DockBarManager; import ru.vtosters.lite.ui.fragments.multiaccount.MultiAccountFragment; @@ -336,11 +337,20 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { return false; }); - PreferencesUtil.addPreference(this, "", getString("download_latest_vtl"), "", "ic_download_24", preference -> { -// getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://github.com/vtosters/lite/releases/latest"))); + PreferencesUtil.addPreferenceCategory(this, getString("updates")); + + PreferencesUtil.addPreference(this, "", getString("checkforupdates"), "", "ic_download_24", preference -> { OTADialog.checkUpdates(p()); return false; }); + + PreferencesUtil.addMaterialSwitchPreference(this, "checkupdates", getString("checkupdates"), "", "ic_recent_24", true, (preference, o) -> { + boolean value = (boolean) o; + + edit().putBoolean("checkupdates", value).commit(); + + return true; + }); } public static String getValAsString(String stringid, Boolean value) { diff --git a/app/src/main/java/ru/vtosters/lite/utils/Globals.java b/app/src/main/java/ru/vtosters/lite/utils/Globals.java index 5cc38cb6b..8d53c81e5 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Globals.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Globals.java @@ -1,6 +1,7 @@ package ru.vtosters.lite.utils; import static androidx.core.content.ContextCompat.getDrawable; +import static ru.vtosters.lite.utils.Preferences.checkupdates; import static ru.vtosters.lite.utils.Preferences.getLocale; import static ru.vtosters.lite.utils.Preferences.preferences; import static ru.vtosters.lite.utils.Themes.isDarkTheme; @@ -49,6 +50,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; +import ru.vtosters.lite.ui.dialogs.DisableBattery; +import ru.vtosters.lite.ui.dialogs.InstallGMS; +import ru.vtosters.lite.ui.dialogs.Start; +import ru.vtosters.lite.ui.dialogs.OTADialog; + public class Globals { private static final List activities = new ArrayList<>(); @@ -57,6 +63,14 @@ public class Globals { return preferences; } + public static void MainActivityInit(Activity activity) { + if(checkupdates()) + OTADialog.checkUpdates(activity); + Start.alert(activity); + InstallGMS.alert(activity); + DisableBattery.alert(activity); + } + public static void componentSwitcher(String component, Boolean enabled) { var packageManager = getContext().getPackageManager(); packageManager.setComponentEnabledSetting(new ComponentName(getPackageName(), getPackageName() + "." + component), enabled? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java index 3935887d4..d9481362e 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -361,6 +361,10 @@ public class Preferences { return getBoolValue("roundedmsgs", false); } + public static boolean checkupdates() { + return getBoolValue("checkupdates", true); + } + public static boolean disableanimstickers() { return getBoolValue("disableanimstickers", true); } diff --git a/smali/res/values-ru/strings.xml b/smali/res/values-ru/strings.xml index cdfbbf8ab..731a9eb8f 100644 --- a/smali/res/values-ru/strings.xml +++ b/smali/res/values-ru/strings.xml @@ -4337,7 +4337,7 @@ Добавить новый аккаунт - Скачать последнюю версию + Проверить обновления Внимание! Данное меню предназначено только для тестирования работоспособности приложения. Если вы являетесь рядовым юзером, то вам не следует ничего не трогать в данных настройках (пожалуйста) @@ -4474,6 +4474,8 @@ Скрыть подписи в настройках Есть доступ + Авто обновления + Обновления diff --git a/smali/res/values/public.xml b/smali/res/values/public.xml index 9d41ff2eb..98cebb92c 100644 --- a/smali/res/values/public.xml +++ b/smali/res/values/public.xml @@ -14953,7 +14953,7 @@ - + diff --git a/smali/res/values/strings.xml b/smali/res/values/strings.xml index 1422c9e5c..df4a31456 100644 --- a/smali/res/values/strings.xml +++ b/smali/res/values/strings.xml @@ -4463,7 +4463,7 @@ May look like a fake leaving the online" Add new account - Download latest version + Check for updates Warning! These options are for testing this app only. If you are a regular user, please, don\'t use them @@ -4608,6 +4608,9 @@ May look like a fake leaving the online" Hide settings summaries Have access + Auto updates + Updates + diff --git a/smali/smali_classes3/com/vtosters/lite/MainActivity.smali b/smali/smali_classes3/com/vtosters/lite/MainActivity.smali index 1916f7027..5ec417aa7 100644 --- a/smali/smali_classes3/com/vtosters/lite/MainActivity.smali +++ b/smali/smali_classes3/com/vtosters/lite/MainActivity.smali @@ -566,11 +566,7 @@ .line 65 :cond_0 - invoke-static {p0}, Lru/vtosters/lite/ui/dialogs/Start;->alert(Landroid/app/Activity;)V - - invoke-static {p0}, Lru/vtosters/lite/ui/dialogs/InstallGMS;->alert(Landroid/app/Activity;)V - - invoke-static {p0}, Lru/vtosters/lite/ui/dialogs/DisableBattery;->alert(Landroid/app/Activity;)V + invoke-static {p0}, Lru/vtosters/lite/utils/Globals;->MainActivityInit(Landroid/app/Activity;)V invoke-virtual {p0}, Lcom/vtosters/lite/MainActivity;->getWindow()Landroid/view/Window;