Support URLs on QR code scanner (#1145)

* allow scanning urls to open websites * add support for normal websites * version bump * fix * fix bug
MetaMask · Oct 9, 2019 · 73fbcb3 · 73fbcb3
1 parent 7d7b2be
commit 73fbcb3
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 7 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -174,8 +174,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 20
-        versionName "0.2.7"
+        versionCode 21
+        versionName "0.2.8"
         multiDexEnabled true
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy "minReactNative", "minReactNative46"

diff --git a/app/components/UI/Navbar/index.js b/app/components/UI/Navbar/index.js
@@ -569,6 +569,10 @@ export function getWalletNavbarOptions(title, navigation) {
 			setTimeout(() => {
 				DeeplinkManager.parse(data);
 			}, 500);
+		} else if ((data && data.indexOf('https://') !== -1) || data.indexOf('http://')) {
+			setTimeout(() => {
+				DeeplinkManager.parse(data);
+			}, 500);
 		}
 	};
 

diff --git a/app/components/Views/Browser/index.js b/app/components/Views/Browser/index.js
@@ -98,10 +98,26 @@ class Browser extends PureComponent {
 		});
 	}
 
-	componentDidUpdate() {
+	componentDidUpdate(prevProps) {
 		if (this.props.tabs.length !== Object.keys(this.tabs).length) {
 			this.createBrowserTabs(this.props.tabs);
 		}
+
+		const prevNavigation = prevProps.navigation;
+		const { navigation } = this.props;
+
+		if (prevNavigation && navigation) {
+			const prevUrl = prevNavigation.getParam('newTabUrl', null);
+			const currentUrl = navigation.getParam('newTabUrl', null);
+
+			if (currentUrl && prevUrl !== currentUrl) {
+				this.newTab(currentUrl);
+				this.props.navigation.setParams({
+					...this.props.navigation.state.params,
+					newTabUrl: null
+				});
+			}
+		}
 	}
 
 	showTabs = async () => {

diff --git a/app/core/DeeplinkManager.js b/app/core/DeeplinkManager.js
@@ -31,7 +31,13 @@ class DeeplinkManager {
 	handleBrowserUrl(url, callback) {
 		this.navigation.navigate('BrowserTabHome');
 		InteractionManager.runAfterInteractions(() => {
-			callback(url);
+			if (callback) {
+				callback(url);
+			} else {
+				this.navigation.navigate('BrowserView', {
+					newTabUrl: url
+				});
+			}
 		});
 	}
 

diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj
@@ -2537,7 +2537,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 					"\"$(SRCROOT)/MetaMask\"",
 				);
-				MARKETING_VERSION = 0.2.7;
+				MARKETING_VERSION = 0.2.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2605,7 +2605,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 					"\"$(SRCROOT)/MetaMask\"",
 				);
-				MARKETING_VERSION = 0.2.7;
+				MARKETING_VERSION = 0.2.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "private": true,
   "scripts": {
     "restart-packager-clean": "watchman watch-del-all && rm -rf $TMPDIR/react-* && yarn start -- --reset-cache",