From 49001c6893fd31188d70df580d77bd370072aab9 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Sun, 11 May 2014 19:55:05 -0700
Subject: [PATCH] various changes so dbg and bt versions build again -- and may
 work, but that's not tested yet.

---
 .../android/XWords4-bt/AndroidManifest.xml    | 21 ++++-
 xwords4/android/XWords4-bt/archive/.gitignore |  1 +
 xwords4/android/XWords4-bt/build.xml          | 91 +++++--------------
 .../android/XWords4-bt/res/layout/.gitignore  |  2 +
 .../android/XWords4-bt/res/menu/.gitignore    |  1 +
 .../res_src/values-ba_CK/.gitignore           |  1 +
 .../res_src/values-ca_PS/.gitignore           |  1 +
 .../src/org/eehouse/android/xw4bt/.gitignore  | 17 ++++
 .../src/org/eehouse/android/xw4bt/XWApp.java  | 24 ++++-
 .../org/eehouse/android/xw4bt/loc/.gitignore  |  9 ++
 .../android/XWords4-dbg/AndroidManifest.xml   |  4 +-
 .../android/XWords4-dbg/archive/.gitignore    |  1 +
 xwords4/android/XWords4-dbg/build.xml         | 22 ++++-
 .../res_src/values-ba_CK/.gitignore           |  1 +
 .../res_src/values-ca_PS/.gitignore           |  1 +
 .../src/org/eehouse/android/xw4dbg/.gitignore |  5 +
 .../org/eehouse/android/xw4dbg/loc/.gitignore |  1 +
 xwords4/android/scripts/common_targets.xml    | 16 ++--
 18 files changed, 127 insertions(+), 92 deletions(-)
 create mode 100644 xwords4/android/XWords4-bt/archive/.gitignore
 create mode 100644 xwords4/android/XWords4-bt/res_src/values-ba_CK/.gitignore
 create mode 100644 xwords4/android/XWords4-bt/res_src/values-ca_PS/.gitignore
 create mode 100644 xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/loc/.gitignore
 create mode 100644 xwords4/android/XWords4-dbg/archive/.gitignore
 create mode 100644 xwords4/android/XWords4-dbg/res_src/values-ba_CK/.gitignore
 create mode 100644 xwords4/android/XWords4-dbg/res_src/values-ca_PS/.gitignore

diff --git a/xwords4/android/XWords4-bt/AndroidManifest.xml b/xwords4/android/XWords4-bt/AndroidManifest.xml
index f373f84b1..5606d1d83 100644
--- a/xwords4/android/XWords4-bt/AndroidManifest.xml
+++ b/xwords4/android/XWords4-bt/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.xw4bt"
-          android:versionCode="72"
+          android:versionCode="76"
           android:versionName="@string/app_version"
           >
 
@@ -69,7 +69,7 @@
                android:name=".XWApp"
                >
 
-    <activity android:name="GamesList" 
+    <activity android:name="GamesListActivity" 
               android:label="@string/app_name"
               android:launchMode="standard"
               android:configChanges="keyboardHidden|orientation|screenSize"
@@ -102,10 +102,10 @@
     <activity android:name="SMSInviteActivity"
               android:theme="@android:style/Theme.Dialog"
               android:configChanges="keyboardHidden|orientation|screenSize"
-              android:screenOrientation="portrait"
+              android:screenOrientation="sensor"
               />
 
-    <activity android:name="GameConfig"
+    <activity android:name="GameConfigActivity"
               android:screenOrientation="sensor"
               android:configChanges="keyboardHidden|orientation|screenSize"
               >
@@ -130,7 +130,7 @@
               android:theme="@android:style/Theme.Dialog"
               />
 
-    <activity android:name="StudyList"
+    <activity android:name="StudyListActivity"
               android:configChanges="keyboardHidden|orientation|screenSize"
               />
 
@@ -197,6 +197,9 @@
     <activity android:name="ChatActivity"
               android:configChanges="keyboardHidden|orientation|screenSize"
               />
+    <activity android:name=".loc.LocActivity"
+              android:configChanges="keyboardHidden|orientation|screenSize"
+              />
 
     <service android:name="RelayService"/>
 
@@ -226,6 +229,14 @@
       <intent-filter android:priority="999" >
         <action android:name="android.provider.Telephony.SMS_RECEIVED" />
       </intent-filter>
+
+      <intent-filter>
+        <action android:name="android.intent.action.DATA_SMS_RECEIVED" /> 
+        <data android:scheme="sms" /> 
+        <data android:port="3344" /> 
+        <data android:host="*" /> 
+      </intent-filter> 
+
     </receiver>
 
     <service android:name="SMSService"/>
diff --git a/xwords4/android/XWords4-bt/archive/.gitignore b/xwords4/android/XWords4-bt/archive/.gitignore
new file mode 100644
index 000000000..d91be1b56
--- /dev/null
+++ b/xwords4/android/XWords4-bt/archive/.gitignore
@@ -0,0 +1 @@
+/R.java
diff --git a/xwords4/android/XWords4-bt/build.xml b/xwords4/android/XWords4-bt/build.xml
index 22bb420e3..7bd84347c 100644
--- a/xwords4/android/XWords4-bt/build.xml
+++ b/xwords4/android/XWords4-bt/build.xml
@@ -39,6 +39,9 @@
          application and should be checked into Version Control Systems. -->
     <loadproperties srcFile="project.properties" />
 
+    <!-- An attempt to define stuff to be included from multiple build.xml files -->
+    <import file="../scripts/common_targets.xml" />
+
     <!-- quick check on sdk.dir -->
     <fail
             message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
@@ -49,78 +52,26 @@
 <!-- extension targets. Uncomment the ones where you want to do custom work
      in between standard targets -->
 
-    <property name="INITIAL_CLIENT_VERS" value="3"/>
+    <property name="INITIAL_CLIENT_VERS" value="4"/>
+    <property name="VARIANT_NAME" value="xw4bt"/>
+
     <target name="-pre-clean">
-        <exec dir="." executable="../scripts/ndksetup.sh" output="/dev/null">
-            <arg value="${build.target}"/>
-        </exec>
-        <exec dir="." executable="../scripts/ndkbuild.sh" output="/dev/null">
-            <arg value="clean"/>
-        </exec>
-
-        <exec dir="." executable="../scripts/mkimages.sh" 
-              failonerror="true" >
-          <arg value="--clean"/>
-        </exec>
-      </target>
-
-    <target name="-pre-build">
-        <exec dir="." executable="../scripts/mkvariant.sh" failonerror="true"
-              output="/dev/null">
-            <arg value="--variant-name"/>
-            <arg value="xw4bt"/>
-            <arg value="--app-name"/>
-            <arg value="cWords-BT"/>
-            <arg value="--dest-dir"/>
-            <arg value="./res"/>
-            <arg value="--dest-dir"/>
-            <arg value="./src"/>
-            <arg value="--dest-dir"/>
-            <arg value="./jni"/>
-            <arg value="--dest-dir"/>
-            <arg value="./assets"/>
-            <arg value="--dest-dir"/>
-            <arg value="./libs"/>
-            <arg value="--dest-dir"/>
-            <arg value="./img_src"/>
-        </exec>
-        <exec dir="." executable="../scripts/ndksetup.sh" output="/dev/null">
-            <arg value="${build.target}"/>
-        </exec>
-
-        <property name="CHAT_ENABLED" value="true" />
-        <property name="THUMBNAIL_ENABLED" value="true" />
-        <exec dir="." executable="../scripts/ndkbuild.sh" failonerror="true">
-            <arg value="BUILD_TARGET=${build.target}" />
-            <arg value="-j3"/>
-            <arg value="INITIAL_CLIENT_VERS=${INITIAL_CLIENT_VERS}" />
-            <arg value="CHAT_ENABLED=${CHAT_ENABLED}" />
-            <arg value="THUMBNAIL_ENABLED=${THUMBNAIL_ENABLED}" />
-        </exec>
-
-        <exec dir="." executable="../scripts/mkimages.sh" 
-              failonerror="true" output="/dev/null" 
-              />
-
-        <exec dir="." executable="../scripts/mk_xml.py" 
-              failonerror="true" output="/dev/null" 
-              >
-        </exec>
-
-        <exec dir="." executable="../scripts/gen_gcmid.sh"
-              output="src/org/eehouse/android/xw4bt/GCMConsts.java"
-              failonerror="true" logError="true"
-              >
-          <arg value="xw4bt"/>
-        </exec>
-        <exec dir=".." executable="./scripts/genvers.sh" output="/dev/null">
-            <arg value="XWords4-bt"/>
-            <arg value="xw4bt"/>
-            <arg value="${INITIAL_CLIENT_VERS}" />
-            <arg value="${CHAT_ENABLED}" />
-            <arg value="${THUMBNAIL_ENABLED}" />
-        </exec>
+        <antcall target="my-pre-clean" />
     </target>
+
+    <target name="-pre-build" depends="my-copy-src">
+        <antcall target="my-pre-build">
+            <param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
+            <param name="APP_NAME" value="cWords-BT"/>
+        </antcall>
+    </target>
+
+    <target name="-pre-compile">
+        <antcall target="my-pre-compile">
+            <param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
+        </antcall>
+    </target>
+
 <!--
     <target name="-pre-compile">
     </target>
diff --git a/xwords4/android/XWords4-bt/res/layout/.gitignore b/xwords4/android/XWords4-bt/res/layout/.gitignore
index 63c9860b8..a8ef907f3 100644
--- a/xwords4/android/XWords4-bt/res/layout/.gitignore
+++ b/xwords4/android/XWords4-bt/res/layout/.gitignore
@@ -32,3 +32,5 @@ smsinviter.xml
 confirm_sms.xml
 game_list_group.xml
 studylist.xml
+loc_list_item.xml
+loc_main.xml
diff --git a/xwords4/android/XWords4-bt/res/menu/.gitignore b/xwords4/android/XWords4-bt/res/menu/.gitignore
index 94293912d..4ca7aeaa6 100644
--- a/xwords4/android/XWords4-bt/res/menu/.gitignore
+++ b/xwords4/android/XWords4-bt/res/menu/.gitignore
@@ -5,3 +5,4 @@ games_list_item_menu.xml
 games_list_menu.xml
 dicts_menu.xml
 studylist.xml
+loc_menu.xml
diff --git a/xwords4/android/XWords4-bt/res_src/values-ba_CK/.gitignore b/xwords4/android/XWords4-bt/res_src/values-ba_CK/.gitignore
new file mode 100644
index 000000000..1e28ff4b4
--- /dev/null
+++ b/xwords4/android/XWords4-bt/res_src/values-ba_CK/.gitignore
@@ -0,0 +1 @@
+/strings.xml
diff --git a/xwords4/android/XWords4-bt/res_src/values-ca_PS/.gitignore b/xwords4/android/XWords4-bt/res_src/values-ca_PS/.gitignore
new file mode 100644
index 000000000..1e28ff4b4
--- /dev/null
+++ b/xwords4/android/XWords4-bt/res_src/values-ca_PS/.gitignore
@@ -0,0 +1 @@
+/strings.xml
diff --git a/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/.gitignore b/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/.gitignore
index 9ce697cf8..c5f484985 100644
--- a/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/.gitignore
+++ b/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/.gitignore
@@ -85,3 +85,20 @@ DlgID.java
 GamesListActivity.java
 GamesListDelegate.java
 LookupAlert.java
+BoardDelegate.java
+BTInviteDelegate.java
+ChatDelegate.java
+DictBrowseDelegate.java
+DictImportDelegate.java
+DictsDelegate.java
+DrawSelDelegate.java
+GameConfigActivity.java
+GameConfigDelegate.java
+InviteDelegate.java
+ListDelegateBase.java
+NewGameDelegate.java
+PrefsDelegate.java
+RelayGameDelegate.java
+SMSInviteDelegate.java
+StudyListActivity.java
+StudyListDelegate.java
diff --git a/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/XWApp.java b/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/XWApp.java
index 6be71ac82..8460bc785 100644
--- a/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/XWApp.java
+++ b/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/XWApp.java
@@ -1,4 +1,4 @@
-/* -*- compile-command: "cd ../../../../../; ant debug install"; -*- */
+/* -*- compile-command: "find-and-ant.sh debug install"; -*- */
 /*
  * Copyright 2010 - 2011 by Eric House (xwords@eehouse.org).  All
  * rights reserved.
@@ -24,6 +24,8 @@ import android.app.Application;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
+import android.preference.PreferenceManager;
+
 import java.util.UUID;
 
 import org.eehouse.android.xw4bt.jni.XwJNI;
@@ -62,6 +64,17 @@ public class XWApp extends Application {
         ConnStatusHandler.loadState( this );
 
         RelayReceiver.RestartTimer( this );
+
+        boolean mustCheck = Utils.firstBootThisVersion( this );
+        PreferenceManager.setDefaultValues( this, R.xml.xwprefs, mustCheck );
+        if ( mustCheck ) {
+            XWPrefs.setHaveCheckedUpgrades( this, false );
+        } else {
+            mustCheck = ! XWPrefs.getHaveCheckedUpgrades( this );
+        }
+        if ( mustCheck ) {
+            UpdateCheckReceiver.checkVersions( this, false );
+        }
         UpdateCheckReceiver.restartTimer( this );
 
         BTService.startService( this );
@@ -70,6 +83,15 @@ public class XWApp extends Application {
         GCMIntentService.init( this );
     }
 
+    // This is called on emulator only, but good for ensuring no memory leaks
+    // by forcing JNI cleanup
+    public void onTerminate()
+    {
+        DbgUtils.logf( "XwApp.onTerminate() called" );
+        XwJNI.cleanGlobals();
+        super.onTerminate();
+    }
+
     public static UUID getAppUUID()
     {
         if ( null == s_UUID ) {
diff --git a/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/loc/.gitignore b/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/loc/.gitignore
new file mode 100644
index 000000000..973460c68
--- /dev/null
+++ b/xwords4/android/XWords4-bt/src/org/eehouse/android/xw4bt/loc/.gitignore
@@ -0,0 +1,9 @@
+LocActivity.java
+LocDelegate.java
+LocIDsData.java
+LocIDs.java
+LocListAdapter.java
+LocListItem.java
+LocSearcher.java
+LocUtils.java
+XlatingSpinnerAdapter.java
diff --git a/xwords4/android/XWords4-dbg/AndroidManifest.xml b/xwords4/android/XWords4-dbg/AndroidManifest.xml
index a4bfba6a1..8351506bb 100644
--- a/xwords4/android/XWords4-dbg/AndroidManifest.xml
+++ b/xwords4/android/XWords4-dbg/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.xw4dbg"
-          android:versionCode="73"
+          android:versionCode="76"
           android:versionName="@string/app_version"
           >
 
@@ -100,7 +100,7 @@
     <activity android:name="SMSInviteActivity"
               android:theme="@android:style/Theme.Dialog"
               android:configChanges="keyboardHidden|orientation|screenSize"
-              android:screenOrientation="portrait"
+              android:screenOrientation="sensor"
               />
 
     <activity android:name="GameConfigActivity"
diff --git a/xwords4/android/XWords4-dbg/archive/.gitignore b/xwords4/android/XWords4-dbg/archive/.gitignore
new file mode 100644
index 000000000..d91be1b56
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/archive/.gitignore
@@ -0,0 +1 @@
+/R.java
diff --git a/xwords4/android/XWords4-dbg/build.xml b/xwords4/android/XWords4-dbg/build.xml
index 3d30da91e..dd73d82c4 100644
--- a/xwords4/android/XWords4-dbg/build.xml
+++ b/xwords4/android/XWords4-dbg/build.xml
@@ -52,16 +52,28 @@
 <!-- extension targets. Uncomment the ones where you want to do custom work
      in between standard targets -->
 
-    <property name="INITIAL_CLIENT_VERS" value="3"/>
-    <target name="-pre-clean" depends="my-pre-clean"/>
+    <property name="INITIAL_CLIENT_VERS" value="4"/>
     <property name="VARIANT_NAME" value="xw4dbg"/>
-    <property name="APP_NAME" value="cWords-DBG"/>
-    <target name="-pre-build" depends="my-copy-src,my-pre-build"/>
+    <target name="-pre-clean">
+        <antcall target="my-pre-clean" />
+    </target>
+
+    <target name="-pre-build" depends="my-copy-src">
+        <antcall target="my-pre-build">
+            <param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
+            <param name="APP_NAME" value="cWords-DBG"/>
+        </antcall>
+    </target>
+
+    <target name="-pre-compile">
+        <antcall target="my-pre-compile">
+            <param name="VARIANT_NAME" value="${VARIANT_NAME}"/>
+        </antcall>
+    </target>
 
 <!--
     <target name="-pre-compile">
     </target>
-
     /* This is typically used for code obfuscation.
        Compiled code location: ${out.classes.absolute.dir}
        If this is not done in place, override ${out.dex.input.absolute.dir} */
diff --git a/xwords4/android/XWords4-dbg/res_src/values-ba_CK/.gitignore b/xwords4/android/XWords4-dbg/res_src/values-ba_CK/.gitignore
new file mode 100644
index 000000000..1e28ff4b4
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/res_src/values-ba_CK/.gitignore
@@ -0,0 +1 @@
+/strings.xml
diff --git a/xwords4/android/XWords4-dbg/res_src/values-ca_PS/.gitignore b/xwords4/android/XWords4-dbg/res_src/values-ca_PS/.gitignore
new file mode 100644
index 000000000..1e28ff4b4
--- /dev/null
+++ b/xwords4/android/XWords4-dbg/res_src/values-ca_PS/.gitignore
@@ -0,0 +1 @@
+/strings.xml
diff --git a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
index 8745c2ff2..75083a1f0 100644
--- a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
+++ b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
@@ -102,3 +102,8 @@ NewGameDelegate.java
 RelayGameDelegate.java
 StudyListActivity.java
 StudyListDelegate.java
+BTInviteDelegate.java
+InviteDelegate.java
+ListDelegateBase.java
+PrefsDelegate.java
+SMSInviteDelegate.java
diff --git a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/loc/.gitignore b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/loc/.gitignore
index 22850ee84..973460c68 100644
--- a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/loc/.gitignore
+++ b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/loc/.gitignore
@@ -6,3 +6,4 @@ LocListAdapter.java
 LocListItem.java
 LocSearcher.java
 LocUtils.java
+XlatingSpinnerAdapter.java
diff --git a/xwords4/android/scripts/common_targets.xml b/xwords4/android/scripts/common_targets.xml
index a5602d46c..41f105b0a 100644
--- a/xwords4/android/scripts/common_targets.xml
+++ b/xwords4/android/scripts/common_targets.xml
@@ -3,18 +3,16 @@
 <project name="XWords4">
 
     <target name="my-pre-clean">
+        <exec dir="." executable="../scripts/rm-non-git.sh" output="/dev/null" 
+	          failonerror="true" >
+          <arg value="--except" />
+          <arg value="./local.properties" />
+        </exec>
+
         <exec dir="." executable="../scripts/ndksetup.sh" output="/dev/null" 
 	          failonerror="true" >
             <arg value="${build.target}"/>
         </exec>
-        <exec dir="." executable="../scripts/ndkbuild.sh" failonerror="true" >
-            <arg value="clean"/>
-        </exec>
-
-        <exec dir="." executable="../scripts/mkimages.sh" 
-              failonerror="true" output="/dev/null" >
-            <arg value="--clean"/>
-        </exec>
     </target>
 
     <target name="my-pre-build">
@@ -54,7 +52,7 @@
               >
           <arg value="${VARIANT_NAME}"/>
           </exec>
-        <exec dir="." executable="../scripts/genvers.sh" output="ant_out.txt" 
+        <exec dir="." executable="../scripts/genvers.sh" output="/dev/null" 
               failonerror="true">
           <arg value="${VARIANT_NAME}"/>
           <arg value="${INITIAL_CLIENT_VERS}" />