From 5249600b769585ebad1dacd8ecf84652075415d0 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sat, 18 Mar 2023 13:10:12 +0300 Subject: [PATCH] many build features upgrades --- .../lite/ui/fragments/VTSettings.java | 60 +++++-------------- .../java/ru/vtosters/lite/utils/About.java | 2 +- .../ru/vtosters/lite/utils/Preferences.java | 14 +++-- 3 files changed, 27 insertions(+), 49 deletions(-) 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 857dc49d6..2f5ff4c60 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 @@ -1,15 +1,10 @@ package ru.vtosters.lite.ui.fragments; -import static ru.vtosters.lite.utils.Preferences.VERSIONNAME; -import static ru.vtosters.lite.utils.Preferences.isValidSignature; - import android.content.Intent; import android.net.Uri; import android.os.Build; import android.os.Bundle; - import androidx.annotation.StringRes; - import com.aefyr.tsg.g2.TelegramStickersPack; import com.aefyr.tsg.g2.TelegramStickersService; import com.vk.about.AboutAppFragment; @@ -26,27 +21,19 @@ import com.vtosters.lite.fragments.w2.BlacklistFragment; import com.vtosters.lite.general.fragments.SettingsAccountFragment; import com.vtosters.lite.general.fragments.SettingsGeneralFragment; import com.vtosters.lite.ui.MaterialSwitchPreference; - +import ru.vtosters.lite.BuildConfig; import ru.vtosters.lite.concurrent.VTExecutors; import ru.vtosters.lite.hooks.ui.SystemThemeChangerHook; import ru.vtosters.lite.ssfs.Utils; import ru.vtosters.lite.ui.PreferenceFragmentUtils; import ru.vtosters.lite.ui.dialogs.OTADialog; import ru.vtosters.lite.ui.fragments.tgstickers.StickersFragment; -import ru.vtosters.lite.utils.About; -import ru.vtosters.lite.utils.AccountManagerUtils; -import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.GmsUtils; -import ru.vtosters.lite.utils.ImageUtils; -import ru.vtosters.lite.utils.NavigatorUtils; -import ru.vtosters.lite.utils.Preferences; -import ru.vtosters.lite.utils.ThemesUtils; -import ru.vtosters.lite.utils.VTVerifications; +import ru.vtosters.lite.utils.*; public class VTSettings extends TrackedMaterialPreferenceToolbarFragment implements TelegramStickersService.StickersEventsListener { public static String getValAsString(@StringRes int strRes, Boolean value) { - if(value) { + if (value) { return AndroidUtils.getString(strRes) + ": " + AndroidUtils.getString(R.string.vtlsettenabled); } @@ -54,7 +41,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme } public static String getSSFSsumm() { - if(Preferences.hasSpecialVerif()) + if (Preferences.hasSpecialVerif()) return AndroidUtils.getString(R.string.vtlssfssumm) + ": " + AndroidUtils.getString(R.string.vtlsettverifyes); return AndroidUtils.getString(R.string.vtlssfssumm) + ": " + AndroidUtils.getString(R.string.vtlsettverifno); @@ -67,7 +54,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme public static String getProxysumm() { var type = Preferences.getString("proxy"); - if(type.equals("noproxy") || type.isEmpty()) + if (type.equals("noproxy") || type.isEmpty()) type = AndroidUtils.getString(R.string.vtlsettdisabled); return AndroidUtils.getString(R.string.vtlproxysumm) + ": " + type; @@ -107,6 +94,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme } + @SuppressWarnings("ConstantConditions") @Override public void onCreate(Bundle bundle) { super.onCreate(bundle); @@ -127,7 +115,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme preference -> { try { VKAuth.a("logout", false); - } catch(Exception ignored) { + } catch (Exception ignored) { } var intent = new Intent(requireContext(), MainActivity.class) @@ -141,7 +129,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme VTExecutors.getIoScheduler().a(() -> { var icon = ImageUtils.getDrawableFromUrl(AccountManagerUtils.getUserPhoto(), 0, true, true); - if(icon == null) return; + if (icon == null) return; requireActivity().runOnUiThread(() -> { accountSwitcher.setIcon(icon); }); @@ -198,7 +186,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme ); } - if(!GmsUtils.isGmsInstalled()) { + if (!GmsUtils.isGmsInstalled()) { PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), R.string.gmsname); PreferenceFragmentUtils.addPreference( @@ -214,7 +202,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme ); } - if(Preferences.devmenu()) { + if (Preferences.devmenu()) { PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), R.string.sett_debug); PreferenceFragmentUtils.addPreference( @@ -241,22 +229,6 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme return true; } ); - - if(Preferences.dev() && Preferences.isValidSignature()) { - PreferenceFragmentUtils.addMaterialSwitchPreference( - getPreferenceScreen(), - "autoupdates", - requireContext().getString(R.string.checkupdates), - "", - R.drawable.ic_bug_outline_28, - true, - (preference, o) -> { - boolean value = (boolean) o; - Preferences.getPreferences().edit().putBoolean("autoupdates", value).commit(); - return true; - } - ); - } } if (AccountManagerUtils.isLogin()) { @@ -299,7 +271,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme } ); - if(AccountManagerUtils.isVKTester()) { + if (AccountManagerUtils.isVKTester()) { PreferenceFragmentUtils.addPreference( getPreferenceScreen(), "", @@ -353,7 +325,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme } ); - if(VKAccountManager.d().isMusicSubs()) { + if (VKAccountManager.d().isMusicSubs()) { PreferenceFragmentUtils.addPreference( getPreferenceScreen(), "", @@ -381,7 +353,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.vtsettmod)); - if(Preferences.vkme()) { + if (Preferences.vkme()) { PreferenceFragmentUtils.addPreference( getPreferenceScreen(), "", @@ -508,7 +480,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme getPreferenceScreen(), "", requireContext().getString(R.string.menu_about), - (isValidSignature() ? VERSIONNAME : "Dev") + " | " + About.getBuildNumber(), + Preferences.getBuildName() + " | " + About.getBuildNumber(), R.drawable.ic_about_outline_28, preference -> { NavigatorUtils.switchFragment(requireContext(), AboutAppFragment.class); @@ -527,7 +499,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme return false; } ); - + PreferenceFragmentUtils.addPreference( getPreferenceScreen(), @@ -553,7 +525,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment impleme } ); - if(Preferences.isValidSignature()) { + if (Preferences.isValidSignature() && BuildConfig.BUILD_TYPE.equals("release")) { PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.updates)); PreferenceFragmentUtils.addPreference( diff --git a/app/src/main/java/ru/vtosters/lite/utils/About.java b/app/src/main/java/ru/vtosters/lite/utils/About.java index 1e45e2c93..e61cc3c7c 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/About.java +++ b/app/src/main/java/ru/vtosters/lite/utils/About.java @@ -48,6 +48,6 @@ public class About { } public static String getAppVersion() { - return getApplicationName() + " " + (isValidSignature() ? VERSIONNAME : "Dev") + " | " + getBuildNumber(); + return getApplicationName() + " " + getBuildName() + " | " + getBuildNumber(); } } 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 79d145470..368e0b273 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -8,6 +8,7 @@ import android.os.Build; import android.os.StrictMode; import com.vtosters.lite.data.Users; import com.vtosters.lite.fragments.SettingsListFragment; +import ru.vtosters.lite.BuildConfig; import ru.vtosters.lite.ui.fragments.VTSettings; import java.security.NoSuchAlgorithmException; @@ -21,7 +22,6 @@ import static ru.vtosters.lite.utils.VTVerifications.isPrometheus; import static ru.vtosters.lite.utils.VTVerifications.isVerified; public class Preferences { - public static String VERSIONNAME = "Beta"; public static void init(Application application) throws Exception { StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build(); @@ -36,6 +36,9 @@ public class Preferences { AnalyticsHelper.start(application); } // VK Init + public static String getBuildName() { + return BuildConfig.BUILD_TYPE.substring(0,1).toUpperCase() + BuildConfig.BUILD_TYPE.substring(1).toLowerCase(); + } public static SharedPreferences getPreferences() { return getGlobalContext().getSharedPreferences("com.vtosters.lite_preferences", Context.MODE_PRIVATE); } @@ -140,12 +143,14 @@ public class Preferences { return true; } + @SuppressWarnings("ConstantConditions") public static boolean dev() { - return getBoolValue("dev", false); + return getBoolValue("dev", false) || BuildConfig.BUILD_TYPE.equals("dev"); } + @SuppressWarnings("ConstantConditions") public static boolean devmenu() { - return getBoolValue("devmenu", false); + return getBoolValue("devmenu", false) || !BuildConfig.BUILD_TYPE.equals("release"); } public static boolean dnr() { @@ -285,8 +290,9 @@ public class Preferences { return getBoolValue("screenshotdetect", true); } + @SuppressWarnings("ConstantConditions") public static boolean checkupdates() { - return !getBoolValue("isRoamingState", false) && isValidSignature() && (!dev() || getBoolValue("autoupdates", true)); + return !getBoolValue("isRoamingState", false) && isValidSignature() && BuildConfig.BUILD_TYPE.equals("release"); } public static boolean isNewBuild() {