Merge branch v1.40.930

Author: rhrusha

android/app/build.gradle

@@ -133,7 +133,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.40.910"
+        versionName "1.40.930"
 
         missingDimensionStrategy 'react-native-camera', 'general'
         multiDexEnabled true
@@ -216,6 +216,7 @@ android {
 }
 
 dependencies {
+    implementation project(':react-native-branch')
     implementation project(':react-native-vector-icons')
     implementation 'androidx.multidex:multidex:2.0.1'
 

android/app/proguard-rules.pro

@@ -8,3 +8,5 @@
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
 # Add any project specific keep options here:
+
+-dontwarn io.branch.**

android/app/src/main/AndroidManifest.xml

@@ -70,6 +70,18 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="wc" />
             </intent-filter>
+            <intent-filter>
+                <data android:scheme="branchandroid" />
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" android:host="uobg.app.link" />
+            </intent-filter>
         </activity>
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
         <receiver android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver"
@@ -80,6 +92,8 @@
             </intent-filter>
         </receiver>
         <service android:name="com.google.android.gms.analytics.CampaignTrackingService" android:enabled="true" android:exported="false" />
+        <meta-data android:name="io.branch.sdk.BranchKey" android:value="key_live_pdZCA7n8hLlwZdxQZnuxTplmyynGtAqP"/>
+        <meta-data android:name="io.branch.sdk.BranchKey.test" android:value="key_test_gc9DB1aZhVdyWpBQXcDFLokgytkHyvEX"/>
     </application>
 
 </manifest>

android/app/src/main/java/com/trusteewallet/MainActivity.java

@@ -13,6 +13,9 @@
 
 import android.graphics.Color;
 
+import io.branch.rnbranch.*;
+import android.content.Intent;
+
 public class MainActivity extends ReactActivity {
 
     @Override
@@ -48,14 +51,26 @@ public void onConfigurationChanged(Configuration newConfig) {
     }
 
     @Override
-        protected ReactActivityDelegate createReactActivityDelegate() {
-            return new ReactActivityDelegate(this, getMainComponentName()) {
-            @Override
-            protected ReactRootView createRootView() {
-                return new RNGestureHandlerEnabledRootView(MainActivity.this);
-                }
-            };
-        }
+    protected ReactActivityDelegate createReactActivityDelegate() {
+        return new ReactActivityDelegate(this, getMainComponentName()) {
+        @Override
+        protected ReactRootView createRootView() {
+            return new RNGestureHandlerEnabledRootView(MainActivity.this);
+            }
+        };
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        RNBranchModule.initSession(getIntent().getData(), this);
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        RNBranchModule.onNewIntent(intent);
+    }
 
     protected String getMainComponentName() {
         return "TrusteeWallet";

android/app/src/main/java/com/trusteewallet/MainApplication.java

@@ -20,6 +20,8 @@
 import java.security.Security;
 import android.webkit.WebView;
 
+import io.branch.rnbranch.RNBranchModule;
+
 public class MainApplication extends MultiDexApplication implements ReactApplication {
 
   private final ReactNativeHost mReactNativeHost =
@@ -55,6 +57,7 @@ public void onCreate() {
     SoLoader.init(this, /* native exopackage */ false);
     initializeFlipper(this); // Remove this line if you don't want Flipper enabled
     WebView.setWebContentsDebuggingEnabled(true);
+    RNBranchModule.getAutoInstance(this);
   }
 
   /**

android/build.gradle

@@ -16,7 +16,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.4.2")
+        classpath('com.android.tools.build:gradle:4.1.2')
         classpath 'com.google.gms:google-services:4.2.0'
         classpath 'io.fabric.tools:gradle:1.25.4'
 

android/settings.gradle

@@ -1,4 +1,6 @@
 rootProject.name = 'TrusteeWallet'
+include ':react-native-branch'
+project(':react-native-branch').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-branch/android')
 include ':react-native-vector-icons'
 project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)

app/appstores/Actions/App/App.js

@@ -158,6 +158,8 @@ class App {
 
             await Log.log('ACT/App appRefreshWalletsStates called from ' + source + ' firstTimeCall ' + JSON.stringify(firstTimeCall))
 
+            await CashBackUtils.init({},'ACT/App appRefreshWalletsStates called from' + source)
+
             await walletActions.setAvailableWallets()
 
             await setSelectedWallet('ACT/App appRefreshWalletsStates called from ' + source)
@@ -177,8 +179,6 @@ class App {
 
             // await UpdateCashBackDataDaemon.updateCashBackDataDaemon({source : 'UpdateCashBackDataDaemon.AppHomeScreen'})
 
-            await CashBackUtils.init({},'ACT/App appRefreshWalletsStates init ' + firstTimeCall)
-
         } else {
             await Daemon.forceAll(params)
 

app/appstores/DataSource/Account/Account.js

@@ -235,7 +235,7 @@ class Account {
                     }
                     SAVED_UNIQUE[uniqueDBKey] = 1
                 } else {
-                    Log.daemon('DS/Account insert account ' + uniqueDBKey + '/' + privateStoregeKey + ' not ok / already in cache', SAVED_UNIQUE[privateStoregeKey])
+                    Log.daemon('DS/Account insert account ' + uniqueDBKey + '/' + privateStorageKey + ' not ok / already in cache', SAVED_UNIQUE[privateStorageKey])
                 }
             }
         }

app/appstores/DataSource/Database/core/init/index.js

@@ -37,15 +37,22 @@ export default class DBInit {
         this.#db = dbInterface;
     }
 
-    async init() {
+    async init(onlyUpdate = false) {
         const { initQuery, isEmptyQuery } = this.#tableQueries;
-        const res = await this.#db.query(isEmptyQuery)
+        const { maxVersion } = this.#tableUpdateQueries
+
+        if (!onlyUpdate) {
+            const res = await this.#db.query(isEmptyQuery)
+            if (res && typeof res.array !== 'undefined' && res.array.length !== 0) {
+                onlyUpdate = true
+            }
+        }
         let countError = 0;
         let updateError = false
         try {
-            if (res.array.length !== 0) {
+            if (onlyUpdate) {
                 await this.#update();
-                return;
+                return maxVersion;
             }
         } catch (e) {
             Log.err('DBInit error on update');
@@ -74,6 +81,8 @@ export default class DBInit {
             await this._initSettings();
             await this._initCurrency();
         }
+
+        return maxVersion;
     }
 
     /**