Skip to content

Commit 321053b

Browse files
author
Bruno Barbieri
authored
Merge pull request #811 from MetaMask/develop
Release v0.1.8
2 parents 9da0b2b + 96a153c commit 321053b

File tree

263 files changed

+24854
-12435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+24854
-12435
lines changed

‎.gitmodules‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "mixpanel-iphone"]
2+
path = mixpanel-iphone
3+
url = [email protected]:mixpanel/mixpanel-iphone.git
4+
[submodule "ios/mixpanel-iphone"]
5+
path = ios/mixpanel-iphone
6+
url = [email protected]:mixpanel/mixpanel-iphone.git

‎android/app/build.gradle‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,22 +174,23 @@ android {
174174
applicationId "io.metamask"
175175
minSdkVersion rootProject.ext.minSdkVersion
176176
targetSdkVersion rootProject.ext.targetSdkVersion
177-
versionCode 8
178-
versionName "0.1.7"
177+
versionCode 9
178+
versionName "0.1.8"
179179
multiDexEnabled true
180180
testBuildType System.getProperty('testBuildType', 'debug')
181181
missingDimensionStrategy "minReactNative", "minReactNative46"
182-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
182+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
183183
ndk {
184-
abiFilters "armeabi-v7a", "x86"
184+
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
185185
}
186186
dexOptions {
187187
javaMaxHeapSize "2048M"
188188
}
189189

190190
manifestPlaceholders = [
191191
MM_BRANCH_KEY_TEST: "$System.env.MM_BRANCH_KEY_TEST",
192-
MM_BRANCH_KEY_LIVE: "$System.env.MM_BRANCH_KEY_LIVE"
192+
MM_BRANCH_KEY_LIVE: "$System.env.MM_BRANCH_KEY_LIVE",
193+
MM_MIXPANEL_TOKEN: "$System.env.MM_MIXPANEL_TOKEN"
193194
]
194195
missingDimensionStrategy 'react-native-camera', 'general'
195196

@@ -213,6 +214,12 @@ android {
213214
include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
214215
}
215216
}
217+
218+
packagingOptions {
219+
pickFirst 'lib/x86_64/libjsc.so'
220+
pickFirst 'lib/arm64-v8a/libjsc.so'
221+
}
222+
216223
buildTypes {
217224
debug {
218225
manifestPlaceholders = [isDebug:true]
@@ -248,6 +255,8 @@ android {
248255
}
249256

250257
dependencies {
258+
implementation project(':react-native-fabric')
259+
implementation project(':@react-native-community_netinfo')
251260
implementation project(':react-native-view-shot')
252261
implementation project(':lottie-react-native')
253262
implementation project(':@react-native-community_async-storage')
@@ -257,9 +266,9 @@ dependencies {
257266
implementation project(':react-native-svg')
258267
implementation project(':react-native-gesture-handler')
259268
implementation project(':react-native-screens')
260-
implementation 'com.android.support:multidex:1.0.1'
261-
implementation "com.android.support:support-annotations:27.1.1"
262-
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
269+
implementation 'androidx.multidex:multidex:2.0.0'
270+
implementation 'androidx.annotation:annotation:1.0.0'
271+
implementation 'androidx.appcompat:appcompat:1.0.0'
263272
implementation "com.facebook.react:react-native:+" // From node_modules
264273

265274
implementation project(':react-native-branch')
@@ -269,13 +278,13 @@ dependencies {
269278
implementation project(':react-native-camera')
270279
implementation project(':react-native-share')
271280
implementation project(':react-native-i18n')
272-
implementation project(':react-native-fabric')
273281
implementation project(':react-native-aes-crypto')
274282
implementation project(':react-native-keychain')
275283
implementation project(':react-native-os')
276284
implementation project(':react-native-randombytes')
277285
implementation project(':react-native-fs')
278286
implementation project(':react-native-vector-icons')
287+
implementation 'com.mixpanel.android:mixpanel-android:5.+'
279288

280289
implementation('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') {
281290
transitive = true;

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
>
55

66
<uses-permission android:name="android.permission.INTERNET" />
7+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
78
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
89
<uses-permission android:name="android.permission.CAMERA" />
910
<uses-sdk tools:overrideLibrary="com.tectiv3.aes" />
@@ -43,12 +44,51 @@
4344
<category android:name="android.intent.category.LAUNCHER" />
4445
</intent-filter>
4546
<!-- Branch URI Scheme -->
47+
<intent-filter android:autoVerify="true">
48+
<action android:name="android.intent.action.VIEW" />
49+
<category android:name="android.intent.category.DEFAULT" />
50+
<category android:name="android.intent.category.BROWSABLE" />
51+
<data android:scheme="https" android:host="metamask.app.link" />
52+
<data android:scheme="https" android:host="metamask-alternate.app.link" />
53+
<data android:scheme="https" android:host="metamask.test-app.link" />
54+
<data android:scheme="https" android:host="metamask-alternate.test-app.link" />
55+
</intent-filter>
56+
<intent-filter>
57+
<data android:scheme="metamask" />
58+
<action android:name="android.intent.action.VIEW" />
59+
<category android:name="android.intent.category.DEFAULT" />
60+
<category android:name="android.intent.category.BROWSABLE" />
61+
</intent-filter>
4662
<intent-filter>
4763
<data android:scheme="ethereum" />
4864
<action android:name="android.intent.action.VIEW" />
4965
<category android:name="android.intent.category.DEFAULT" />
5066
<category android:name="android.intent.category.BROWSABLE" />
5167
</intent-filter>
68+
<intent-filter>
69+
<data android:scheme="dapp" />
70+
<action android:name="android.intent.action.VIEW" />
71+
<category android:name="android.intent.category.DEFAULT" />
72+
<category android:name="android.intent.category.BROWSABLE" />
73+
</intent-filter>
74+
<intent-filter>
75+
<data android:scheme="wc" />
76+
<action android:name="android.intent.action.VIEW" />
77+
<category android:name="android.intent.category.DEFAULT" />
78+
<category android:name="android.intent.category.BROWSABLE" />
79+
</intent-filter>
80+
<intent-filter>
81+
<data android:scheme="http" />
82+
<action android:name="android.intent.action.VIEW" />
83+
<category android:name="android.intent.category.DEFAULT" />
84+
<category android:name="android.intent.category.BROWSABLE" />
85+
</intent-filter>
86+
<intent-filter>
87+
<data android:scheme="https" />
88+
<action android:name="android.intent.action.VIEW" />
89+
<category android:name="android.intent.category.DEFAULT" />
90+
<category android:name="android.intent.category.BROWSABLE" />
91+
</intent-filter>
5292

5393
<!-- Branch App Links (optional) -->
5494
<intent-filter android:autoVerify="true">
@@ -70,6 +110,8 @@
70110
android:value="io.metamask"/>
71111
<meta-data android:name="com.dieam.reactnativepushnotification.notification_color"
72112
android:resource="@color/lightgray"/>
113+
<!-- MIXPANEL -->
114+
<meta-data android:name="com.mixpanel.android.mpmetrics.MixpanelAPI.token" android:value="${MM_MIXPANEL_TOKEN}" />
73115

74116
<!-- Branch install referrer tracking (optional) -->
75117
<receiver android:name="io.branch.referral.InstallListener" android:exported="true">
@@ -80,7 +122,7 @@
80122

81123

82124
<provider
83-
android:name="android.support.v4.content.FileProvider"
125+
android:name="androidx.core.content.FileProvider"
84126
android:authorities="io.metamask.provider"
85127
android:grantUriPermissions="true"
86128
android:exported="false">

‎android/app/src/main/java/io/metamask/MainActivity.java‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,18 @@
33
import com.facebook.react.ReactActivityDelegate;
44
import com.facebook.react.ReactFragmentActivity;
55
import com.facebook.react.ReactRootView;
6+
import com.mixpanel.android.mpmetrics.MixpanelAPI;
67
import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
78

89
import io.branch.rnbranch.*;
10+
911
import android.content.Intent;
12+
import android.content.pm.ApplicationInfo;
13+
import android.content.pm.PackageManager;
1014
import android.os.Bundle;
11-
import android.support.annotation.Nullable;
15+
import android.util.Log;
16+
17+
import androidx.annotation.NonNull;
1218

1319
public class MainActivity extends ReactFragmentActivity {
1420

@@ -25,9 +31,15 @@ protected String getMainComponentName() {
2531
@Override
2632
protected void onStart() {
2733
super.onStart();
28-
if(!BuildConfig.DEBUG){
29-
RNBranchModule.initSession(getIntent().getData(), this);
34+
RNBranchModule.initSession(getIntent().getData(), this);
35+
try{
36+
ApplicationInfo ai = this.getPackageManager().getApplicationInfo(this.getPackageName(), PackageManager.GET_META_DATA);
37+
String mixpanelToken = (String)ai.metaData.get("com.mixpanel.android.mpmetrics.MixpanelAPI.token");
38+
MixpanelAPI.getInstance(this, mixpanelToken);
39+
}catch (PackageManager.NameNotFoundException e){
40+
Log.d("RCTAnalytics","init:token missing");
3041
}
42+
3143
}
3244

3345
@Override
@@ -43,7 +55,7 @@ public void onNewIntent(Intent intent) {
4355
@Override
4456
protected ReactActivityDelegate createReactActivityDelegate() {
4557
return new ReactActivityDelegate(this, getMainComponentName()) {
46-
@Nullable
58+
@NonNull
4759
@Override
4860
protected Bundle getLaunchOptions() {
4961
Bundle bundle = new Bundle();

‎android/app/src/main/java/io/metamask/MainApplication.java‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
import com.crashlytics.android.Crashlytics;
66
import com.facebook.react.ReactApplication;
7+
import com.smixx.fabric.FabricPackage;
8+
import com.reactnativecommunity.netinfo.NetInfoPackage;
79
import fr.greweb.reactnativeviewshot.RNViewShotPackage;
810
import com.airbnb.android.react.lottie.LottiePackage;
911
import com.reactnativecommunity.asyncstorage.AsyncStoragePackage;
@@ -13,16 +15,16 @@
1315
import com.horcrux.svg.SvgPackage;
1416
import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
1517
import io.branch.rnbranch.RNBranchPackage;
16-
import io.branch.referral.Branch;
18+
import io.branch.rnbranch.RNBranchModule;
1719
import com.web3webview.Web3WebviewPackage;
20+
import io.metamask.nativeModules.RCTAnalyticsPackage;
1821
import com.oblador.vectoricons.VectorIconsPackage;
1922
import cl.json.RNSharePackage;
2023
import com.bitgo.randombytes.RandomBytesPackage;
2124
import com.peel.react.rnos.RNOSModule;
2225
import com.oblador.keychain.KeychainPackage;
2326
import com.AlexanderZaytsev.RNI18n.RNI18nPackage;
2427
import com.rnfs.RNFSPackage;
25-
import com.smixx.fabric.FabricPackage;
2628
import org.reactnative.camera.RNCameraPackage;
2729
import com.tectiv3.aes.RCTAesPackage;
2830
import com.swmansion.rnscreens.RNScreensPackage;
@@ -35,7 +37,7 @@
3537
import java.util.Arrays;
3638
import java.util.List;
3739

38-
import android.support.multidex.MultiDexApplication;
40+
import androidx.multidex.MultiDexApplication;
3941

4042

4143
public class MainApplication extends MultiDexApplication implements ShareApplication, ReactApplication {
@@ -50,8 +52,10 @@ public boolean getUseDeveloperSupport() {
5052
protected List<ReactPackage> getPackages() {
5153
return Arrays.<ReactPackage>asList(
5254
new MainReactPackage(),
53-
new RNViewShotPackage(),
54-
new LottiePackage(),
55+
new FabricPackage(),
56+
new NetInfoPackage(),
57+
new RNViewShotPackage(),
58+
new LottiePackage(),
5559
new AsyncStoragePackage(),
5660
new ReactNativePushNotificationPackage(),
5761
new BackgroundTimerPackage(),
@@ -60,7 +64,6 @@ protected List<ReactPackage> getPackages() {
6064
new RNGestureHandlerPackage(),
6165
new RNScreensPackage(),
6266
new RNBranchPackage(),
63-
new FabricPackage(),
6467
new KeychainPackage(),
6568
new RandomBytesPackage(),
6669
new RCTAesPackage(),
@@ -70,7 +73,8 @@ protected List<ReactPackage> getPackages() {
7073
new RNOSModule(),
7174
new RNSharePackage(),
7275
new VectorIconsPackage(),
73-
new Web3WebviewPackage()
76+
new Web3WebviewPackage(),
77+
new RCTAnalyticsPackage()
7478
);
7579
}
7680

@@ -90,8 +94,8 @@ public void onCreate() {
9094
super.onCreate();
9195
if (!BuildConfig.DEBUG){
9296
Fabric.with(this, new Crashlytics());
93-
Branch.getAutoInstance(this);
9497
}
98+
RNBranchModule.getAutoInstance(this);
9599
SoLoader.init(this, /* native exopackage */ false);
96100
}
97101

‎android/app/src/main/java/io/metamask/SplashActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.v7.app.AppCompatActivity;
5+
import androidx.appcompat.app.AppCompatActivity;
66

77
public class SplashActivity extends AppCompatActivity {
88
@Override

0 commit comments

Comments
 (0)