From 19fa3fce05898965a9227fbe3fe3716d5c8fe0e6 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 4 Apr 2019 12:52:28 -0700
Subject: [PATCH] get rid of DispatchNotify

All it did was forward intent's data to MainActivity. Only question is
whether making MainActivity singleTask is a problem. We'll see.
---
 .../android/app/src/main/AndroidManifest.xml  | 56 +++++++++----------
 .../eehouse/android/xw4/DispatchNotify.java   | 41 --------------
 2 files changed, 26 insertions(+), 71 deletions(-)
 delete mode 100644 xwords4/android/app/src/main/java/org/eehouse/android/xw4/DispatchNotify.java

diff --git a/xwords4/android/app/src/main/AndroidManifest.xml b/xwords4/android/app/src/main/AndroidManifest.xml
index 3a03fbc78..6916ec874 100644
--- a/xwords4/android/app/src/main/AndroidManifest.xml
+++ b/xwords4/android/app/src/main/AndroidManifest.xml
@@ -55,7 +55,7 @@
 
     <activity android:name="MainActivity"
               android:label="@string/app_name"
-              android:launchMode="standard"
+              android:launchMode="singleTask"
               >
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
@@ -67,6 +67,31 @@
         <category android:name="android.intent.category.DEFAULT" />
         <data android:mimeType="@string/xwords_nfc_mime" />
       </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="newxwgame"/>
+      </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="http"
+              android:host="@string/invite_host"
+              android:pathPrefix="@string/invite_prefix"
+              />
+      </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:mimeType="@string/invite_mime" />
+      </intent-filter>
     </activity>
 
     <activity android:name="HostActivity"
@@ -126,35 +151,6 @@
       </intent-filter>
     </receiver>
 
-    <activity android:name="DispatchNotify"
-              android:launchMode="singleTask"
-              >
-      <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="newxwgame"/>
-      </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="http"
-              android:host="@string/invite_host"
-              android:pathPrefix="@string/invite_prefix"
-              />
-      </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:mimeType="@string/invite_mime" />
-      </intent-filter>
-    </activity>
-
     <!-- downloading dicts -->
     <activity android:name=".DwnldActivity"
               android:label="@string/app_name"
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DispatchNotify.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DispatchNotify.java
deleted file mode 100644
index 456d64b8d..000000000
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DispatchNotify.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- compile-command: "find-and-gradle.sh inXw4dDeb"; -*- */
-/*
- * Copyright 2010 by Eric House (xwords@eehouse.org).  All rights
- * reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-package org.eehouse.android.xw4;
-
-import android.app.Activity;
-import android.net.Uri;
-import android.os.Bundle;
-
-public class DispatchNotify extends Activity {
-
-    @Override
-    protected void onCreate( Bundle savedInstanceState )
-    {
-        super.onCreate( savedInstanceState );
-
-        Uri data = getIntent().getData();
-        if ( null != data ) { // relay invite redirected URL case
-            GamesListDelegate.openGame( this, data );
-        }
-
-        finish();
-    } // onCreate
-}