Conscrypt option improvements

Author: yuliskov

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

@@ -8,7 +8,7 @@ public class NetworkData extends DataSaverBase {
     private static NetworkData sInstance;
 
     private NetworkData(Context context) {
-        super(context);
+        super(context, true);
     }
 
     public static NetworkData instance(Context context) {

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

@@ -12,6 +12,7 @@
 
 public abstract class DataSaverBase extends DataChangeBase {
     private final AppPrefs mAppPrefs;
+    private final boolean mPersistImmediately;
     private final String mDataKey;
     private final List<Object> mValues;
     private final Runnable mPersistStateInt = this::persistStateInt;
@@ -21,7 +22,12 @@ private interface Converter {
     }
 
     public DataSaverBase(Context context) {
+        this(context, false);
+    }
+
+    public DataSaverBase(Context context, boolean persistImmediately) {
         mAppPrefs = AppPrefs.instance(context);
+        mPersistImmediately = persistImmediately;
         mDataKey = this.getClass().getSimpleName();
         mValues = new ArrayList<>();
         restoreState();
@@ -98,7 +104,12 @@ public void persistNow() {
 
     private void persistState() {
         onDataChange();
-        Utils.postDelayed(mPersistStateInt, 10_000);
+
+        if (mPersistImmediately) {
+            Utils.post(mPersistStateInt);
+        } else {
+            Utils.postDelayed(mPersistStateInt, 10_000);
+        }
     }
 
     private void persistStateInt() {

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

@@ -1303,6 +1303,5 @@ 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 2378
-        versionName "31.88"
+        versionCode 2379
+        versionName "31.89"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
 

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

@@ -59,8 +59,12 @@ public void onCreate() {
         //if (Build.VERSION.SDK_INT < 29 && Conscrypt.isAvailable()) {
         //    Security.insertProviderAt(Conscrypt.newProvider(), 1);
         //}
-        if (NetworkData.instance(getApplicationContext()).isConscryptEnabled() && Conscrypt.isAvailable()) {
-            Security.insertProviderAt(Conscrypt.newProvider(), 1);
+        if (NetworkData.instance(this).isConscryptEnabled()) {
+            try {
+                Security.insertProviderAt(Conscrypt.newProvider(), 1);
+            } catch (Throwable e) {
+                // UnsatisfiedLinkError
+            }
         }
 
         setupGlobalExceptionHandler();