From 172d01137adeec40d5f591bb74a10b46a38f8ce0 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 11 Sep 2014 20:42:15 -0700
Subject: [PATCH] copy stuff required to make main app support BT

---
 xwords4/android/XWords4/AndroidManifest.xml      | 16 ++++++++++++++++
 xwords4/android/XWords4/jni/Android.mk           |  3 ++-
 .../src/org/eehouse/android/xw4/XWApp.java       |  3 ++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/xwords4/android/XWords4/AndroidManifest.xml b/xwords4/android/XWords4/AndroidManifest.xml
index 5170b80b9..825987e8e 100644
--- a/xwords4/android/XWords4/AndroidManifest.xml
+++ b/xwords4/android/XWords4/AndroidManifest.xml
@@ -46,6 +46,8 @@
   <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.BLUETOOTH" />
+  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
   <uses-permission android:name="android.permission.READ_CONTACTS" />
 
   <uses-feature android:name="android.hardware.telephony"
@@ -92,6 +94,9 @@
     
     <activity android:name="NewGameActivity"
               android:theme="@android:style/Theme.NoTitleBar"
+              />
+    <activity android:name="BTInviteActivity"
+              android:theme="@android:style/Theme.Dialog"
               android:configChanges="keyboardHidden|orientation|screenSize"
               />
     <activity android:name="SMSInviteActivity"
@@ -213,6 +218,17 @@
         </intent-filter>
     </receiver>
 
+    <receiver android:name="BTReceiver">
+      <intent-filter>
+        <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
+      </intent-filter>
+    </receiver>
+
+    <service android:name="BTService"/>
+
     <receiver android:name="SMSReceiver" >
       <intent-filter android:priority="999" >
         <action android:name="android.provider.Telephony.SMS_RECEIVED" />
diff --git a/xwords4/android/XWords4/jni/Android.mk b/xwords4/android/XWords4/jni/Android.mk
index 3259f292b..97e4f4bd2 100644
--- a/xwords4/android/XWords4/jni/Android.mk
+++ b/xwords4/android/XWords4/jni/Android.mk
@@ -16,6 +16,7 @@ endif
 LOCAL_DEFINES += \
 	$(LOCAL_DEBUG) \
 	-DXWFEATURE_RELAY \
+	-DXWFEATURE_BLUETOOTH \
 	-DXWFEATURE_SMS \
 	-DXWFEATURE_COMMSACK \
 	-DXWFEATURE_TURNCHANGENOTIFY \
@@ -83,7 +84,7 @@ COMMON_SRC_FILES +=        \
 	$(COMMON_PATH)/dbgutil.c    \
 
 
-LOCAL_CFLAGS+=$(LOCAL_C_INCLUDES) $(LOCAL_DEFINES)
+LOCAL_CFLAGS+=$(LOCAL_C_INCLUDES) $(LOCAL_DEFINES) -Wall
 LOCAL_SRC_FILES := $(linux_SRC_FILES) $(LOCAL_SRC_FILES) $(COMMON_SRC_FILES)
 LOCAL_MODULE    := xwjni
 LOCAL_LDLIBS 	:= -L${SYSROOT}/usr/lib -llog -lz 
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 2a8f4d41f..4c033384c 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
@@ -31,7 +31,8 @@ import java.util.UUID;
 import org.eehouse.android.xw4.jni.XwJNI;
 
 public class XWApp extends Application {
-    public static final boolean BTSUPPORTED = false;
+
+    public static final boolean BTSUPPORTED = true;
     public static final boolean SMSSUPPORTED = true;
     public static final boolean GCMSUPPORTED = true;
     public static final boolean ATTACH_SUPPORTED = true;