From 7036c3e6133836d978560a853d0d0de5607e32ad Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Wed, 8 Jun 2022 19:32:29 +0300
Subject: [PATCH] some fixes

---
 app/src/main/java/ru/vtosters/lite/utils/Preferences.java | 2 +-
 app/src/main/java/ru/vtosters/lite/utils/SSFS.java        | 7 +++----
 smali/res/values-ru/strings.xml                           | 2 ++
 smali/res/values/strings.xml                              | 2 ++
 smali/res/xml/preferences_debug.xml                       | 5 +++++
 smali/res/xml/preferences_messages.xml                    | 7 +------
 6 files changed, 14 insertions(+), 11 deletions(-)

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 dddabbaeb..7acab9f94 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
@@ -127,7 +127,7 @@ public class Preferences {
     }
 
     public static boolean calls() {
-        return getBoolValue("calls", true);
+        return getBoolValue("calls", false);
     }
 
     public static boolean convUsersOnline() {
diff --git a/app/src/main/java/ru/vtosters/lite/utils/SSFS.java b/app/src/main/java/ru/vtosters/lite/utils/SSFS.java
index 2d09ed7e2..f48e9b65a 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/SSFS.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/SSFS.java
@@ -8,8 +8,7 @@ import static ru.vtosters.lite.utils.Preferences.dev;
 import static ru.vtosters.lite.utils.Preferences.getLocale;
 import static ru.vtosters.lite.utils.Preferences.vksans;
 import static ru.vtosters.lite.utils.Proxy.proxy;
-
-import com.vk.core.ui.themes.VKThemeHelper;
+import static ru.vtosters.lite.utils.Themes.isDarkTheme;
 
 public class SSFS {
     public static String getSSFSLink() {
@@ -25,11 +24,11 @@ public class SSFS {
     }
 
     public static String getDarkVKUI() {
-        return !VKThemeHelper.d() ? "1" : "0";
+        return isDarkTheme() ? "1" : "0";
     }
 
     public static String getAmoledVKUI() {
-        return getPrefsValue("darktheme").equals("amoled") ? "1" : "0";
+        return getPrefsValue("darktheme").equals("amoled") && isDarkTheme() ? "1" : "0";
     }
 
     public static String getUserProxy() {
diff --git a/smali/res/values-ru/strings.xml b/smali/res/values-ru/strings.xml
index 08fee05b2..26a1e2457 100644
--- a/smali/res/values-ru/strings.xml
+++ b/smali/res/values-ru/strings.xml
@@ -4437,5 +4437,7 @@
 
     <string name="videodownloaderr">Данное видео невозможно скачать</string>
 
+    <string name="roundedmsgs">Круглые сообщения</string>
+
     <string name="empty_text" />
 </resources>
diff --git a/smali/res/values/strings.xml b/smali/res/values/strings.xml
index dfde737bb..e69a0e75d 100644
--- a/smali/res/values/strings.xml
+++ b/smali/res/values/strings.xml
@@ -4571,6 +4571,8 @@ May look like a fake leaving the online"</string>
 
     <string name="videodownloaderr">This video cannot be downloaded</string>
 
+    <string name="roundedmsgs">Rounded messages</string>
+
     <item type="string" name="APKTOOL_DUMMY_10be" />
     <item type="string" name="APKTOOL_DUMMY_10bf" />
     <item type="string" name="APKTOOL_DUMMY_10c0" />
diff --git a/smali/res/xml/preferences_debug.xml b/smali/res/xml/preferences_debug.xml
index 54434df09..469e01364 100644
--- a/smali/res/xml/preferences_debug.xml
+++ b/smali/res/xml/preferences_debug.xml
@@ -15,6 +15,11 @@
             android:key="msgtails"
             android:summary="@string/messages_interface_tails_summary"
             android:title="@string/vtlmsgtails" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="calls"
+            android:summary="@string/messages_interface_calls_summary"
+            android:title="@string/vtlcalls" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
             android:key="usevkui"
diff --git a/smali/res/xml/preferences_messages.xml b/smali/res/xml/preferences_messages.xml
index 0a79a41ef..eaa566f6a 100644
--- a/smali/res/xml/preferences_messages.xml
+++ b/smali/res/xml/preferences_messages.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/vtlinterfacemsg">
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="calls"
-            android:summary="@string/messages_interface_calls_summary"
-            android:title="@string/vtlcalls" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
             android:key="voice"
@@ -14,7 +9,7 @@
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
             android:key="roundedmsgs"
-            android:title="Круглые сообщения" />
+            android:title="@string/roundedmsgs" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/interfaceemoji">