From dfea178a7b441d3f74cdb653443a52c944f676b9 Mon Sep 17 00:00:00 2001 From: bidetofevil Date: Wed, 15 Jan 2025 13:39:04 -0800 Subject: [PATCH] Restore public visibility of classes containing swazzled code --- .../WebViewChromeClientSwazzledHooks.java | 2 +- embrace-android-sdk/api/embrace-android-sdk.api | 15 +++++++++++++++ .../android/embracesdk/ViewSwazzledHooks.java | 2 +- .../embracesdk/WebViewClientSwazzledHooks.java | 10 ++++++---- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/embrace-android-core/src/main/java/io/embrace/android/embracesdk/WebViewChromeClientSwazzledHooks.java b/embrace-android-core/src/main/java/io/embrace/android/embracesdk/WebViewChromeClientSwazzledHooks.java index 5920c87b10..9aff948182 100644 --- a/embrace-android-core/src/main/java/io/embrace/android/embracesdk/WebViewChromeClientSwazzledHooks.java +++ b/embrace-android-core/src/main/java/io/embrace/android/embracesdk/WebViewChromeClientSwazzledHooks.java @@ -10,7 +10,7 @@ * @hide */ @InternalApi -final class WebViewChromeClientSwazzledHooks { +public final class WebViewChromeClientSwazzledHooks { private WebViewChromeClientSwazzledHooks() { } diff --git a/embrace-android-sdk/api/embrace-android-sdk.api b/embrace-android-sdk/api/embrace-android-sdk.api index d686db99b4..6b279ca27d 100644 --- a/embrace-android-sdk/api/embrace-android-sdk.api +++ b/embrace-android-sdk/api/embrace-android-sdk.api @@ -72,3 +72,18 @@ public final class io/embrace/android/embracesdk/Embrace$Companion { public final fun getInstance ()Lio/embrace/android/embracesdk/Embrace; } +public final class io/embrace/android/embracesdk/ViewSwazzledHooks { +} + +public final class io/embrace/android/embracesdk/ViewSwazzledHooks$OnClickListener { + public static fun _preOnClick (Landroid/view/View$OnClickListener;Landroid/view/View;)V +} + +public final class io/embrace/android/embracesdk/ViewSwazzledHooks$OnLongClickListener { + public static fun _preOnLongClick (Landroid/view/View$OnLongClickListener;Landroid/view/View;)V +} + +public final class io/embrace/android/embracesdk/WebViewClientSwazzledHooks { + public static fun _preOnPageStarted (Landroid/webkit/WebView;Ljava/lang/String;Landroid/graphics/Bitmap;)V +} + diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/ViewSwazzledHooks.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/ViewSwazzledHooks.java index 51155368d5..89da057a41 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/ViewSwazzledHooks.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/ViewSwazzledHooks.java @@ -11,7 +11,7 @@ * @hide */ @InternalApi -final class ViewSwazzledHooks { +public final class ViewSwazzledHooks { private static final String UNKNOWN_ELEMENT_NAME = "Unknown element"; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/WebViewClientSwazzledHooks.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/WebViewClientSwazzledHooks.java index 2965af94da..a7b03c00a5 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/WebViewClientSwazzledHooks.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/WebViewClientSwazzledHooks.java @@ -1,20 +1,22 @@ package io.embrace.android.embracesdk; +import androidx.annotation.Nullable; + import io.embrace.android.embracesdk.annotation.InternalApi; /** * @hide */ @InternalApi -final class WebViewClientSwazzledHooks { +public final class WebViewClientSwazzledHooks { private WebViewClientSwazzledHooks() { } @SuppressWarnings("MethodNameCheck") - public static void _preOnPageStarted(android.webkit.WebView view, - java.lang.String url, - android.graphics.Bitmap favicon) { + public static void _preOnPageStarted(@Nullable android.webkit.WebView view, + @Nullable java.lang.String url, + @Nullable android.graphics.Bitmap favicon) { Embrace.getInstance().logWebView(url); } }