fix: calling webView.loadUrl on destroyed WebView (#136)

hCaptcha · Dec 14, 2023 · a6026df · a6026df
1 parent 9fb60fa
commit a6026df
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 12 deletions.
diff --git a/benchmark/src/androidTest/java/com/hcaptcha/sdk/HCaptchaWebViewHelperTest.java b/benchmark/src/androidTest/java/com/hcaptcha/sdk/HCaptchaWebViewHelperTest.java
@@ -4,7 +4,6 @@
 
 import android.os.Handler;
 import android.os.Looper;
-import android.webkit.WebView;
 
 import androidx.benchmark.BenchmarkState;
 import androidx.benchmark.junit4.BenchmarkRule;
@@ -44,7 +43,7 @@ public void benchmarkWebViewLoad() {
             final CountDownLatch latch = new CountDownLatch(1);
             try {
                 rule.getScenario().onActivity(activity -> {
-                    WebView webView = new WebView(activity);
+                    HCaptchaWebView webView = new HCaptchaWebView(activity);
                     state.resumeTiming();
                     new HCaptchaWebViewHelper(
                             handler,

diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -49,7 +49,6 @@ android {
     }
 
     testOptions {
-        animationsDisabled = true
         unitTests {
             returnDefaultValues = true
             includeAndroidResources = true

diff --git a/sdk/src/main/java/com/hcaptcha/sdk/HCaptchaHeadlessWebView.java b/sdk/src/main/java/com/hcaptcha/sdk/HCaptchaHeadlessWebView.java
@@ -32,7 +32,7 @@ final class HCaptchaHeadlessWebView implements IHCaptchaVerifier {
         HCaptchaLog.d("HeadlessWebView.init");
         this.config = config;
         this.listener = listener;
-        final WebView webView = new HCaptchaWebView(activity);
+        final HCaptchaWebView webView = new HCaptchaWebView(activity);
         webView.setId(R.id.webView);
         webView.setVisibility(View.GONE);
         if (webView.getParent() == null) {

diff --git a/sdk/src/main/java/com/hcaptcha/sdk/HCaptchaWebView.java b/sdk/src/main/java/com/hcaptcha/sdk/HCaptchaWebView.java
@@ -46,4 +46,8 @@ public boolean onCheckIsTextEditor() {
     public boolean performClick() {
         return false;
     }
+
+    public boolean isDestroyed() {
+        return getParent() == null;
+    }
 }
diff --git a/sdk/src/main/java/com/hcaptcha/sdk/HCaptchaWebViewHelper.java b/sdk/src/main/java/com/hcaptcha/sdk/HCaptchaWebViewHelper.java
@@ -39,7 +39,7 @@ final class HCaptchaWebViewHelper {
 
     @Getter
     @NonNull
-    private final WebView webView;
+    private final HCaptchaWebView webView;
 
     @NonNull
     private final IHCaptchaHtmlProvider htmlProvider;
@@ -50,7 +50,7 @@ final class HCaptchaWebViewHelper {
                           @NonNull final HCaptchaInternalConfig internalConfig,
                           @NonNull final IHCaptchaVerifier captchaVerifier,
                           @NonNull final HCaptchaStateListener listener,
-                          @NonNull final WebView webView) {
+                          @NonNull final HCaptchaWebView webView) {
         this.context = context;
         this.config = config;
         this.captchaVerifier = captchaVerifier;
@@ -113,7 +113,11 @@ void resetAndExecute() {
     }
 
     void reset() {
-        webView.loadUrl("javascript:reset();");
+        if (webView.isDestroyed()) {
+            HCaptchaLog.w("WebView is destroyed already");
+        } else {
+            webView.loadUrl("javascript:reset();");
+        }
     }
 
     public boolean shouldRetry(HCaptchaException exception) {

diff --git a/sdk/src/test/java/com/hcaptcha/sdk/HCaptchaWebViewHelperTest.java b/sdk/src/test/java/com/hcaptcha/sdk/HCaptchaWebViewHelperTest.java
@@ -15,7 +15,6 @@
 import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.webkit.WebSettings;
-import android.webkit.WebView;
 
 import org.junit.After;
 import org.junit.Before;
@@ -46,7 +45,7 @@ public class HCaptchaWebViewHelperTest {
     HCaptchaStateListener stateListener;
 
     @Mock
-    WebView webView;
+    HCaptchaWebView webView;
 
     @Mock
     WebSettings webSettings;
@@ -64,7 +63,7 @@ public void init() {
         MockitoAnnotations.openMocks(this);
         androidLogMock = mockStatic(Log.class);
         stateListener = mock(HCaptchaStateListener.class);
-        webView = mock(WebView.class);
+        webView = mock(HCaptchaWebView.class);
         webSettings = mock(WebSettings.class);
         htmlProvider = mock(IHCaptchaHtmlProvider.class);
         when(htmlProvider.getHtml()).thenReturn(MOCK_HTML);

diff --git a/test/build.gradle b/test/build.gradle
@@ -32,6 +32,9 @@ android {
     }
 
     testBuildType = project.hasProperty("testingMinimizedBuild") ? "release" : "debug"
+    testOptions {
+        animationsDisabled = true
+    }
 }
 
 androidComponents {

diff --git a/test/src/androidTest/java/com/hcaptcha/sdk/HCaptchaWebViewHelperTest.java b/test/src/androidTest/java/com/hcaptcha/sdk/HCaptchaWebViewHelperTest.java
@@ -7,7 +7,6 @@
 
 import android.os.Handler;
 import android.os.Looper;
-import android.webkit.WebView;
 
 import androidx.test.core.app.ActivityScenario;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
@@ -63,7 +62,7 @@ void onFailure(HCaptchaException e) {
 
         final ActivityScenario<TestActivity> scenario = rule.getScenario();
         scenario.onActivity(activity -> {
-            WebView webView = new WebView(activity);
+            HCaptchaWebView webView = new HCaptchaWebView(activity);
             final HCaptchaWebViewHelper helper = new HCaptchaWebViewHelper(
                     handler, activity, config, internalConfig, verifier, listener, webView);
         });