fix(action-error): Resolve action error on android

hypery2k · Apr 6, 2017 · 76ceef4 · 76ceef4
1 parent 3ee1f62
commit 76ceef4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ Replace *myapp* with your desired scheme and set launchMode to *singleTask*
 For example:
 
 ```xml
-<activity android:name="com.tns.NativeScriptApplication" android:label="@string/app_name" android:launchMode="singleTask">
+<activity android:name="com.tns.NativeScriptApplication" android:label="@string/app_name" android:launchMode="singleTop">
   <intent-filter>
       <action android:name="android.intent.action.MAIN" />
       <category android:name="android.intent.category.LAUNCHER" />

diff --git a/urlhandler.android.ts b/urlhandler.android.ts
@@ -9,31 +9,26 @@ export function handleIntent(intent: any) {
     let data = intent.getData();
     if (lastReceivedData === null || data.toString() !== lastReceivedData.toString()) {
         try {
-            if (new String(intent.getAction()).valueOf() === new String(android.content.Intent.ACTION_VIEW).valueOf()) {
+            if (new String(intent.getAction()).valueOf() === new String(android.content.Intent.ACTION_MAIN).valueOf()
+                || new String(intent.getAction()).valueOf() === new String(android.content.Intent.ACTION_VIEW).valueOf()) {
                 try {
-                    setTimeout(() => {
-                        getCallback()(extractAppURL(data));
-                    });
+                    setTimeout(() => getCallback()(extractAppURL(data)));
                 } catch (ignored) {
                     application.android.on(application.AndroidApplication.activityResultEvent, (eventData) => {
-                        setTimeout(() => {
-                            getCallback()(extractAppURL(data));
-                        });
+                        setTimeout(() => getCallback()(extractAppURL(data)));
                     });
                 }
             }
         } catch (e) {
             console.error('Unknown error during getting App URL data', e);
         }
+        lastReceivedData = data;
     }
 }
 application.android.on(application.AndroidApplication.activityCreatedEvent, (args) => {
     let intent: android.content.Intent = args.activity.getIntent();
     try {
-        if (new String(intent.getAction()).valueOf() === new String(android.content.Intent.ACTION_MAIN).valueOf()
-            || new String(intent.getAction()).valueOf() === new String(android.content.Intent.ACTION_VIEW).valueOf()) {
-            handleIntent(intent);
-        }
+        handleIntent(intent);
     } catch (e) {
         console.error('Unknown error during getting App URL data', e);
     }
@@ -42,11 +37,7 @@ application.android.on(application.AndroidApplication.activityCreatedEvent, (arg
 application.android.on(application.AndroidApplication.activityResumedEvent, (args) => {
     let intent: android.content.Intent = args.activity.getIntent();
     try {
-        if (new String(intent.getAction()).valueOf() === new String(android.content.Intent.ACTION_MAIN).valueOf()
-            || new String(intent.getAction()).valueOf() === new String(android.content.Intent.ACTION_VIEW).valueOf()) {
-            handleIntent(intent);
-            lastReceivedData = intent.getData();
-        }
+        handleIntent(intent);
     } catch (e) {
         console.error('Unknown error during getting App URL data', e);
     }