From ff10391c30f4874ac6b7132043ccf2b8371c90ed Mon Sep 17 00:00:00 2001 From: davinci9196 Date: Thu, 16 Jan 2025 16:27:11 +0800 Subject: [PATCH 1/3] Fixed an issue that could cause the app to crash --- .../gms/ads/dynamite/ModuleDescriptor.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/play-services-ads/core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/ads/dynamite/ModuleDescriptor.java b/play-services-ads/core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/ads/dynamite/ModuleDescriptor.java index f147bc76dd..fa27e07648 100644 --- a/play-services-ads/core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/ads/dynamite/ModuleDescriptor.java +++ b/play-services-ads/core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/ads/dynamite/ModuleDescriptor.java @@ -7,11 +7,16 @@ import android.content.Context; import android.content.ContextWrapper; +import android.os.Build; +import android.util.Log; import android.webkit.WebSettings; import androidx.annotation.Keep; +import java.io.File; + @Keep public class ModuleDescriptor { + private static final String TAG = "ModuleDescriptor"; public static final String MODULE_ID = "com.google.android.gms.ads.dynamite"; public static final int MODULE_VERSION = 230500001; @@ -26,6 +31,14 @@ public static void init(Context context) { if (context instanceof ContextWrapper) { context = ((ContextWrapper) context).getBaseContext(); } - WebSettings.getDefaultUserAgent(context); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + File webViewDataDir = new File(context.getDataDir(), "app_webview"); + if (webViewDataDir.exists()) { + Log.d(TAG, "WebView data directory is initialized"); + WebSettings.getDefaultUserAgent(context); + } else { + Log.d(TAG, "WebView data directory is not initialized."); + } + } } } From 3b83367c57b55f908909981a4e3269774e010613 Mon Sep 17 00:00:00 2001 From: davinci9196 Date: Thu, 16 Jan 2025 17:38:43 +0800 Subject: [PATCH 2/3] changed --- .../gms/ads/dynamite/ModuleDescriptor.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/play-services-ads/core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/ads/dynamite/ModuleDescriptor.java b/play-services-ads/core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/ads/dynamite/ModuleDescriptor.java index fa27e07648..28d950e250 100644 --- a/play-services-ads/core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/ads/dynamite/ModuleDescriptor.java +++ b/play-services-ads/core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/ads/dynamite/ModuleDescriptor.java @@ -8,15 +8,13 @@ import android.content.Context; import android.content.ContextWrapper; import android.os.Build; -import android.util.Log; import android.webkit.WebSettings; -import androidx.annotation.Keep; +import android.webkit.WebView; -import java.io.File; +import androidx.annotation.Keep; @Keep public class ModuleDescriptor { - private static final String TAG = "ModuleDescriptor"; public static final String MODULE_ID = "com.google.android.gms.ads.dynamite"; public static final int MODULE_VERSION = 230500001; @@ -31,14 +29,12 @@ public static void init(Context context) { if (context instanceof ContextWrapper) { context = ((ContextWrapper) context).getBaseContext(); } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - File webViewDataDir = new File(context.getDataDir(), "app_webview"); - if (webViewDataDir.exists()) { - Log.d(TAG, "WebView data directory is initialized"); - WebSettings.getDefaultUserAgent(context); - } else { - Log.d(TAG, "WebView data directory is not initialized."); - } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + try { + WebView.setDataDirectorySuffix(context.getPackageName()); + return; + } catch (Exception ignored) {} } + WebSettings.getDefaultUserAgent(context); } } From ceceb2dad59e48ad30fceb40a0f9cc0055add8d6 Mon Sep 17 00:00:00 2001 From: davinci9196 Date: Tue, 1 Apr 2025 09:48:53 +0800 Subject: [PATCH 3/3] clean --- .../com/google/android/gms/ads/dynamite/ModuleDescriptor.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/play-services-ads/core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/ads/dynamite/ModuleDescriptor.java b/play-services-ads/core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/ads/dynamite/ModuleDescriptor.java index 28d950e250..89c5b8bd09 100644 --- a/play-services-ads/core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/ads/dynamite/ModuleDescriptor.java +++ b/play-services-ads/core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/ads/dynamite/ModuleDescriptor.java @@ -7,7 +7,6 @@ import android.content.Context; import android.content.ContextWrapper; -import android.os.Build; import android.webkit.WebSettings; import android.webkit.WebView; @@ -29,7 +28,7 @@ public static void init(Context context) { if (context instanceof ContextWrapper) { context = ((ContextWrapper) context).getBaseContext(); } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + if (android.os.Build.VERSION.SDK_INT >= 28) { try { WebView.setDataDirectorySuffix(context.getPackageName()); return;