From 1ec2e1dd4b79a29937ee74b33f9826a903e2953a Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Wed, 22 Jun 2022 23:21:02 +0300 Subject: [PATCH] fixed some settings --- .../lite/ui/fragments/VTSettings.java | 22 ++++++------------- .../java/ru/vtosters/lite/utils/Globals.java | 6 +++-- .../ru/vtosters/lite/utils/Preferences.java | 10 +-------- 3 files changed, 12 insertions(+), 26 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 21fe45620..9b9cc6c68 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 @@ -5,11 +5,9 @@ import static ru.vtosters.lite.f0x1d.VTVerifications.vtverif; import static ru.vtosters.lite.utils.About.getBuildNumber; import static ru.vtosters.lite.utils.About.getCommitLink; import static ru.vtosters.lite.utils.CacheUtils.humanReadableByteCountBin; -import static ru.vtosters.lite.utils.Globals.drawableFromUrl; import static ru.vtosters.lite.utils.Globals.edit; import static ru.vtosters.lite.utils.Globals.getIdentifier; import static ru.vtosters.lite.utils.Globals.getPrefsValue; -import static ru.vtosters.lite.utils.Globals.getUserId; import static ru.vtosters.lite.utils.Globals.isGmsInstalled; import static ru.vtosters.lite.utils.Preferences.ads; import static ru.vtosters.lite.utils.Preferences.devmenu; @@ -19,14 +17,11 @@ import static ru.vtosters.lite.utils.Preferences.isValidSignature; import static ru.vtosters.lite.utils.Preferences.navbar; import static ru.vtosters.lite.utils.Preferences.offline; import static ru.vtosters.lite.utils.Preferences.oldicons; -import static ru.vtosters.lite.utils.Preferences.preferences; import static ru.vtosters.lite.utils.Preferences.shortinfo; import static ru.vtosters.lite.utils.Preferences.vkme; -import static ru.vtosters.lite.utils.Themes.applyTheme; import static ru.vtosters.lite.utils.Themes.getDarkTheme; import static ru.vtosters.lite.utils.Themes.getLightTheme; import static ru.vtosters.lite.utils.Themes.setTheme; -import static ru.vtosters.lite.utils.VKUIInjector.isLoaded; import android.content.Context; import android.content.Intent; @@ -34,11 +29,10 @@ import android.content.SharedPreferences; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.webkit.WebView; import com.aefyr.tsg.g2.TelegramStickersService; import com.vk.about.AboutAppFragment; -import com.vk.identity.fragments.IdentityListFragment; +import com.vk.balance.BalanceFragment; import com.vk.navigation.Navigator; import com.vk.notifications.settings.NotificationsSettingsFragment; import com.vk.webapp.fragments.PrivacyFragment; @@ -207,14 +201,12 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { }); } - if (VKAccountManager.d().N0()) { - PreferencesUtil.addPreference(this, "", Globals.getString("identity_title"), "", oldicons() ? "ic_services_24" : "ic_services_outline_28", preference -> { - Context context = getContext(); - Intent a2 = new Navigator(IdentityListFragment.class).b(context); - context.startActivity(a2); - return false; - }); - } + PreferencesUtil.addPreference(this, "", Globals.getString("votes"), "", oldicons() ? "ic_coins_24" : "ic_coins_outline_28", preference -> { + Context context = getContext(); + Intent a2 = new Navigator(BalanceFragment.class).b(context); + context.startActivity(a2); + return false; + }); PreferencesUtil.addPreferenceCategory(this, Globals.getString("vtsettmod")); 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 d871bafc5..3c055e304 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Globals.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Globals.java @@ -1,11 +1,11 @@ package ru.vtosters.lite.utils; import static androidx.core.content.ContextCompat.getDrawable; +import static ru.vtosters.lite.utils.CacheUtils.getInstance; 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; -import static ru.vtosters.lite.utils.Themes.systemThemeChanger; import android.app.Activity; import android.app.Application; @@ -50,6 +50,7 @@ import java.net.URLConnection; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.Objects; import ru.vtosters.lite.ui.dialogs.DisableBattery; import ru.vtosters.lite.ui.dialogs.InstallGMS; @@ -71,11 +72,12 @@ public class Globals { InstallGMS.alert(activity); DisableBattery.alert(activity); edit().putBoolean("isdark", isDarkTheme()).commit(); + getInstance().autoCleaningCache(); // VKIDProtection.alert(activity); } public static void componentSwitcher(String component, Boolean enabled) { - var packageManager = getContext().getPackageManager(); + var packageManager = Objects.requireNonNull(getContext()).getPackageManager(); packageManager.setComponentEnabledSetting(new ComponentName(getPackageName(), getPackageName() + "." + component), enabled? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); } // Component switcher for changing app icon 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 e7424225b..5c6ffb9e4 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -186,7 +186,7 @@ public class Preferences { } public static boolean dev() { - return true; // getBoolValue("dev", false); + return getBoolValue("dev", false); } public static boolean devmenu() { @@ -469,14 +469,6 @@ public class Preferences { return origquality; } - public static String nullOnline() { - return getString("onlineNull"); - } - - public static boolean isOnlineNull(int status) { - return status == 0; - } - @SuppressLint("SimpleDateFormat") public static SimpleDateFormat setDateFormat() { return new SimpleDateFormat(getDateFormat());