Conscrypt settings not applied fix

Author: yuliskov

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/GeneralSettingsPresenter.java

@@ -23,6 +23,7 @@
 import com.liskovsoft.smartyoutubetv2.common.prefs.AppPrefs;
 import com.liskovsoft.smartyoutubetv2.common.prefs.GeneralData;
 import com.liskovsoft.smartyoutubetv2.common.prefs.MainUIData;
+import com.liskovsoft.smartyoutubetv2.common.prefs.NetworkData;
 import com.liskovsoft.smartyoutubetv2.common.prefs.PlayerData;
 import com.liskovsoft.smartyoutubetv2.common.prefs.PlayerTweaksData;
 import com.liskovsoft.smartyoutubetv2.common.prefs.SearchData;
@@ -45,6 +46,7 @@ public class GeneralSettingsPresenter extends BasePresenter<Void> {
     private final PlayerTweaksData mPlayerTweaksData;
     private final MainUIData mMainUIData;
     private final MediaServiceData mMediaServiceData;
+    private final NetworkData mNetworkData;
     private final SidebarService mSidebarService;
     private boolean mRestartApp;
     private final Runnable mOnFinish = () -> {
@@ -61,6 +63,7 @@ private GeneralSettingsPresenter(Context context) {
         mPlayerTweaksData = PlayerTweaksData.instance(context);
         mMainUIData = MainUIData.instance(context);
         mMediaServiceData = MediaServiceData.instance();
+        mNetworkData = NetworkData.instance(context);
         mSidebarService = SidebarService.instance(context);
     }
 
@@ -658,10 +661,10 @@ private void appendConscrypt(AppDialogPresenter settingsPresenter, List<OptionIt
         options.add(UiOptionItem.from(getContext().getString(R.string.enable_conscrypt),
                 getContext().getString(R.string.enable_conscrypt_desc),
                 option -> {
-                    mGeneralData.setConscryptEnabled(option.isSelected());
+                    mNetworkData.setConscryptEnabled(option.isSelected());
                     mRestartApp = true;
                 },
-                mGeneralData.isConscryptEnabled()));
+                mNetworkData.isConscryptEnabled()));
     }
 
     private void enableChildMode(boolean enable) {

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/GeneralData.java

@@ -86,7 +86,6 @@ public class GeneralData implements ProfileChangeListener {
     private int mLocalDriveBackupFreqDays;
     private List<Video> mOldPinnedItems;
     private boolean mIsRemapSToSpeedToggleEnabled;
-    private boolean mIsConscryptEnabled;
     private final Runnable mPersistStateInt = this::persistStateInt;
 
     private GeneralData(Context context) {
@@ -576,15 +575,6 @@ public void setChannelUpDownAction(int action) {
         persistState();
     }
 
-    public boolean isConscryptEnabled() {
-        return mIsConscryptEnabled;
-    }
-
-    public void setConscryptEnabled(boolean enable) {
-        mIsConscryptEnabled = enable;
-        persistState();
-    }
-
     /**
      * Fixed ConcurrentModificationException after onProfileChanged()<br/>
      * Happened inside cleanupPinnedItems()
@@ -670,7 +660,6 @@ private synchronized void restoreState() {
         mLocalDriveBackupFreqDays = Helpers.parseInt(split, 70, 1);
         //mIsRemapFastForwardToSpeedToggleEnabled = Helpers.parseBoolean(split, 71, false);
         mIsRemapSToSpeedToggleEnabled = Helpers.parseBoolean(split, 72, true);
-        mIsConscryptEnabled = Helpers.parseBoolean(split, 73, false);
     }
 
     public void persistNow() {
@@ -696,7 +685,7 @@ private void persistStateInt() {
                 mIsHideWatchedFromNotificationsEnabled, mChangelog, mPlayerExitShortcut, null, mIsFullscreenModeEnabled, null,
                 mIsRememberPinnedPositionEnabled, mSelectedItems, mIsFirstUseTooltipEnabled, mIsDeviceSpecificBackupEnabled, null,
                 null, mSearchExitShortcut, mGDriveBackupFreqDays, mLocalDriveBackupFreqDays, null,
-                mIsRemapSToSpeedToggleEnabled, mIsConscryptEnabled));
+                mIsRemapSToSpeedToggleEnabled));
     }
 
     @Override

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/NetworkData.java

@@ -0,0 +1,29 @@
+package com.liskovsoft.smartyoutubetv2.common.prefs;
+
+import android.content.Context;
+
+import com.liskovsoft.smartyoutubetv2.common.prefs.common.DataSaverBase;
+
+public class NetworkData extends DataSaverBase {
+    private static NetworkData sInstance;
+
+    private NetworkData(Context context) {
+        super(context);
+    }
+
+    public static NetworkData instance(Context context) {
+        if (sInstance == null) {
+            sInstance = new NetworkData(context);
+        }
+
+        return sInstance;
+    }
+
+    public boolean isConscryptEnabled() {
+        return getBoolean(0, false);
+    }
+
+    public void setConscryptEnabled(boolean enable) {
+        setBoolean(0, enable);
+    }
+}

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/common/DataSaverBase.java

@@ -92,6 +92,10 @@ private void restoreState() {
         }
     }
 
+    public void persistNow() {
+        Utils.post(mPersistStateInt);
+    }
+
     private void persistState() {
         onDataChange();
         Utils.postDelayed(mPersistStateInt, 10_000);

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/utils/Utils.java

@@ -88,6 +88,7 @@
 import com.liskovsoft.smartyoutubetv2.common.prefs.GeneralData;
 import com.liskovsoft.smartyoutubetv2.common.prefs.HiddenPrefs;
 import com.liskovsoft.smartyoutubetv2.common.prefs.MainUIData;
+import com.liskovsoft.smartyoutubetv2.common.prefs.NetworkData;
 import com.liskovsoft.smartyoutubetv2.common.prefs.PlayerData;
 import com.liskovsoft.smartyoutubetv2.common.prefs.PlayerTweaksData;
 import com.liskovsoft.smartyoutubetv2.common.prefs.RemoteControlData;
@@ -1302,5 +1303,6 @@ private static void persistData(Context context) {
         MediaServiceData mediaServiceData = MediaServiceData.instance();
         mediaServiceData.persistNow();
         BlockedChannelData.instance(context).persistNow();
+        NetworkData.instance(context).persistNow();
     }
 }

smarttubetv/build.gradle

@@ -57,8 +57,8 @@ android {
         applicationId "app.smarttube"
         minSdkVersion project.properties.minSdkVersion
         targetSdkVersion project.properties.targetSdkVersion
-        versionCode 2376
-        versionName "31.86"
+        versionCode 2377
+        versionName "31.87"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
 

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/main/MainApplication.java

@@ -17,6 +17,7 @@
 import com.liskovsoft.smartyoutubetv2.common.app.views.ViewManager;
 import com.liskovsoft.smartyoutubetv2.common.app.views.WebBrowserView;
 import com.liskovsoft.smartyoutubetv2.common.prefs.GeneralData;
+import com.liskovsoft.smartyoutubetv2.common.prefs.NetworkData;
 import com.liskovsoft.smartyoutubetv2.common.prefs.PlayerData;
 import com.liskovsoft.smartyoutubetv2.common.prefs.PlayerTweaksData;
 import com.liskovsoft.smartyoutubetv2.tv.ui.adddevice.AddDeviceActivity;
@@ -58,7 +59,7 @@ public void onCreate() {
         //if (Build.VERSION.SDK_INT < 29 && Conscrypt.isAvailable()) {
         //    Security.insertProviderAt(Conscrypt.newProvider(), 1);
         //}
-        if (GeneralData.instance(getApplicationContext()).isConscryptEnabled() && Conscrypt.isAvailable()) {
+        if (NetworkData.instance(getApplicationContext()).isConscryptEnabled() && Conscrypt.isAvailable()) {
             Security.insertProviderAt(Conscrypt.newProvider(), 1);
         }