Import ShouldOverrideCallbackState for shorter lines and more clear isJsDebugging

Author: dvicory

android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java

@@ -44,7 +44,6 @@
 import androidx.core.util.Pair;
 
 import com.facebook.common.logging.FLog;
-import com.facebook.react.bridge.JavaScriptContextHolder;
 import com.facebook.react.views.scroll.ScrollEvent;
 import com.facebook.react.views.scroll.ScrollEventType;
 import com.facebook.react.views.scroll.OnScrollDispatchHelper;
@@ -68,6 +67,7 @@
 import com.facebook.react.uimanager.events.ContentSizeChangeEvent;
 import com.facebook.react.uimanager.events.Event;
 import com.facebook.react.uimanager.events.EventDispatcher;
+import com.reactnativecommunity.webview.RNCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState;
 import com.reactnativecommunity.webview.events.TopLoadingErrorEvent;
 import com.reactnativecommunity.webview.events.TopHttpErrorEvent;
 import com.reactnativecommunity.webview.events.TopLoadingFinishEvent;
@@ -792,12 +792,12 @@ public void onPageStarted(WebView webView, String url, Bitmap favicon) {
     @Override
     public boolean shouldOverrideUrlLoading(WebView view, String url) {
       final RNCWebView rncWebView = (RNCWebView) view;
-      final JavaScriptContextHolder jsContext = ((ReactContext) view.getContext()).getJavaScriptContextHolder();
+      final boolean isJsDebugging = ((ReactContext) view.getContext()).getJavaScriptContextHolder().get() == 0;
 
-      if (jsContext.get() != 0 && rncWebView.mCatalystInstance != null) {
-        final Pair<Integer, AtomicReference<RNCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState>> lock = RNCWebViewModule.shouldOverrideUrlLoadingLock.getNewLock();
+      if (! isJsDebugging && rncWebView.mCatalystInstance != null) {
+        final Pair<Integer, AtomicReference<ShouldOverrideCallbackState>> lock = RNCWebViewModule.shouldOverrideUrlLoadingLock.getNewLock();
         final int lockIdentifier = lock.first;
-        final AtomicReference<RNCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState> lockObject = lock.second;
+        final AtomicReference<ShouldOverrideCallbackState> lockObject = lock.second;
 
         final WritableMap event = createWebViewEvent(view, url);
         event.putInt("lockIdentifier", lockIdentifier);
@@ -807,7 +807,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
           assert lockObject != null;
           synchronized (lockObject) {
             final long startTime = System.nanoTime();
-            while (lockObject.get() == RNCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState.UNDECIDED) {
+            while (lockObject.get() == ShouldOverrideCallbackState.UNDECIDED) {
               if (TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startTime) > 250) {
                 FLog.w(TAG, "Did not receive response to shouldOverrideUrlLoading in time, defaulting to allow loading.");
                 RNCWebViewModule.shouldOverrideUrlLoadingLock.removeLock(lockIdentifier);
@@ -822,7 +822,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
           return false;
         }
 
-        final boolean shouldOverride = lockObject.get() == RNCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState.SHOULD_OVERRIDE;
+        final boolean shouldOverride = lockObject.get() == ShouldOverrideCallbackState.SHOULD_OVERRIDE;
         RNCWebViewModule.shouldOverrideUrlLoadingLock.removeLock(lockIdentifier);
 
         return shouldOverride;