Fixing react-native support and bump versions (1.8.8, 116)

Author: spacifici

app/build.gradle

@@ -12,8 +12,8 @@ android {
     }
 
     defaultConfig {
-        versionCode 115
-        versionName "1.8.7"
+        versionCode 116
+        versionName "1.8.8"
         multiDexEnabled true
 
         buildConfigField 'String', 'LIGHTNING_VERSION_NAME', '"4.2.3.1"'

app/src/main/java/com/cliqz/browser/webview/CliqzMessages.java

@@ -3,8 +3,6 @@
 import android.support.annotation.NonNull;
 import android.view.animation.Animation;
 
-import androidx.annotation.NonNull;
-
 import com.cliqz.utils.StringUtils;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReadableMap;

app/src/main/java/com/cliqz/jsengine/JSBridge.java

@@ -13,6 +13,7 @@
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import java.util.HashMap;
@@ -30,8 +31,8 @@
 
 /**
  * @author Sam Macbeth
- * @author Moaz Rashad
  */
+@ReactModule(name = "JSBridge")
 public class JSBridge extends ReactContextBaseJavaModule {
 
     private final ReactApplicationContext context;
@@ -52,7 +53,7 @@ public class JSBridge extends ReactContextBaseJavaModule {
     private final Map<String, List<WaitingAction>> awaitingRegistration =
             new HashMap<>();
 
-    private static final long ACTION_TIMEOUT = 200;
+    private static final long ACTION_TIMEOUT = 1000;
 
     private final Handler handler;
     private final Bus bus;

app/src/main/java/com/cliqz/jsengine/WebRequest.java

@@ -20,6 +20,7 @@
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.module.annotations.ReactModule;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -40,6 +41,7 @@
 /**
  * @author Sam Macbeth
  */
+@ReactModule(name = "WebRequest")
 public class WebRequest extends ReactContextBaseJavaModule {
 
     private final static String TAG = WebRequest.class.getSimpleName();
@@ -88,7 +90,40 @@ public void isWindowActive(int tabId, Promise promise) {
 
     private boolean isTabActive(final int tabId) {
         Pair<Uri, WeakReference<WebView>> tuple = tabs.get(tabId);
-        return tuple != null && tuple.second.get() != null;
+        final boolean active = tuple != null && tuple.second.get() != null;
+
+        if (!active) {
+            // send core:tab_close event to notify extension that tab is gone
+            final WritableMap tab = Arguments.createMap();
+            tab.putInt("tabId", tabId);
+            engine.publishEvent("core:tab_close", tab);
+        }
+        return active;
+    }
+
+    private JSBridge ensureBridge() {
+        try {
+            return engine.getBridge();
+        } catch (EngineNotYetAvailable e) {
+            Log.w("webrequest", "jsengine not yet loaded, waiting", e);
+            try {
+                Thread.sleep(250);
+            } finally {
+                return ensureBridge();
+            }
+        }
+    }
+
+    private ReadableMap triggerWebRequest(final WritableMap requestInfo) throws EmptyResponseException {
+        try {
+            return ensureBridge().callAction("webRequest", requestInfo);
+        } catch (ActionNotAvailable e) {
+            try {
+                Thread.sleep(200);
+            } finally {
+                return triggerWebRequest(requestInfo);
+            }
+        }
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@@ -158,6 +193,7 @@ public WebResourceResponse shouldInterceptRequest(final WebView view, final WebR
         requestInfo.putString("originUrl", originUrl);
         requestInfo.putString("sourceUrl", originUrl);
         requestInfo.putString("frameUrl", originUrl);
+        requestInfo.putString("tabUrl", originUrl);
         requestInfo.putInt("type", contentPolicyType);
 
         final WritableMap requestHeaders = Arguments.createMap();
@@ -167,7 +203,7 @@ public WebResourceResponse shouldInterceptRequest(final WebView view, final WebR
         requestInfo.putMap("requestHeaders", requestHeaders);
 
         try {
-            final ReadableMap response = engine.getBridge().callAction("webRequest", requestInfo);
+            final ReadableMap response = triggerWebRequest(requestInfo);
             final ReadableMap blockResponse = response.getMap("result");
             final String source = blockResponse.hasKey("source") ? blockResponse.getString("source") : "";
             // counter for tab
@@ -195,12 +231,8 @@ public WebResourceResponse shouldInterceptRequest(final WebView view, final WebR
                 Log.d(TAG, "Modify request from: " + requestUrl.toString());
                 return modifyRequest(source, request, newUrl, modifiedHeaders);
             }
-        } catch (ActionNotAvailable e) {
-            Log.w("webrequest", "jsengine not ready yet", e);
         } catch (EmptyResponseException e) {
             Log.w("webrequest", "jsengine timed out", e);
-        } catch (EngineNotYetAvailable e) {
-            Log.w("webrequest", "jsengine not yet loaded", e);
         } catch (NoSuchKeyException e) {
             Log.e("webrequest", "error in jsengine response", e);
         }

build.gradle

@@ -21,7 +21,7 @@ ext {
     minSdkVersion = 21
     buildToolsVersion = "28.0.3"
     supportLibVersion = "28.0.0"
-    reactNativeVersion = "0.56.1"
+    reactNativeVersion = "0.59.8"
 }
 
 subprojects { subproject ->