From 0d6b5914b9a697aa491de3efc2837bd60b3c0b47 Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Fri, 16 Dec 2011 19:02:20 -0800
Subject: [PATCH 01/13] revert to standard launchMode to get proper
 from-Launcher behavior and specify a pair of flags when background-launching
 GamesList that strips any stack it has and doesn't launch a new instance. 
 Seems to fix the problems with launching from notifications and invite
 emails. But then I've thought this fixed before.

---
 xwords4/android/XWords4/AndroidManifest.xml   |  2 +-
 .../eehouse/android/xw4/DispatchNotify.java   | 27 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/xwords4/android/XWords4/AndroidManifest.xml b/xwords4/android/XWords4/AndroidManifest.xml
index 701dd4189..7381d8a88 100644
--- a/xwords4/android/XWords4/AndroidManifest.xml
+++ b/xwords4/android/XWords4/AndroidManifest.xml
@@ -43,7 +43,7 @@
 
     <activity android:name="GamesList" 
               android:label="@string/title_games_list"
-              android:launchMode="singleTop"
+              android:launchMode="standard"
               android:configChanges="keyboardHidden|orientation"
               >
       <intent-filter>
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
index 4455b12a1..f86dc281c 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
@@ -67,22 +67,19 @@ public class DispatchNotify extends Activity {
             DbgUtils.logf( "DispatchNotify: nothing running" );
             Intent intent = new Intent( this, GamesList.class );
 
-            /* Flags.  Tried Intent.FLAG_ACTIVITY_NEW_TASK.  I don't
-             * remember what it fixes, but what it breaks is easy to
-             * duplicate.  Launch Crosswords from the home screen making
-             * sure it's the only instance running.  Get a networked game
-             * going, and with BoardActivity frontmost check the relay and
-             * select a relay notification.  New BoardActivity will come
-             * up, but if you hit home button then Crosswords icon you're
-             * back to games list.  Hit back button and you're back to
-             * BoardActivity, and back from there back to GamesList.
-             * That's because a new activity came up from the activity
-             * below thanks to the flag.
-             */
+            // This combination of flags will bring an existing
+            // GamesList instance to the front, killing any children
+            // it has, or create a new one if none exists.  Coupled
+            // with a "standard" launchMode it seems to work, meaning
+            // both that the app preserves its stack in normal use
+            // (you can go to Home with a stack of activities and
+            // return to the top activity on that stack if you
+            // relaunch the app) and that when I launch from here the
+            // stack gets nuked and we don't get a second GamesList
+            // instance.
 
             intent.setFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP
-                             // Intent.FLAG_ACTIVITY_NEW_TASK NO See above
-                             );
+                             | Intent.FLAG_ACTIVITY_SINGLE_TOP );
             if ( null != relayIDs ) {
                 intent.putExtra( RELAYIDS_EXTRA, relayIDs );
             } else if ( null != data ) {
@@ -128,6 +125,7 @@ public class DispatchNotify extends Activity {
                 }
             }
         }
+        DbgUtils.logf( "tryHandle(%s)=>%b", data.toString(), handled );
         return handled;
     }
 
@@ -148,6 +146,7 @@ public class DispatchNotify extends Activity {
                 }
             }
         }
+        DbgUtils.logf( "tryHandle(%s)=>%b", relayIDs.toString(), handled );
         return handled;
     }
 }

From a86ffa39bad4a6f4a19e6db21fd70c38c94d3d4a Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Fri, 16 Dec 2011 20:59:40 -0800
Subject: [PATCH 02/13] up strings for next beta

---
 xwords4/android/XWords4/AndroidManifest.xml   |  2 +-
 xwords4/android/XWords4/res/raw/changes       | 21 +------------------
 .../XWords4/res/values/common_rsrc.xml        |  2 +-
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/xwords4/android/XWords4/AndroidManifest.xml b/xwords4/android/XWords4/AndroidManifest.xml
index 7381d8a88..695d4b152 100644
--- a/xwords4/android/XWords4/AndroidManifest.xml
+++ b/xwords4/android/XWords4/AndroidManifest.xml
@@ -22,7 +22,7 @@
      to come from a domain that you own or have control over. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.eehouse.android.xw4"
-          android:versionCode="31"
+          android:versionCode="32"
           android:versionName="@string/app_version"
           >
 
diff --git a/xwords4/android/XWords4/res/raw/changes b/xwords4/android/XWords4/res/raw/changes
index bd9a6859f..f0dd5b2fe 100644
--- a/xwords4/android/XWords4/res/raw/changes
+++ b/xwords4/android/XWords4/res/raw/changes
@@ -6,27 +6,8 @@
 </head>
 <body>
 
-<b>Crosswords 4.4 beta 39 release</b>
+<b>Crosswords 4.4 beta 40 release</b>
 <ul>
-
-  <li>Add "email author" menuitem to Games List screen.  Please 
-  do!</li>
-  
-  <li>Enable pinch-to-zoom for board</li>
-
-  <li>Improve wordlist browser to filter by size, have larger 
-  text, and not barf when given empty wordlist</li>
-
-  <li>Add value/letter toggle button since space isn't so precious 
-  now (and remove menuitem)</li>
-
-  <li>Add Setting checkbox to disable crosshairs</li>
-
-  <li>Replace Restore menus in Settings with buttons</li>
-
-  <li>Fix problem with text color in word lookup dialog on HTC 
-  MyTouch</li>
-  
 </ul>
 
 <p>Please remember that this is beta software.  Please let me know (at 
diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/XWords4/res/values/common_rsrc.xml
index 5736b1f99..5975b6bcd 100644
--- a/xwords4/android/XWords4/res/values/common_rsrc.xml
+++ b/xwords4/android/XWords4/res/values/common_rsrc.xml
@@ -3,7 +3,7 @@
 <!-- Resources in this file do not require localization -->
 <resources>
 
-  <string name="app_version">4.4 beta 39</string>
+  <string name="app_version">4.4 beta 40</string>
 
   <!-- prefs keys -->
   <string name="key_color_tiles">key_color_tiles</string>

From dd8da6d312e8ff73bb8645b5374fe48e1b277c70 Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Sun, 18 Dec 2011 12:22:06 -0800
Subject: [PATCH 03/13] tweak wording

---
 xwords4/android/XWords4/res/values/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 229ad3354..17388763b 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -525,8 +525,7 @@
     <string name="button_trade_commit">Commit exchange</string>
     <string name="button_trade_cancel">Cancel exchange</string>
 
-    <string name="entering_trade">Tap to select tiles...</string>
-
+    <string name="entering_trade">Tap tiles to select...</string>
 
 
     <!-- Bonus value hint that's displayed in gray text in the colored

From c2c2c7e766031e71f52affc3e6593335181e5c0e Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Sun, 18 Dec 2011 12:23:00 -0800
Subject: [PATCH 04/13] NEW_TASK plus CLEAR_TOP is the magic combination --
 says one set of docs.  Looks good so far.

---
 .../XWords4/src/org/eehouse/android/xw4/DispatchNotify.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
index f86dc281c..4628341f4 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
@@ -79,7 +79,7 @@ public class DispatchNotify extends Activity {
             // instance.
 
             intent.setFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP
-                             | Intent.FLAG_ACTIVITY_SINGLE_TOP );
+                             | Intent.FLAG_ACTIVITY_NEW_TASK );
             if ( null != relayIDs ) {
                 intent.putExtra( RELAYIDS_EXTRA, relayIDs );
             } else if ( null != data ) {

From d03fc77990c90bfa3ac3ab922db5705b5ec14475 Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Sun, 18 Dec 2011 12:27:13 -0800
Subject: [PATCH 05/13] list changes for next release

---
 xwords4/android/XWords4/res/raw/changes | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xwords4/android/XWords4/res/raw/changes b/xwords4/android/XWords4/res/raw/changes
index f0dd5b2fe..511520967 100644
--- a/xwords4/android/XWords4/res/raw/changes
+++ b/xwords4/android/XWords4/res/raw/changes
@@ -8,6 +8,11 @@
 
 <b>Crosswords 4.4 beta 40 release</b>
 <ul>
+  <li>Offer choice between SMS and email for sending invitations</li>
+
+  <li>Improve handling of invitations and move notifications received</li>
+
+  <li>Make undo button easier to get to</li>
 </ul>
 
 <p>Please remember that this is beta software.  Please let me know (at 

From 431a01ef0a1efc5e2adc4d022b1a56ec354174ff Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Sun, 18 Dec 2011 15:55:54 -0800
Subject: [PATCH 06/13] remove logging I didn't mean to check in

---
 .../XWords4/src/org/eehouse/android/xw4/DispatchNotify.java     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
index 4628341f4..818ec9a77 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
@@ -125,7 +125,6 @@ public class DispatchNotify extends Activity {
                 }
             }
         }
-        DbgUtils.logf( "tryHandle(%s)=>%b", data.toString(), handled );
         return handled;
     }
 
@@ -146,7 +145,6 @@ public class DispatchNotify extends Activity {
                 }
             }
         }
-        DbgUtils.logf( "tryHandle(%s)=>%b", relayIDs.toString(), handled );
         return handled;
     }
 }

From 8eaeb9c2d00c470bf01c5365b0052183d5a21e37 Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Sun, 18 Dec 2011 16:23:14 -0800
Subject: [PATCH 07/13] reword SMS invite so URL isn't split across messages
 (which makes it not recognized by recipient as a clickable URL).

---
 xwords4/android/XWords4/res/values/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 17388763b..a94ec2851 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -1198,9 +1198,9 @@
     <!-- This is the body of the text version of the invitation. A URL
          is created with parameters describing the game and
          substituted for "%1$s".-->
-    <string name="invite_txtf">Play Crosswords? Join this
-      game: %1$s . (But install Crosswords first if you haven\'t:
-      http://eehouse.org/market_redir.php ).</string>
+    <string name="invite_txtf">Play Crosswords? Join this game: %1$s
+      . (But install Crosswords http://eehouse.org/market_redir.php
+      first if you haven\'t.)</string>
 
     <!-- When I've created the invitation, in text or html, I ask
          Android to launch an app that can send it, typically an email

From 9a26ccf1c81d8a7d66bd669da2d58b5b2c2e822b Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Tue, 20 Dec 2011 17:10:41 -0800
Subject: [PATCH 08/13] prevent long names from forcing linewrap

---
 xwords4/android/XWords4/res/layout/player_list_elem.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xwords4/android/XWords4/res/layout/player_list_elem.xml b/xwords4/android/XWords4/res/layout/player_list_elem.xml
index 3e7ab728a..d17dbf102 100644
--- a/xwords4/android/XWords4/res/layout/player_list_elem.xml
+++ b/xwords4/android/XWords4/res/layout/player_list_elem.xml
@@ -8,11 +8,13 @@
   <TextView android:id="@+id/item_name"
             android:layout_width="wrap_content" 
 	        android:layout_height="wrap_content"
+            android:singleLine="true"
 	        android:gravity="left"
             />
   <TextView android:id="@+id/item_score"
             android:layout_width="fill_parent" 
 	        android:layout_height="wrap_content"
+            android:singleLine="true"
 	        android:gravity="right"
             />
 </LinearLayout>

From 6cc1a2d672598609c34aad05f658da09ac465047 Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Tue, 20 Dec 2011 17:12:23 -0800
Subject: [PATCH 09/13] Add new column and up db version number.

---
 .../XWords4/src/org/eehouse/android/xw4/DBHelper.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java
index f3ded5232..69934a3f9 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java
@@ -29,7 +29,7 @@ public class DBHelper extends SQLiteOpenHelper {
     public static final String TABLE_NAME_SUM = "summaries";
     public static final String TABLE_NAME_OBITS = "obits";
     private static final String DB_NAME = "xwdb";
-    private static final int DB_VERSION = 10;
+    private static final int DB_VERSION = 11;
 
     public static final String GAME_NAME = "GAME_NAME";
     public static final String NUM_MOVES = "NUM_MOVES";
@@ -55,6 +55,7 @@ public class DBHelper extends SQLiteOpenHelper {
     public static final String CONTYPE = "CONTYPE";
     public static final String SERVERROLE = "SERVERROLE";
     public static final String ROOMNAME = "ROOMNAME";
+    public static final String INVITEID = "INVITEID";
     public static final String RELAYID = "RELAYID";
     public static final String SEED = "SEED";
     public static final String SMSPHONE = "SMSPHONE";
@@ -85,6 +86,7 @@ public class DBHelper extends SQLiteOpenHelper {
                     + SERVERROLE + " INTEGER,"
                     + CONTYPE    + " INTEGER,"
                     + ROOMNAME   + " TEXT,"
+                    + INVITEID   + " TEXT,"
                     + RELAYID    + " TEXT,"
                     + SEED       + " INTEGER,"
                     + DICTLANG   + " INTEGER,"
@@ -147,6 +149,9 @@ public class DBHelper extends SQLiteOpenHelper {
             db.execSQL( "ALTER TABLE " + TABLE_NAME_SUM  +
                         " ADD COLUMN " + DICTLIST + " TEXT;" );
         case 10:
+            db.execSQL( "ALTER TABLE " + TABLE_NAME_SUM  +
+                        " ADD COLUMN " + INVITEID + " TEXT;" );
+        case 11:
             // nothing yet
             break;
         default:

From f40174ea30abf43e54b4765c06ddc2c4043fc89f Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Tue, 20 Dec 2011 17:14:21 -0800
Subject: [PATCH 10/13] update to add new optional param -- invite ID

---
 xwords4/android/scripts/newgame.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/scripts/newgame.php b/xwords4/android/scripts/newgame.php
index 68c0e6fb4..a626d1a05 100644
--- a/xwords4/android/scripts/newgame.php
+++ b/xwords4/android/scripts/newgame.php
@@ -9,6 +9,12 @@ $host = "10.0.2.2";
 $lang = $_REQUEST["lang"];
 $room = $_REQUEST["room"];
 $np = $_REQUEST["np"];
+$id = $_REQUEST["id"];
+
+$content = "0; url=$scheme://$host?room=$room&lang=$lang&np=$np";
+if ( $id != "" ) {
+    $content .= "&id=$id";
+}
 
 print <<<EOF
 
@@ -17,7 +23,7 @@ print <<<EOF
 <head>
 <title>Crosswords SMS redirect</title>
 <meta http-equiv="REFRESH"
-    content="0;url=$scheme://$host?room=$room&lang=$lang&np=$np">
+    content="$content">
 </head>
     <body>
 

From 9023806b5fa085edfbdb834b965d56d3d1f5c6ff Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Tue, 20 Dec 2011 17:24:38 -0800
Subject: [PATCH 11/13] cleanup: move instanceof/cast from use of vector
 elements to addition of elements to save memory and time.

---
 .../eehouse/android/xw4/DispatchNotify.java   | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
index 818ec9a77..b123da272 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
@@ -41,7 +41,8 @@ public class DispatchNotify extends Activity {
         void HandleInvite( final Uri invite );
     }
 
-    private static HashSet<Activity> s_running = new HashSet<Activity>();
+    private static HashSet<HandleRelaysIface> s_running =
+        new HashSet<HandleRelaysIface>();
     private static HandleRelaysIface s_handler;
 
     @Override
@@ -95,12 +96,16 @@ public class DispatchNotify extends Activity {
 
     public static void SetRunning( Activity running )
     {
-        s_running.add( running );
+        if ( running instanceof HandleRelaysIface ) {
+            s_running.add( (HandleRelaysIface)running );
+        }
     }
 
     public static void ClearRunning( Activity running )
     {
-        s_running.remove( running );
+        if ( running instanceof HandleRelaysIface ) {
+            s_running.remove( (HandleRelaysIface)running );
+        }
     }
 
     public static void SetRelayIDsHandler( HandleRelaysIface iface )
@@ -116,13 +121,9 @@ public class DispatchNotify extends Activity {
             s_handler.HandleInvite( data );
             handled = true;
         } else {
-            for ( Activity activity : s_running ) {
-                if ( activity instanceof DispatchNotify.HandleRelaysIface ) {
-                    DispatchNotify.HandleRelaysIface iface =
-                        (DispatchNotify.HandleRelaysIface)activity;
-                    iface.HandleInvite( data );
-                    handled = true;
-                }
+            for ( HandleRelaysIface iface : s_running ) {
+                iface.HandleInvite( data );
+                handled = true;
             }
         }
         return handled;
@@ -136,13 +137,9 @@ public class DispatchNotify extends Activity {
             s_handler.HandleRelaysIDs( relayIDs );
             handled = true;
         } else {
-            for ( Activity activity : s_running ) {
-                if ( activity instanceof DispatchNotify.HandleRelaysIface ) {
-                    DispatchNotify.HandleRelaysIface iface =
-                        (DispatchNotify.HandleRelaysIface)activity;
-                    iface.HandleRelaysIDs( relayIDs );
-                    handled = true;
-                }
+            for ( HandleRelaysIface iface : s_running ) {
+                iface.HandleRelaysIDs( relayIDs );
+                handled = true;
             }
         }
         return handled;

From 3e42c680911197e4cc8c47503d0564aacf8d0df7 Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Tue, 20 Dec 2011 17:29:05 -0800
Subject: [PATCH 12/13] add randomly-generated inviteID to set of params
 transmitted with an invitation and stored in a summary.  On receipe of an
 invitation, if the room/inviteID exists just drop it -- don't even bring app
 to the foreground.  This is meant to stop people from getting lots of
 games/warnings about dupes if they happen to trigger a refresh of the
 negame.php page in their browsers.

---
 .../eehouse/android/xw4/BoardActivity.java    |  2 +-
 .../src/org/eehouse/android/xw4/DBUtils.java  | 32 ++++++++++----
 .../eehouse/android/xw4/DispatchNotify.java   | 10 +++--
 .../org/eehouse/android/xw4/GameUtils.java    | 42 ++++++++++++++-----
 .../org/eehouse/android/xw4/GamesList.java    | 16 +++----
 .../eehouse/android/xw4/NetLaunchInfo.java    | 36 +++++++++-------
 .../eehouse/android/xw4/NewGameActivity.java  | 12 +++---
 7 files changed, 100 insertions(+), 50 deletions(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
index ab47be6a6..9a960a678 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
@@ -670,7 +670,7 @@ public class BoardActivity extends XWActivity
             if ( DlgDelegate.DISMISS_BUTTON != which ) {
                 GameUtils.launchInviteActivity( BoardActivity.this,
                                                 DlgDelegate.EMAIL_BTN == which,
-                                                m_room,
+                                                m_room, null,
                                                 m_gi.dictLang,
                                                 m_gi.nPlayers );
             }
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
index ce6a5d529..5904c3da0 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
@@ -24,6 +24,7 @@ import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.database.Cursor;
+import android.net.Uri;
 import java.util.StringTokenizer;
 import android.content.ContentValues;
 import java.util.ArrayList;
@@ -37,6 +38,7 @@ import org.eehouse.android.xw4.jni.*;
 
 
 public class DBUtils {
+    public static final int ROWID_NOTFOUND = -1;
 
     private static final String DICTS_SEP = ",";
 
@@ -209,6 +211,12 @@ public class DBUtils {
 
     public static void saveSummary( Context context, GameUtils.GameLock lock,
                                     GameSummary summary )
+    {
+        saveSummary( context, lock, summary, null );
+    }
+
+    public static void saveSummary( Context context, GameUtils.GameLock lock,
+                                    GameSummary summary, String inviteID )
     {
         Assert.assertTrue( lock.canWrite() );
         long rowid = lock.getRowid();
@@ -233,6 +241,9 @@ public class DBUtils {
                 values.put( DBHelper.GAME_OVER, summary.gameOver );
                 values.put( DBHelper.DICTLIST, summary.dictNames(DICTS_SEP) );
                 values.put( DBHelper.HASMSGS, summary.pendingMsgLevel );
+                if ( null != inviteID ) {
+                    values.put( DBHelper.INVITEID, inviteID );
+                }
 
                 if ( null != summary.scores ) {
                     StringBuffer sb = new StringBuffer();
@@ -363,7 +374,7 @@ public class DBUtils {
 
     public static long getRowIDFor( Context context, String relayID )
     {
-        long result = -1;
+        long result = ROWID_NOTFOUND;
         initDB( context );
         synchronized( s_dbHelper ) {
             SQLiteDatabase db = s_dbHelper.getReadableDatabase();
@@ -380,18 +391,17 @@ public class DBUtils {
         return result;
     }
 
-    public static long getRowIDForOpen( Context context, String room,
-                                         int lang, int nPlayers )
+    public static long getRowIDForOpen( Context context, NetLaunchInfo nli )
     {
-        long result = -1;
+        long result = ROWID_NOTFOUND;
         initDB( context );
         synchronized( s_dbHelper ) {
             SQLiteDatabase db = s_dbHelper.getReadableDatabase();
             String[] columns = { ROW_ID };
-            String selection = DBHelper.ROOMNAME + "='" + room + "' AND "
-                // + DBHelper.INVITEID + "='" + inviteID + "' AND "
-                + DBHelper.DICTLANG + "=" + lang + " AND "
-                + DBHelper.NUM_PLAYERS + "=" + nPlayers;
+            String selection = DBHelper.ROOMNAME + "='" + nli.room + "' AND "
+                + DBHelper.INVITEID + "='" + nli.inviteID + "' AND "
+                + DBHelper.DICTLANG + "=" + nli.lang + " AND "
+                + DBHelper.NUM_PLAYERS + "=" + nli.nPlayers;
             Cursor cursor = db.query( DBHelper.TABLE_NAME_SUM, columns, 
                                       selection, null, null, null, null );
             if ( 1 == cursor.getCount() && cursor.moveToFirst() ) {
@@ -403,6 +413,12 @@ public class DBUtils {
         return result;
     }
 
+    public static boolean isNewInvite( Context context, Uri data )
+    {
+        NetLaunchInfo nli = new NetLaunchInfo( data );
+        return null != nli && -1 == getRowIDForOpen( context, nli );
+    }
+
     public static String[] getRelayIDs( Context context, boolean noMsgs ) 
     {
         String[] result = null;
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
index b123da272..7d73f7024 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
@@ -58,9 +58,13 @@ public class DispatchNotify extends Activity {
             if ( !tryHandle( relayIDs ) ) {
                 mustLaunch = true;
             }
-        } else if ( null != data ) {
-            if ( !tryHandle( data ) ) {
-                mustLaunch = true;
+        } else if ( null != data  ) {
+            if ( DBUtils.isNewInvite( this, data ) ) {
+                if ( !tryHandle( data ) ) {
+                    mustLaunch = true;
+                }
+            } else {
+                DbgUtils.logf( "DispatchNotify: dropping duplicate invite" );
             }
         }
 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
index 823e5889a..842260953 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
@@ -48,6 +48,7 @@ import org.eehouse.android.xw4.jni.CurGameInfo.DeviceRole;
 public class GameUtils {
 
     public static final String INVITED = "invited";
+    private static Random s_random = new Random();
 
     // Implements read-locks and write-locks per game.  A read lock is
     // obtainable when other read locks are granted but not when a
@@ -373,9 +374,9 @@ public class GameUtils {
         return rowid;
     }
 
-    public static long makeNewNetGame( Context context, String room, 
-                                        int[] lang, int nPlayersT, 
-                                        int nPlayersH )
+    public static long makeNewNetGame( Context context, String room,
+                                       String inviteID, int[] lang,
+                                       int nPlayersT, int nPlayersH )
     {
         long rowid = -1;
         CommsAddrRec addr = new CommsAddrRec( context );
@@ -392,32 +393,35 @@ public class GameUtils {
         rowid = saveNew( context, gi );
 
         GameLock lock = new GameLock( rowid, true ).lock();
-        applyChanges( context, gi, addr, lock, false );
+        applyChanges( context, gi, addr, inviteID, lock, false );
         lock.unlock();
 
         return rowid;
     }
 
     public static long makeNewNetGame( Context context, String room, 
-				       int lang, int nPlayers )
+                                       String inviteID, int lang, int nPlayers )
     {
         int[] langarr = { lang };
-        return makeNewNetGame( context, room, langarr, nPlayers, 1 );
+        return makeNewNetGame( context, room, inviteID, langarr, nPlayers, 1 );
     }
 
     public static long makeNewNetGame( Context context, NetLaunchInfo info )
     {
-        return makeNewNetGame( context, info.room, info.lang, 
+        return makeNewNetGame( context, info.room, info.inviteID, info.lang, 
                                info.nPlayers );
     }
 
     public static void launchInviteActivity( Context context, 
                                              boolean choseEmail,
-                                             String room, 
+                                             String room, String inviteID,
                                              int lang, int nPlayers )
     {
         Random random = new Random();
-        Uri gameUri = NetLaunchInfo.makeLaunchUri( context, room,
+        if ( null == inviteID ) {
+            inviteID = makeRandomID();
+        }
+        Uri gameUri = NetLaunchInfo.makeLaunchUri( context, room, inviteID,
                                                    lang, nPlayers );
 
         if ( null != gameUri ) {
@@ -650,8 +654,15 @@ public class GameUtils {
     }
 
     public static void applyChanges( Context context, CurGameInfo gi, 
-                                     CommsAddrRec car, GameLock lock,
+                                     CommsAddrRec car, GameLock lock, 
                                      boolean forceNew )
+    {
+        applyChanges( context, gi, car, null, lock, forceNew );
+    }
+
+    public static void applyChanges( Context context, CurGameInfo gi, 
+                                     CommsAddrRec car, String inviteID, 
+                                     GameLock lock, boolean forceNew )
     {
         // This should be a separate function, commitChanges() or
         // somesuch.  But: do we have a way to save changes to a gi
@@ -691,7 +702,7 @@ public class GameUtils {
 
         GameSummary summary = new GameSummary( context, gi );
         XwJNI.game_summarize( gamePtr, summary );
-        DBUtils.saveSummary( context, lock, summary );
+        DBUtils.saveSummary( context, lock, summary, inviteID );
 
         XwJNI.game_dispose( gamePtr );
     } // applyChanges
@@ -704,6 +715,15 @@ public class GameUtils {
         activity.startActivity( intent );
     }
 
+    public static String makeRandomID()
+    {
+        int rint = 0;
+        while ( 0 == rint ) {
+            rint = s_random.nextInt();
+        }
+        return String.format( "%X", rint ).substring( 0, 4 );
+    }
+
     private static void tellRelayDied( Context context, GameLock lock,
                                        boolean informNow )
     {
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
index c30a9a496..090c5debb 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
@@ -68,7 +68,7 @@ public class GamesList extends XWListActivity
     private static final int DELETE_GAME_ACTION = 3;
     private static final int DELETE_ALL_ACTION = 4;
     private static final int SYNC_MENU_ACTION = 5;
-    private static final int DUPE_GAME_ACTION = 6;
+    private static final int NEW_FROM_ACTION = 6;
 
     private GameListAdapter m_adapter;
     private String m_missingDict;
@@ -245,6 +245,9 @@ public class GamesList extends XWListActivity
     protected void onCreate(Bundle savedInstanceState) 
     {
         super.onCreate( savedInstanceState );
+        // scary, but worth playing with:
+        // Assert.assertTrue( isTaskRoot() );
+
         getBundledData( savedInstanceState );
 
         m_handler = new Handler();
@@ -375,7 +378,7 @@ public class GamesList extends XWListActivity
             } );
     }
 
-    public void HandleInvite( final Uri invite )
+    public void HandleInvite( Uri invite )
     {
         final NetLaunchInfo nli = new NetLaunchInfo( invite );
         if ( nli.isValid() ) {
@@ -431,7 +434,7 @@ public class GamesList extends XWListActivity
             case SYNC_MENU_ACTION:
                 doSyncMenuitem();
                 break;
-            case DUPE_GAME_ACTION:
+            case NEW_FROM_ACTION:
                 long newid = GameUtils.dupeGame( GamesList.this, m_rowid );
                 if ( null != m_adapter ) {
                     m_adapter.inval( newid );
@@ -584,7 +587,7 @@ public class GamesList extends XWListActivity
                 case R.id.list_item_new_from:
                     showNotAgainDlgThen( R.string.not_again_newfrom,
                                          R.string.key_notagain_newfrom, 
-                                         DUPE_GAME_ACTION );
+                                         NEW_FROM_ACTION );
                     break;
 
                 case R.id.list_item_copy:
@@ -682,10 +685,9 @@ public class GamesList extends XWListActivity
 
     private void startNewNetGame( NetLaunchInfo info )
     {
-        long rowid = DBUtils.getRowIDForOpen( this, info.room, info.lang, 
-                                              info.nPlayers );
+        long rowid = DBUtils.getRowIDForOpen( this, info );
 
-        if ( -1 == rowid ) {    // doesn't exist yet
+        if ( DBUtils.ROWID_NOTFOUND == rowid ) {
             rowid = GameUtils.makeNewNetGame( this, info );
             GameUtils.launchGame( this, rowid, true );
         } else {
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java
index 362995abe..3d5f415df 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java
@@ -31,11 +31,13 @@ import org.eehouse.android.xw4.jni.CommonPrefs;
 
 public class NetLaunchInfo {
     public String room;
+    public String inviteID;
     public int lang;
     public int nPlayers;
 
     private static final String LANG = "netlaunchinfo_lang";
     private static final String ROOM = "netlaunchinfo_room";
+    private static final String INVITEID = "netlaunchinfo_inviteid";
     private static final String NPLAYERS = "netlaunchinfo_nplayers";
     private static final String VALID = "netlaunchinfo_valid";
 
@@ -45,6 +47,7 @@ public class NetLaunchInfo {
     {
         bundle.putInt( LANG, lang );
         bundle.putString( ROOM, room );
+        bundle.putString( INVITEID, inviteID );
         bundle.putInt( NPLAYERS, nPlayers );
         bundle.putBoolean( VALID, m_valid );
     }
@@ -53,31 +56,18 @@ public class NetLaunchInfo {
     {
         lang = bundle.getInt( LANG  );
         room = bundle.getString( ROOM );
+        inviteID = bundle.getString( INVITEID );
         nPlayers = bundle.getInt( NPLAYERS  );
         m_valid = bundle.getBoolean( VALID  );
     }
 
-    public static Uri makeLaunchUri( Context context, String room,
-                                        int lang, int nPlayers )
-    {
-        Builder ub = new Builder();
-        ub.scheme( "http" );
-        String format = context.getString( R.string.game_url_pathf );
-        ub.path( String.format( format,
-                                CommonPrefs.getDefaultRedirHost( context ) ) );
-        
-        ub.appendQueryParameter( "lang", String.format("%d", lang ) );
-        ub.appendQueryParameter( "np", String.format( "%d", nPlayers ) );
-        ub.appendQueryParameter( "room", room );
-        return ub.build();
-    }
-
     public NetLaunchInfo( Uri data )
     {
         m_valid = false;
         if ( null != data ) {
             try {
                 room = data.getQueryParameter( "room" );
+                inviteID = data.getQueryParameter( "id" );
                 String langStr = data.getQueryParameter( "lang" );
                 lang = Integer.decode( langStr );
                 String np = data.getQueryParameter( "np" );
@@ -89,6 +79,22 @@ public class NetLaunchInfo {
         }
     }
 
+    public static Uri makeLaunchUri( Context context, String room,
+                                     String inviteID, int lang, int nPlayers )
+    {
+        Builder ub = new Builder();
+        ub.scheme( "http" );
+        String format = context.getString( R.string.game_url_pathf );
+        ub.path( String.format( format,
+                                CommonPrefs.getDefaultRedirHost( context ) ) );
+        
+        ub.appendQueryParameter( "lang", String.format("%d", lang ) );
+        ub.appendQueryParameter( "np", String.format( "%d", nPlayers ) );
+        ub.appendQueryParameter( "room", room );
+        ub.appendQueryParameter( "id", inviteID );
+        return ub.build();
+    }
+
     public boolean isValid()
     {
         return m_valid;
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java
index 83759e375..73e25cd2d 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java
@@ -116,14 +116,16 @@ public class NewGameActivity extends XWActivity {
                               boolean choseEmail )
     {
         String room = null;
+        String inviteID = null;
         long rowid;
         int[] lang = {0};
         final int nPlayers = 2; // hard-coded for no-configure case
 
         if ( networked ) {
-            Random random = new Random();
-            room = String.format( "%X", random.nextInt() ).substring( 0, 4 );
-            rowid = GameUtils.makeNewNetGame( this, room, lang, nPlayers, 1 );
+            room = GameUtils.makeRandomID();
+            inviteID = GameUtils.makeRandomID();
+            rowid = GameUtils.makeNewNetGame( this, room, inviteID, lang, 
+                                              nPlayers, 1 );
         } else {
             rowid = GameUtils.saveNew( this, new CurGameInfo( this ) );
         }
@@ -131,8 +133,8 @@ public class NewGameActivity extends XWActivity {
         if ( launch ) {
             GameUtils.launchGame( this, rowid, networked );
             if ( networked ) {
-                GameUtils.launchInviteActivity( this, choseEmail, room,
-                                                lang[0], nPlayers );
+                GameUtils.launchInviteActivity( this, choseEmail, room, 
+                                                inviteID, lang[0], nPlayers );
             }
         } else {
             GameUtils.doConfig( this, rowid, GameConfig.class );

From 0e487a4a42503b41f88b153de9360e240138f82e Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Tue, 20 Dec 2011 17:31:13 -0800
Subject: [PATCH 13/13] When creating game in response to new-from menuitem,
 juggle players if the juggle newgame preference is set.

---
 .../src/org/eehouse/android/xw4/GameUtils.java        | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
index 842260953..20465701b 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
@@ -172,7 +172,7 @@ public class GameUtils {
      * basis for a new one.
      */
     public static GameLock resetGame( Context context, GameLock lockSrc, 
-                                      GameLock lockDest )
+                                      GameLock lockDest, boolean juggle )
     {
         CurGameInfo gi = new CurGameInfo( context );
         CommsAddrRec addr = null;
@@ -199,6 +199,10 @@ public class GameUtils {
                                 CommonPrefs.get( context ), dictNames,
                                 pairs.m_bytes,  pairs.m_paths, gi.langName() );
                                 
+        if ( juggle ) {
+            gi.juggle();
+        }
+
         if ( null != addr ) {
             XwJNI.comms_setAddr( gamePtr, addr );
         }
@@ -218,7 +222,7 @@ public class GameUtils {
     {
         GameLock lock = new GameLock( rowidIn, true ).lock();
         tellRelayDied( context, lock, true );
-        resetGame( context, lock, lock );
+        resetGame( context, lock, lock, false );
         lock.unlock();
     }
 
@@ -265,8 +269,9 @@ public class GameUtils {
 
     public static long dupeGame( Context context, long rowidIn )
     {
+        boolean juggle = CommonPrefs.getAutoJuggle( context );
         GameLock lockSrc = new GameLock( rowidIn, false ).lock();
-        GameLock lockDest = resetGame( context, lockSrc, null );
+        GameLock lockDest = resetGame( context, lockSrc, null, juggle );
         long rowid = lockDest.getRowid();
         lockDest.unlock();
         lockSrc.unlock();