From c1c20db6ddf22c36550b25931e4fd251feaa17a5 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@trand>
Date: Mon, 27 Feb 2012 20:35:31 -0800
Subject: [PATCH] add static final boolean by which to turn BT support off and
 change so UI and background service disappear/don't run when it's off. 
 Goal's to ship two apps that differ in this setting, a change in Android.mk,
 and little else.

---
 .../android/XWords4/res/layout/new_game.xml   |  8 ++-
 .../org/eehouse/android/xw4/BTReceiver.java   | 38 +++++-----
 .../org/eehouse/android/xw4/BTService.java    |  9 ++-
 .../eehouse/android/xw4/NewGameActivity.java  | 71 ++++++++++---------
 .../src/org/eehouse/android/xw4/XWApp.java    |  2 +
 5 files changed, 72 insertions(+), 56 deletions(-)

diff --git a/xwords4/android/XWords4/res/layout/new_game.xml b/xwords4/android/XWords4/res/layout/new_game.xml
index d572f2ed4..da22a8fbc 100644
--- a/xwords4/android/XWords4/res/layout/new_game.xml
+++ b/xwords4/android/XWords4/res/layout/new_game.xml
@@ -106,17 +106,20 @@
     </LinearLayout>
 
     <!-- Bluetooth -->
-    <TextView style="@style/config_separator"
+    <TextView android:id="@+id/bt_separator"
+              style="@style/config_separator"
               android:layout_marginTop="10dip"
               android:textAppearance="?android:attr/textAppearanceMedium"
               android:text="@string/newgame_bt_header"
+              android:visibility="gone"
               />
 
     <LinearLayout android:id="@+id/bt_disabled"
                   android:orientation="vertical"
                   android:layout_width="fill_parent" 
                   android:layout_height="wrap_content"
-                  >
+                  android:visibility="gone"
+              >
       <TextView android:text="@string/bt_disabled"
                 style="@style/relay_explain"
                 />
@@ -131,6 +134,7 @@
                   android:orientation="vertical"
                   android:layout_width="fill_parent" 
                   android:layout_height="wrap_content"
+                  android:visibility="gone"
                   >
       <LinearLayout android:orientation="horizontal"
                     android:layout_width="fill_parent" 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTReceiver.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTReceiver.java
index a42001529..2c75b23a7 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTReceiver.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTReceiver.java
@@ -31,24 +31,26 @@ public class BTReceiver extends BroadcastReceiver {
     @Override
     public void onReceive( Context context, Intent intent )
     {
-        DbgUtils.logf( "BTReceiver.onReceive()" );
-        String action = intent.getAction();
-        DbgUtils.logf( "BTReceiver.onReceive(action=%s)", action );
-        if ( action.equals( BluetoothDevice.ACTION_ACL_CONNECTED ) ) {
-            BTService.startService( context );
-        } else if ( action.equals( BluetoothAdapter.ACTION_STATE_CHANGED ) ) {
-            int newState = 
-                intent.getIntExtra( BluetoothAdapter.EXTRA_STATE, -1 );
-            switch ( newState ) {
-            case BluetoothAdapter.STATE_OFF:
-                BTService.radioChanged( context, false );
-                break;
-            case BluetoothAdapter.STATE_ON:
-                BTService.radioChanged( context, true );
-                break;
-            case BluetoothAdapter.STATE_TURNING_ON:
-            case BluetoothAdapter.STATE_TURNING_OFF:
-                break;
+        if ( XWApp.BTSUPPORTED ) {
+            DbgUtils.logf( "BTReceiver.onReceive()" );
+            String action = intent.getAction();
+            DbgUtils.logf( "BTReceiver.onReceive(action=%s)", action );
+            if ( action.equals( BluetoothDevice.ACTION_ACL_CONNECTED ) ) {
+                BTService.startService( context );
+            } else if ( action.equals( BluetoothAdapter.ACTION_STATE_CHANGED ) ) {
+                int newState = 
+                    intent.getIntExtra( BluetoothAdapter.EXTRA_STATE, -1 );
+                switch ( newState ) {
+                case BluetoothAdapter.STATE_OFF:
+                    BTService.radioChanged( context, false );
+                    break;
+                case BluetoothAdapter.STATE_ON:
+                    BTService.radioChanged( context, true );
+                    break;
+                case BluetoothAdapter.STATE_TURNING_ON:
+                case BluetoothAdapter.STATE_TURNING_OFF:
+                    break;
+                }
             }
         }
     }
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
index 2a8c79651..37206e263 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
@@ -246,10 +246,12 @@ public class BTService extends Service {
     @Override
     public void onCreate()
     {
-        m_adapter = BluetoothAdapter.getDefaultAdapter();
-        if ( null != m_adapter && m_adapter.isEnabled() ) {
+        BluetoothAdapter adapter = XWApp.BTSUPPORTED
+            ? BluetoothAdapter.getDefaultAdapter() : null;
+        if ( null != adapter && adapter.isEnabled() ) {
+            m_adapter = adapter;
             DbgUtils.logf( "BTService.onCreate(); bt name = %s", 
-                           m_adapter.getName() );
+                           adapter.getName() );
             initNames();
             listLocalBTGames( false );
             startListener();
@@ -263,6 +265,7 @@ public class BTService extends Service {
     @Override
     public int onStartCommand( Intent intent, int flags, int startId )
     {
+        Assert.assertTrue( XWApp.BTSUPPORTED );
         if ( null != intent ) {
             int cmd = intent.getIntExtra( CMD_STR, -1 );
             DbgUtils.logf( "BTService.onStartCommand; cmd=%d", cmd );
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 2d025da37..4712fd2da 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java
@@ -264,42 +264,47 @@ public class NewGameActivity extends XWActivity {
 
     private void checkEnableBT( boolean force )
     {
-        boolean enabled = BTService.BTEnabled();
+        if ( XWApp.BTSUPPORTED ) {
+            boolean enabled = BTService.BTEnabled();
 
-        if ( force || enabled != m_showsOn ) {
-            m_showsOn = enabled;
+            if ( force || enabled != m_showsOn ) {
+                m_showsOn = enabled;
 
-            findViewById( R.id.bt_disabled ).
-                setVisibility( enabled ? View.GONE : View.VISIBLE  );
-            findViewById( R.id.bt_stuff ).
-                setVisibility( enabled ? View.VISIBLE : View.GONE  );
+                findViewById( R.id.bt_separator ).setVisibility( View.VISIBLE );
 
-            Button button;
-            if ( enabled ) {
-                button = (Button)findViewById( R.id.newgame_invite_bt );
-                button.setOnClickListener( new View.OnClickListener() {
-                        @Override
-                        public void onClick( View v ) {
-                            makeNewBTGame( true );
-                        }
-                    } );
-                button = (Button)findViewById( R.id.newgame_bt_config );
-                button.setOnClickListener( new View.OnClickListener() {
-                        @Override
-                        public void onClick( View v ) {
-                            makeNewBTGame( false );
-                        }
-                    } );
-            } else {
-                button = (Button)findViewById( R.id.newgame_enable_bt );
-                button.setOnClickListener( new View.OnClickListener() {
-                        @Override
-                            public void onClick( View v ) {
-                            Intent enableBtIntent = 
-                                new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-                            startActivityForResult( enableBtIntent, 0 );
-                        }
-                    } );
+                findViewById( R.id.bt_disabled ).
+                    setVisibility( enabled ? View.GONE : View.VISIBLE  );
+                findViewById( R.id.bt_stuff ).
+                    setVisibility( enabled ? View.VISIBLE : View.GONE  );
+
+                Button button;
+                if ( enabled ) {
+                    button = (Button)findViewById( R.id.newgame_invite_bt );
+                    button.setOnClickListener( new View.OnClickListener() {
+                            @Override
+                                public void onClick( View v ) {
+                                makeNewBTGame( true );
+                            }
+                        } );
+                    button = (Button)findViewById( R.id.newgame_bt_config );
+                    button.setOnClickListener( new View.OnClickListener() {
+                            @Override
+                                public void onClick( View v ) {
+                                makeNewBTGame( false );
+                            }
+                        } );
+                } else {
+                    button = (Button)findViewById( R.id.newgame_enable_bt );
+                    button.setOnClickListener( new View.OnClickListener() {
+                            @Override
+                                public void onClick( View v ) {
+                                Intent enableBtIntent = 
+                                    new Intent(BluetoothAdapter.
+                                               ACTION_REQUEST_ENABLE);
+                                startActivityForResult( enableBtIntent, 0 );
+                            }
+                        } );
+                }
             }
         }
     }
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 f71cbc319..f95621c26 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
@@ -28,6 +28,8 @@ import org.eehouse.android.xw4.jni.XwJNI;
 
 public class XWApp extends Application {
 
+    public static final boolean BTSUPPORTED = true;
+
     private static UUID s_UUID = null;
 
     @Override