EX-8495: fix for video downloader & update to latest @cliqz/indexeddb…

…shim
ghostery · Feb 1, 2019 · 03cd528b00d58beacdfd42c08fb93fc1d9449258 · 03cd528
1 parent 5a716cb
commit 03cd528b00d58beacdfd42c08fb93fc1d9449258
Unified Split

Showing with 2,844 additions and 2,323 deletions.

+2 −2 Client.xcodeproj/project.pbxproj

+2 −2 Cliqz/React Components/Engine.swift

+1 −0 Podfile

+0 −1 index.js

+2,829 −2,316 package-lock.json

+4 −2 package.json

+6 −0 setup.js
diff --git a/Client.xcodeproj/project.pbxproj b/Client.xcodeproj/project.pbxproj
@@ -5850,11 +5850,11 @@
 				"${BUILT_PRODUCTS_DIR}/RNDeviceInfo/RNDeviceInfo.framework",
 				"${BUILT_PRODUCTS_DIR}/RNFS/RNFS.framework",
 				"${BUILT_PRODUCTS_DIR}/RNSqlite2/RNSqlite2.framework",
+				"${BUILT_PRODUCTS_DIR}/RNUserAgent/RNUserAgent.framework",
 				"${BUILT_PRODUCTS_DIR}/RNViewShot/RNViewShot.framework",
 				"${BUILT_PRODUCTS_DIR}/React/React.framework",
 				"${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
 				"${BUILT_PRODUCTS_DIR}/RealmSwift/RealmSwift.framework",
-				"${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework",
 				"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
 				"${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework",
 				"${BUILT_PRODUCTS_DIR}/gRPC/GRPCClient.framework",
@@ -5882,11 +5882,11 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNDeviceInfo.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNFS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNSqlite2.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNUserAgent.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNViewShot.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVProgressHUD.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRPCClient.framework",

diff --git a/Cliqz/React Components/Engine.swift b/Cliqz/React Components/Engine.swift
@@ -100,8 +100,8 @@ open class Engine {
     // MARK :- Youtube Downloader
     func findVideoLinks(url: String, callback: @escaping ([[String: Any]]) -> ()) {
 
-        let _ = self.getBridge().callAction("video-downloader:findVideoLinks", args: [url as AnyObject]) { (result) in
-            if let videoLinks = result["result"] as? [[String: Any]] {
+        let _ = self.getBridge().callAction("video-downloader:getVideoLinks", args: [url as AnyObject]) { (result) in
+            if let results = result["result"] as? [String: Any], let videoLinks = results["formats"] as? [[String: Any]] {
                 callback(videoLinks)
             }
         }

diff --git a/Podfile b/Podfile
@@ -26,6 +26,7 @@ def project_pods
     pod 'RNViewShot', :path => './node_modules/react-native-view-shot/'
     pod 'CRToast'
     pod 'SVProgressHUD'
+    pod 'RNUserAgent', :path => './node_modules/react-native-user-agent/ios/'
 end
 
 target 'Client' do

diff --git a/index.js b/index.js
@@ -4,7 +4,6 @@ import setup from './setup';
 import React from 'react';
 import { AppRegistry, StyleSheet, View } from 'react-native';
 import { startup, components } from 'browser-core';
-import 'babel-polyfill';
 
 // set app global for debugging
 const appStart = startup.then((app) => {