From 84e354b11c41b0eb964a988fc528d196e768386e Mon Sep 17 00:00:00 2001
From: igorwork <markin.io210@gmail.com>
Date: Fri, 19 Jul 2019 15:13:27 +0300
Subject: [PATCH] Fix android intents.
---
android/app/src/main/AndroidManifest.xml | 8 ++++----
.../com/vereign/{mobile_app => app}/MainActivity.java | 0
ios/Runner/Info.plist | 2 +-
lib/app.dart | 2 +-
lib/screens/home.dart | 8 +++++++-
5 files changed, 13 insertions(+), 7 deletions(-)
rename android/app/src/main/java/com/vereign/{mobile_app => app}/MainActivity.java (100%)
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 6797422..1bbc27e 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
android:icon="@mipmap/ic_launcher">
<activity
android:name=".MainActivity"
- android:launchMode="singleTop"
+ android:launchMode="singleTask"
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
@@ -36,10 +36,10 @@
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.BROWSABLE" />
+ <category android:name="android.intent.category.LAUNCHER"/>
<data
- android:scheme="vereign"
- android:host="app.vereign.com" />
+ android:scheme="app"
+ android:host="com.vereign.app" />
</intent-filter>
</activity>
diff --git a/android/app/src/main/java/com/vereign/mobile_app/MainActivity.java b/android/app/src/main/java/com/vereign/app/MainActivity.java
similarity index 100%
rename from android/app/src/main/java/com/vereign/mobile_app/MainActivity.java
rename to android/app/src/main/java/com/vereign/app/MainActivity.java
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index bd06ac5..fb61221 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -34,7 +34,7 @@
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
- <string>com.vereign.app/auhtorize</string>
+ <string>com.vereign.app/authorize</string>
<key>CFBundleURLSchemes</key>
<array>
<string>app</string>
diff --git a/lib/app.dart b/lib/app.dart
index 76cc0a7..103c987 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -54,7 +54,7 @@ class _AppState extends State<App> {
updateAppMode(Uri uri) {
log("Uri $uri");
- if (uri?.path == "/auhtorize") {
+ if (uri?.path == "/authorize") {
setState(() {
_appMode = "oauth";
_invokerURL = uri.queryParameters["invokerUrl"];
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index 17abd34..3d15680 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -48,7 +48,13 @@ class _HomeState extends State<Home> {
onPressed: () async {
Navigator.of(context).pop();
widget.setMode("");
- await launch("${widget.invokerURL}?token=$token");
+
+ log("Open ${widget.invokerURL}");
+ try {
+ await launch("${widget.invokerURL}?token=$token");
+ } catch (e) {
+ log("Error launching url ${widget.invokerURL}");
+ }
},
),
],
--
GitLab