From 92f43acb801597b7b06acccd6415fce394f42f8d Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Thu, 16 Jun 2022 09:12:39 +0300
Subject: [PATCH] fix

---
 .../lite/ui/fragments/VTSettings.java         | 44 ++++++++-----------
 .../ru/vtosters/lite/utils/Preferences.java   | 13 +++++-
 .../vtosters/lite/utils/SignatureChecker.java |  2 +-
 3 files changed, 31 insertions(+), 28 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 1eab2ecc0..533bc919c 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
@@ -21,11 +21,11 @@ import static ru.vtosters.lite.utils.Preferences.ads;
 import static ru.vtosters.lite.utils.Preferences.devmenu;
 import static ru.vtosters.lite.utils.Preferences.disableSettingsSumms;
 import static ru.vtosters.lite.utils.Preferences.hasSpecialVerif;
+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.shortinfo;
 import static ru.vtosters.lite.utils.Preferences.vkme;
-import static ru.vtosters.lite.utils.SignatureChecker.validateAppSignature;
 import static ru.vtosters.lite.utils.Themes.applyTheme;
 import static ru.vtosters.lite.utils.Themes.getDarkTheme;
 import static ru.vtosters.lite.utils.Themes.getImDarkTheme;
@@ -35,7 +35,6 @@ import static ru.vtosters.lite.utils.Themes.setTheme;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -57,8 +56,6 @@ import com.vtosters.lite.fragments.SettingsGeneralFragment;
 import com.vtosters.lite.fragments.k.BlacklistFragment;
 import com.vtosters.lite.fragments.money.music.control.subscription.MusicSubscriptionControlFragment;
 
-import java.security.NoSuchAlgorithmException;
-
 import ru.vtosters.lite.ui.PreferencesUtil;
 import ru.vtosters.lite.ui.dialogs.OTADialog;
 import ru.vtosters.lite.ui.fragments.dockbar.DockBarFragment;
@@ -260,12 +257,13 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
                 return false;
             });
 
-            PreferencesUtil.addPreference(this, "", getString("vtlmusic"), musicsumm, "ic_music_24", preference -> {
-                Context context = getContext();
-                Intent a2 = new Navigator(MusicFragment.class).a(context);
-                context.startActivity(a2);
-                return false;
-            });
+            if (isValidSignature())
+                PreferencesUtil.addPreference(this, "", getString("vtlmusic"), musicsumm, "ic_music_24", preference -> {
+                    Context context = getContext();
+                    Intent a2 = new Navigator(MusicFragment.class).a(context);
+                    context.startActivity(a2);
+                    return false;
+                });
         }
 
         PreferencesUtil.addPreference(this, "", getString("vtlmessages"), msgsumm, "ic_message_24", preference -> {
@@ -341,25 +339,21 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
             return false;
         });
 
-        try {
-            if (validateAppSignature()) {
-                PreferencesUtil.addPreferenceCategory(this, getString("updates"));
+        if (isValidSignature()) {
+            PreferencesUtil.addPreferenceCategory(this, getString("updates"));
 
-                PreferencesUtil.addPreference(this, "", getString("checkforupdates"), "", "ic_download_24", preference -> {
-                    OTADialog.checkUpdates(p());
-                    return false;
-                });
+            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;
+            PreferencesUtil.addMaterialSwitchPreference(this, "checkupdates", getString("checkupdates"), "", "ic_recent_24", true, (preference, o) -> {
+                boolean value = (boolean) o;
 
-                    edit().putBoolean("checkupdates", value).commit();
+                edit().putBoolean("checkupdates", value).commit();
 
-                    return true;
-                });
-            }
-        } catch (PackageManager.NameNotFoundException | NoSuchAlgorithmException e) {
-            e.printStackTrace();
+                return true;
+            });
         }
     }
 
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 826bc6009..16fb31579 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
@@ -364,14 +364,23 @@ public class Preferences {
         return getBoolValue("roundedmsgs", false);
     }
 
-    public static boolean checkupdates() throws PackageManager.NameNotFoundException, NoSuchAlgorithmException{
-        return getBoolValue("checkupdates", true) && validateAppSignature();
+    public static boolean checkupdates() {
+        return getBoolValue("checkupdates", true) && isValidSignature();
     }
 
     public static boolean disableanimstickers() {
         return getBoolValue("disableanimstickers", true);
     }
 
+    public static boolean isValidSignature() {
+        try {
+            return validateAppSignature();
+        } catch (PackageManager.NameNotFoundException | NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
     public static boolean disableSettingsSumms() {
         return getBoolValue("disableSettingsSumms", false);
     }
diff --git a/app/src/main/java/ru/vtosters/lite/utils/SignatureChecker.java b/app/src/main/java/ru/vtosters/lite/utils/SignatureChecker.java
index 4884b4714..fddde50fe 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/SignatureChecker.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/SignatureChecker.java
@@ -43,5 +43,5 @@ public class SignatureChecker {
             return decode(APP_SIGNATURE).equals(sha1);
         }
         return false;
-    }
+    } // Sig check to detect actions builds and etc
 }