Merge pull request #1985 from LiskHQ/release/3.0.0

Merge release/3.0.0 into development

.gitignore

@@ -27,8 +27,6 @@ DerivedData
 
 # Android/IntelliJ
 #
-build/
-.idea
 .gradle
 local.properties
 *.iml

Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby '>= 2.6.10'
 
-gem 'cocoapods', '>= 1.11.3'
+gem 'cocoapods', '>= 1.12.1'

README.md

@@ -67,8 +67,8 @@ Please install the required prerequisites to run Lisk Mobile from source.
   - Performance (Intel ® HAXM)
   - Android Virtual Device
 - Install the Android SDK. Consider these configurations:
-  - compileSdkVersion: 30
-  - buildToolsVersion: 30.0.2
+  - compileSdkVersion: 33
+  - buildToolsVersion: 33.0.0
 
 ## Installation
 
@@ -222,7 +222,7 @@ Please check out [iMessage extension docs](ios/LiskMessageExtension/README.md) f
 
 ## Contributing
 
-Please see [CONTRIBUTING.md](/CONTRIBUTING.md) for more information.
+Please see [CONTRIBUTING.md](docs/CONTRIBUTING.md) for more information.
 
 ## Contributors
 

android/app/build.gradle

@@ -119,7 +119,7 @@ android {
         applicationId "io.lisk.mobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 74
+        versionCode 75
         versionName "3.0.0"
         missingDimensionStrategy 'react-native-camera', 'mlkit'
     }

android/app/src/debug/AndroidManifest.xml

@@ -4,5 +4,7 @@
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
+    <application android:usesCleartextTraffic="false"
+        tools:targetApi="28"
+        tools:ignore="GoogleAppIndexingWarning" />
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -2,42 +2,44 @@
   xmlns:tools="http://schemas.android.com/tools"
   package="io.lisk.mobile">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission tools:node="merge" android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.VIBRATE" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.CAMERA" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission tools:node="merge"
+    android:name="android.permission.READ_PHONE_STATE" />
+  <uses-permission android:name="android.permission.VIBRATE" />
 
-    <application
-      android:name=".MainApplication"
+  <application android:name=".MainApplication"
+    android:label="@string/app_name"
+    android:icon="@mipmap/ic_launcher"
+    android:roundIcon="@mipmap/ic_launcher_round"
+    android:allowBackup="false"
+    android:fullBackupContent="false"
+    android:dataExtractionRules="@xml/data_extraction_rules"
+    android:theme="@style/AppTheme"
+    android:allowTaskReparenting="false"
+    android:taskAffinity=""
+    android:usesCleartextTraffic="false">
+    <activity android:name=".MainActivity"
       android:label="@string/app_name"
-      android:icon="@mipmap/ic_launcher"
-      android:roundIcon="@mipmap/ic_launcher_round"
-      android:allowBackup="false"
-      android:theme="@style/AppTheme"
-      android:allowTaskReparenting="false"
-      android:taskAffinity="">
-      <activity
-        android:name=".MainActivity"
-        android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
-        android:launchMode="singleTask"
-        android:windowSoftInputMode="adjustPan"
-        android:screenOrientation="portrait"
-        android:exported="true">
-        <intent-filter>
-          <action android:name="android.intent.action.MAIN" />
-          <category android:name="android.intent.category.LAUNCHER" />
-        </intent-filter>
-        <intent-filter>
-          <action android:name="android.intent.action.VIEW" />
-          <category android:name="android.intent.category.DEFAULT" />
-          <category android:name="android.intent.category.BROWSABLE" />
-          <data android:scheme="lisk" />
-        </intent-filter>
-      </activity>
-
-    </application>
-
+      android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+      android:launchMode="singleTask"
+      android:windowSoftInputMode="adjustPan"
+      android:screenOrientation="portrait"
+      android:exported="true">
+      <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="lisk.com"
+          android:pathPrefix="/wallet" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
 </manifest>

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

@@ -9,6 +9,8 @@
 import com.facebook.react.defaults.DefaultReactNativeHost;
 import com.facebook.soloader.SoLoader;
 import io.lisk.mobile.AppOpsManagerModulePackage;
+import io.lisk.mobile.ProviderInstallerPackage;
+import io.lisk.mobile.SensitiveClipboardPackage;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
@@ -27,6 +29,8 @@ protected List<ReactPackage> getPackages() {
       // Packages that cannot be autolinked yet can be added manually here, for example:
       // packages.add(new MyReactNativePackage());
       packages.add(new AppOpsManagerModulePackage());
+      packages.add(new SensitiveClipboardPackage());
+      packages.add(new ProviderInstallerPackage());
       return packages;
     }
 

android/app/src/main/java/com/lisk/ProviderInstallerModule.java

@@ -0,0 +1,39 @@
+package io.lisk.mobile;
+
+import android.app.Activity;
+import android.util.Log;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+
+import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
+import com.google.android.gms.common.GooglePlayServicesRepairableException;
+import com.google.android.gms.security.ProviderInstaller;
+
+public class ProviderInstallerModule extends ReactContextBaseJavaModule {
+    private static ReactApplicationContext reactContext;
+    private static final String TAG = "ProviderInstallerModule";
+
+    ProviderInstallerModule(ReactApplicationContext context) {
+        super(context);
+        reactContext = context;
+    }
+
+    @Override
+    public String getName() {
+        return "ProviderInstaller";
+    }
+
+    @ReactMethod
+    public void installIfNeeded() {
+        final Activity activity = getCurrentActivity();
+        try {
+            ProviderInstaller.installIfNeeded(activity);
+        } catch (GooglePlayServicesRepairableException e) {
+            Log.e(TAG, "Google Play Services Repairable", e);
+        } catch (GooglePlayServicesNotAvailableException e) {
+            Log.e(TAG, "Google Play Services Not Available", e);
+        }
+    }
+}

android/app/src/main/java/com/lisk/ProviderInstallerPackage.java

@@ -0,0 +1,26 @@
+package io.lisk.mobile;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ProviderInstallerPackage implements ReactPackage {
+
+  @Override
+  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+    return Collections.emptyList();
+  }
+
+  @Override
+  public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+    List<NativeModule> modules = new ArrayList<>();
+
+    modules.add(new ProviderInstallerModule(reactContext));
+
+    return modules;
+  }
+}

android/app/src/main/java/com/lisk/SensitiveClipboardModule.java

@@ -0,0 +1,44 @@
+package io.lisk.mobile;
+
+import android.content.ClipData;
+import android.content.ClipDescription;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.PersistableBundle;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+
+public class SensitiveClipboardModule extends ReactContextBaseJavaModule {
+
+  private static ReactApplicationContext reactContext;
+
+  SensitiveClipboardModule(ReactApplicationContext context) {
+    super(context);
+    reactContext = context;
+  }
+
+  @Override
+  public String getName() {
+    return "SensitiveClipboardModule";
+  }
+
+  @ReactMethod
+  public void copyToClipboardSensitive(String data) {
+    ClipboardManager clipboard = (ClipboardManager) reactContext.getSystemService(
+      Context.CLIPBOARD_SERVICE
+    );
+
+    PersistableBundle extras = new PersistableBundle();
+    extras.putBoolean(ClipDescription.EXTRA_IS_SENSITIVE, true);
+
+    ClipData clip = ClipData.newPlainText(null, data);
+    ClipDescription description = clip.getDescription();
+    description.setExtras(extras);
+    ClipData newClip = new ClipData(description, new ClipData.Item(data));
+
+    clipboard.setPrimaryClip(newClip);
+  }
+}

android/app/src/main/java/com/lisk/SensitiveClipboardPackage.java

@@ -0,0 +1,22 @@
+package io.lisk.mobile;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class SensitiveClipboardPackage implements ReactPackage {
+
+  @Override
+  public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+    return Arrays.<NativeModule>asList(new SensitiveClipboardModule(reactContext));
+  }
+
+  @Override
+  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+    return Collections.emptyList();
+  }
+}

android/app/src/main/res/xml/data_extraction_rules.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<data-extraction-rules>
+  <cloud-backup>
+    <exclude domain="root"
+      path="." />
+    <exclude domain="file"
+      path="." />
+    <exclude domain="database"
+      path="." />
+    <exclude domain="sharedpref"
+      path="." />
+    <exclude domain="external"
+      path="." />
+  </cloud-backup>
+  <device-transfer>
+    <exclude domain="root"
+      path="." />
+    <exclude domain="file"
+      path="." />
+    <exclude domain="database"
+      path="." />
+    <exclude domain="sharedpref"
+      path="." />
+    <exclude domain="external"
+      path="." />
+  </device-transfer>
+</data-extraction-rules>

android/build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     ext {
         buildToolsVersion = "33.0.0"
-        minSdkVersion = 30
+        minSdkVersion = 33
         compileSdkVersion = 33
         targetSdkVersion = 33
 

android/gradle.properties

@@ -48,7 +48,7 @@ hermesEnabled=true
 MYAPP_RELEASE_STORE_FILE=lisk-mobile-release-key.keystore
 MYAPP_RELEASE_KEY_ALIAS=lisk-mobile-alias
 
-compileSdkVersion = 30
-buildToolsVersion = "29.0.2"
-targetSdkVersion = 30
+compileSdkVersion = 33
+buildToolsVersion = "33.0.0"
+targetSdkVersion = 33
 

env.test.json

@@ -1,8 +1,8 @@
 {
   "RECOVERY_PHRASE": "",
   "NETWORK": "devnet",
-  "SERVICE_API_BASE_URL": "https://betanet-service.lisk.com",
-  "SERVICE_WS_BASE_URL": "wss://betanet-service.lisk.com",
+  "SERVICE_API_BASE_URL": "http://devnet-service.liskdev.net:9901",
+  "SERVICE_WS_BASE_URL": "ws://devnet-service.liskdev.net:9901",
   "SERVICE_API_VERSION": "v3",
   "PROJECT_ID": "",
   "RELAY_URL": "",