release build: v04.02.01

fix: GM_setUserAgent issue: the Preference was saved, but not immediately applied.
warren-bank · Dec 7, 2023 · 873c5f4 · 873c5f4
1 parent e02915d
commit 873c5f4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/android-studio-project/WebMonkey/src/main/java/com/github/warren_bank/webmonkey/WmJsApi.java b/android-studio-project/WebMonkey/src/main/java/com/github/warren_bank/webmonkey/WmJsApi.java
@@ -337,7 +337,12 @@ public void setUserAgent(String scriptName, String scriptNamespace, String secre
         if (!grant(scriptName, scriptNamespace, "GM_setUserAgent")) {
           return;
         }
-        SettingsUtils.setUserAgent(/* Context */ WmJsApi.this.activity, value);
+        SettingsUtils.setUserAgent(/* Context */ WmJsApi.this.activity, value, /* updateWebViewSettings */ false);
+        activity.runOnUiThread(new Runnable() {
+          public void run() {
+            WebViewSettingsMgr.updateUserAgent();
+          }
+        });
       }
 
       @JavascriptInterface

diff --git a/...ject/WebMonkey/src/main/java/com/github/warren_bank/webmonkey/settings/SettingsUtils.java b/...ject/WebMonkey/src/main/java/com/github/warren_bank/webmonkey/settings/SettingsUtils.java
@@ -103,6 +103,10 @@ private static String getCustomHomePage(Context context, SharedPreferences prefs
   // --------------------
 
   public static void setUserAgent(Context context, String value) {
+    setUserAgent(context, value, true);
+  }
+
+  public static void setUserAgent(Context context, String value, boolean updateWebViewSettings) {
     SharedPreferences.Editor editor = getPrefsEditor(context);
     String pref_key   = null;
     String pref_value = null;
@@ -116,38 +120,33 @@ public static void setUserAgent(Context context, String value) {
       pref_value = context.getString(R.string.pref_useragent_array_values_1);
 
       editor.putString(pref_key, pref_value);
-
-      editor.commit();
-      return;
     }
 
     // Chrome desktop
-    if (value.toLowerCase().equals("chrome")) {
+    else if (value.toLowerCase().equals("chrome")) {
       pref_key   = context.getString(R.string.pref_useragent_key);
       pref_value = context.getString(R.string.pref_useragent_array_values_2);
 
       editor.putString(pref_key, pref_value);
-
-      editor.commit();
-      return;
     }
 
     // Custom URL
-    {
+    else {
       pref_key   = context.getString(R.string.pref_useragent_key);
       pref_value = context.getString(R.string.pref_useragent_array_values_3);
 
       editor.putString(pref_key, pref_value);
-    }
-    {
+
       pref_key   = context.getString(R.string.pref_custom_useragent_key);
       pref_value = value;
 
       editor.putString(pref_key, pref_value);
-
-      editor.commit();
-      return;
     }
+
+    editor.commit();
+
+    if (updateWebViewSettings)
+      WebViewSettingsMgr.updateUserAgent();
   }
 
   public static String getUserAgent(Context context) {

diff --git a/android-studio-project/constants.gradle b/android-studio-project/constants.gradle
@@ -1,6 +1,6 @@
 project.ext {
-    releaseVersionCode  = Integer.parseInt("004020011", 10)  //Integer.MAX_VALUE == 2147483647
-    releaseVersion      = '004.02.00-11API'
+    releaseVersionCode  = Integer.parseInt("004020111", 10)  //Integer.MAX_VALUE == 2147483647
+    releaseVersion      = '004.02.01-11API'
     javaVersion         = JavaVersion.VERSION_1_8
     minSdkVersion       = 11
     targetSdkVersion    = 33