vertical cards fixes (#734)

Vertical cards fixes
ghostery · Mar 20, 2019 · 1b3e284 · 1b3e284
1 parent 706a5fc
commit 1b3e284
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 44 deletions.
diff --git a/cliqz/index.js b/cliqz/index.js
@@ -18,13 +18,23 @@ class Cliqz {
   constructor(app, actions) {
     this.app = app;
     this.app.modules['ui'] = {
-      status() {},
+      status() {
+        return {
+          name: 'ui',
+          isEnabled: true,
+          loadingTime: 0,
+          loadingTimeSync: 0,
+          windows: [],
+          state: {},
+        };
+      },
       name: 'ui',
       action(action, ...args) {
         return Promise.resolve().then(() => {
           return actions[action](...args);
         });
       },
+      isEnabled: true,
     };
     this.mobileCards = app.modules['mobile-cards'].background.actions;
     this.geolocation = app.modules['geolocation'].background.actions;

diff --git a/cliqz/package-lock.json b/cliqz/package-lock.json
diff --git a/cliqz/package.json b/cliqz/package.json
@@ -2,15 +2,15 @@
   "name": "cliqz-native",
   "version": "0.0.0",
   "scripts": {
-    "start": "node node_modules/react-native/local-cli/cli.js start",
+    "start": "node node_modules/react-native/local-cli/cli.js start --reset-cache",
     "build": "node node_modules/react-native/local-cli/cli.js bundle --platform android --entry-file index.js --bundle-output ../mozilla-release/mobile/android/app/src/main/assets/index.android.bundle --dev=false --reset-cache",
     "build.dev": "node node_modules/react-native/local-cli/cli.js bundle --platform android --entry-file index.js --bundle-output ../mozilla-release/mobile/android/app/src/main/assets/index.android.bundle --dev=true --reset-cache"
   },
   "devDependencies": {
     "jsc-android": "^236355.1.1"
   },
   "dependencies": {
-    "browser-core": "https://s3.amazonaws.com/cdncliqz/update/edge/rn-ghostery-android/v1.35/1.35.0.444bb07.tgz",
+    "browser-core": "https://s3.amazonaws.com/cdncliqz/update/edge/rn-ghostery-android/v1.35/1.35.0.38e6545.tgz",
     "cliqz-logo-database": "^0.1.2",
     "moment": "^2.24.0",
     "react": "^16.6.3",

diff --git a/mozilla-release/mobile/android/base/java/com/cliqz/react/modules/BridgeModule.java b/mozilla-release/mobile/android/base/java/com/cliqz/react/modules/BridgeModule.java
@@ -13,6 +13,7 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.bridge.WritableMap;
 
 import org.mozilla.gecko.EventDispatcher;
@@ -144,7 +145,17 @@ public void sendExternalMessage(String extensionId, ReadableMap message) {
         final ReadableArray args = message.getArray("args");
 
         if (SystemAddon.MODULE_CORE.equals(module) && SystemAddon.ACTION_SEND_TELEMETRY.equals(action)) {
-            final GeckoBundle signal = Utils.convertReadableMapToGeckoBundle(args.getMap(0));
+            GeckoBundle signal = null;
+            final ReadableType type = args.getType(0);
+            switch (type) {
+                case Map:
+                    signal = Utils.convertReadableMapToGeckoBundle(args.getMap(0));
+                    break;
+                default:
+                    Log.d(getClass().getSimpleName(), "Unexpected telemetry shape");
+                    return;
+            }
+
             final String schema = args.getString(2);
 
             if (schema != null) {