From 077270f1cd1a955b17abfbd6cb4730535ae77263 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 15 Oct 2012 08:29:46 -0700
Subject: [PATCH] merge in SMS-version UI -- there will not be a separate
 version for SMS any more.

---
 xwords4/android/XWords4/AndroidManifest.xml     | 17 +++++++++++++++++
 xwords4/android/XWords4/jni/Android.mk          |  1 +
 xwords4/android/XWords4/res/xml/xwprefs.xml     | 10 ++++++++++
 .../src/org/eehouse/android/xw4/XWApp.java      |  4 +++-
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/XWords4/AndroidManifest.xml b/xwords4/android/XWords4/AndroidManifest.xml
index b1fa22df3..675e2b43d 100644
--- a/xwords4/android/XWords4/AndroidManifest.xml
+++ b/xwords4/android/XWords4/AndroidManifest.xml
@@ -31,6 +31,10 @@
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
   <uses-permission android:name="android.permission.VIBRATE" />
+  <uses-permission android:name="android.permission.RECEIVE_SMS" /> 
+  <uses-permission android:name="android.permission.SEND_SMS" />
+  <uses-permission android:name="android.permission.READ_SMS" />
+  <uses-permission android:name="android.permission.READ_CONTACTS" />
 
   <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="7" />
 
@@ -59,6 +63,11 @@
               android:theme="@android:style/Theme.NoTitleBar"
               android:configChanges="keyboardHidden|orientation"
               />
+    <activity android:name="SMSInviteActivity"
+              android:theme="@android:style/Theme.Dialog"
+              android:configChanges="keyboardHidden|orientation"
+              android:screenOrientation="portrait"
+              />
 
     <activity android:name="GameConfig"
               android:screenOrientation="sensor"
@@ -147,5 +156,13 @@
         </intent-filter>
     </receiver>
 
+    <receiver android:name="SMSReceiver" >
+      <intent-filter android:priority="999" >
+        <action android:name="android.provider.Telephony.SMS_RECEIVED" />
+      </intent-filter>
+    </receiver>
+
+    <service android:name="SMSService"/>
+
   </application>
 </manifest>
diff --git a/xwords4/android/XWords4/jni/Android.mk b/xwords4/android/XWords4/jni/Android.mk
index 72761ced1..093445143 100644
--- a/xwords4/android/XWords4/jni/Android.mk
+++ b/xwords4/android/XWords4/jni/Android.mk
@@ -14,6 +14,7 @@ local_LDLIBS += -llog
 local_DEFINES += \
 	$(local_DEBUG) \
 	-DXWFEATURE_RELAY \
+	-DXWFEATURE_SMS \
 	-DXWFEATURE_COMMSACK \
 	-DXWFEATURE_TURNCHANGENOTIFY \
 	-DXWFEATURE_CHAT \
diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/XWords4/res/xml/xwprefs.xml
index c4a689e73..ca34c0463 100644
--- a/xwords4/android/XWords4/res/xml/xwprefs.xml
+++ b/xwords4/android/XWords4/res/xml/xwprefs.xml
@@ -252,6 +252,12 @@
   <PreferenceScreen android:title="@string/network_behavior"
                     android:summary="@string/network_behavior_summary"
                     >
+    <org.eehouse.android.xw4.SMSCheckBoxPreference 
+        android:key="@string/key_enable_sms"
+        android:title="@string/enable_sms"
+        android:summary="@string/enable_sms_summary"
+        android:defaultValue="false"
+        />
     <org.eehouse.android.xw4.PollListPreference
        android:key="@string/key_connect_frequency"
        android:title="@string/connect_frequency"
@@ -288,6 +294,10 @@
                         android:summary="Menuitems etc."
                         android:defaultValue="false"
                         />
+    <CheckBoxPreference android:key="@string/key_show_sms"
+			            android:title="Show SMS sends, receives"
+			            android:defaultValue="false"
+			            />
     <org.eehouse.android.xw4.XWEditTextPreference 
 	   android:key="@string/key_relay_host"
 	   android:title="@string/relay_host"
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
index a4b7f12bc..5dd8fcea8 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
@@ -30,7 +30,7 @@ import org.eehouse.android.xw4.jni.XwJNI;
 public class XWApp extends Application {
     public static final boolean DEBUG_LOCKS = false;
     public static final boolean BTSUPPORTED = false;
-    public static final boolean SMSSUPPORTED = false;
+    public static final boolean SMSSUPPORTED = true;
     public static final String SMS_PUBLIC_HEADER = "-XW4";
 
     private static UUID s_UUID = null;
@@ -53,6 +53,8 @@ public class XWApp extends Application {
         RelayReceiver.RestartTimer( this );
         UpdateCheckReceiver.restartTimer( this );
         BTService.startService( this );
+
+        SMSService.checkForInvites( this );
     }
 
     public static UUID getAppUUID()