remove compile-time enabling of chat: it's not coming out

xwords4/android/XWords4/app/build.gradle

@@ -134,7 +134,7 @@ dependencies {
 task genVers(type: Exec) {
     workingDir '../'
     commandLine '../scripts/genvers.sh', '--variant', VARIANT_NAME, 
-    '--client-vers', INITIAL_CLIENT_VERS, '--chat-enabled', CHAT_ENABLED,
+    '--client-vers', INITIAL_CLIENT_VERS, 
     '--thumbnail-enabled', THUMBNAIL_ENABLED,
     '--vers-outfile', "assets/gitvers.txt"
 }

xwords4/android/XWords4/jni/Android.mk

@@ -38,6 +38,7 @@ LOCAL_DEFINES += \
 	-DHASH_STREAM \
 	-DXWFEATURE_BASE64 \
 	-DXWFEATURE_DEVID \
+	-DXWFEATURE_CHAT \
 	-DCOMMON_LAYOUT \
 	-DNATIVE_NLI \
 	-DCOMMS_VERSION=1 \
@@ -46,10 +47,6 @@ LOCAL_DEFINES += \
 	-DRELAY_ROOM_DEFAULT=\"\" \
 	-D__LITTLE_ENDIAN \
 
-ifeq ($(CHAT_ENABLED),true)
-	LOCAL_DEFINES += -DXWFEATURE_CHAT
-endif
-
 #	-DXWFEATURE_SCOREONEPASS \
 
 LOCAL_SRC_FILES +=         \

xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java

@@ -540,9 +540,7 @@ public class BoardDelegate extends DelegateBase
     {
         getBundledData( savedInstanceState );
 
-        if ( BuildConstants.CHAT_SUPPORTED ) {
         m_pendingChats = new ArrayList<String>();
-        }
 
         m_utils = new BoardUtilCtxt();
         m_jniu = JNIUtilsImpl.get( m_activity );
@@ -788,8 +786,7 @@ public class BoardDelegate extends DelegateBase
             Utils.setItemVisible( menu, R.id.board_menu_hint_next,
                                   m_gsi.canHint );
             Utils.setItemVisible( menu, R.id.board_menu_chat,
-                                  BuildConstants.CHAT_SUPPORTED
+                                  m_gsi.canChat );
-                                  && m_gsi.canChat );
             Utils.setItemVisible( menu, R.id.board_menu_tray,
                                   !inTrade && m_gsi.canHideRack );
             Utils.setItemVisible( menu, R.id.board_menu_trade,
@@ -2013,7 +2010,6 @@ public class BoardDelegate extends DelegateBase
         public void showChat( final String msg, final int fromIndx,
                               String fromPlayer )
         {
-            if ( BuildConstants.CHAT_SUPPORTED ) {
             runOnUiThread( new Runnable() {
                     public void run() {
                         DBUtils.appendChatHistory( m_activity, m_rowid, msg,
@@ -2025,7 +2021,6 @@ public class BoardDelegate extends DelegateBase
                     }
                 } );
         }
-        }
     } // class BoardUtilCtxt
 
     private void doResume( boolean isStart )
@@ -2247,13 +2242,11 @@ public class BoardDelegate extends DelegateBase
                                    R.string.not_again_undo,
                                    R.string.key_notagain_undo,
                                    Action.UNDO_ACTION );
-            if ( BuildConstants.CHAT_SUPPORTED ) {
             m_toolbar.setListener( Toolbar.BUTTON_CHAT,
                                    R.string.not_again_chat,
                                    R.string.key_notagain_chat,
                                    Action.CHAT_ACTION );
         }
-        }
     } // populateToolbar
 
     private OnDismissListener makeODLforBlocking( final int id )
@@ -2340,14 +2333,12 @@ public class BoardDelegate extends DelegateBase
 
     private void startChatActivity()
     {
-        if ( BuildConstants.CHAT_SUPPORTED ) {
         int curPlayer = XwJNI.board_getSelPlayer( m_jniGamePtr );
         String[] names = m_gi.playerNames();
         boolean[] locs = m_gi.playersLocal(); // to convert old histories
         ChatDelegate.start( getDelegator(), m_rowid, curPlayer,
                             names, locs );
     }
-    }
 
     private void closeIfFinishing( boolean force )
     {
@@ -2414,14 +2405,12 @@ public class BoardDelegate extends DelegateBase
 
     private void trySendChats()
     {
-        if ( BuildConstants.CHAT_SUPPORTED && null != m_jniThread ) {
         Iterator<String> iter = m_pendingChats.iterator();
         while ( iter.hasNext() ) {
             handleViaThread( JNICmd.CMD_SENDCHAT, iter.next() );
         }
         m_pendingChats.clear();
     }
-    }
 
     private void tryInvites()
     {
@@ -2492,8 +2481,7 @@ public class BoardDelegate extends DelegateBase
             m_toolbar.update( Toolbar.BUTTON_UNDO, m_gsi.canRedo );
             m_toolbar.update( Toolbar.BUTTON_HINT_PREV, m_gsi.canHint );
             m_toolbar.update( Toolbar.BUTTON_HINT_NEXT, m_gsi.canHint );
-            m_toolbar.update( Toolbar.BUTTON_CHAT,
+            m_toolbar.update( Toolbar.BUTTON_CHAT, m_gsi.canChat );
-                              BuildConstants.CHAT_SUPPORTED && m_gsi.canChat );
             m_toolbar.update( Toolbar.BUTTON_BROWSE_DICT,
                               null != m_gi.dictName( m_view.getCurPlayer() ) );
         }

xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatActivity.java

@@ -27,9 +27,7 @@ public class ChatActivity extends XWActivity {
     @Override
     public void onCreate( Bundle savedInstanceState )
     {
-        if ( BuildConstants.CHAT_SUPPORTED ) {
         ChatDelegate dlgt = new ChatDelegate( this, savedInstanceState );
         super.onCreate( savedInstanceState, dlgt );
     }
 }
-}

xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java

@@ -1268,7 +1268,6 @@ public class DBUtils {
                                                 boolean[] playersLocal )
     {
         HistoryPair[] result = null;
-        if ( BuildConstants.CHAT_SUPPORTED ) {
         String[] columns = { DBHelper.SENDER, DBHelper.MESSAGE };
         String selection = String.format( "%s=%d", DBHelper.ROW, rowid );
         initDB( context );
@@ -1294,7 +1293,6 @@ public class DBUtils {
         if ( null == result ) {
             result = convertChatString( context, rowid, playersLocal );
         }
-        }
         return result;
     }
 
@@ -1792,7 +1790,6 @@ public class DBUtils {
     private static String getChatHistoryStr( Context context, long rowid )
     {
         String result = null;
-        if ( BuildConstants.CHAT_SUPPORTED ) {
         String[] columns = { DBHelper.CHAT_HISTORY };
         String selection = String.format( ROW_ID_FMT, rowid );
         initDB( context );
@@ -1810,7 +1807,6 @@ public class DBUtils {
             cursor.close();
             db.close();
         }
-        }
         return result;
     }
 

xwords4/android/scripts/common_targets.xml

@@ -27,12 +27,10 @@
             <arg value="${build.target}"/>
         </exec>
 
-        <property name="CHAT_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="VARIANT=${VARIANT_NAME}" />
             <arg value="V=1" />
         </exec>
@@ -65,8 +63,6 @@
           <arg value="${VARIANT_NAME}" />
           <arg value="--client-vers" />
           <arg value="${INITIAL_CLIENT_VERS}" />
-          <arg value="--chat-enabled"/>
-          <arg value="${CHAT_ENABLED}" />
           <arg value="--vers-outfile" />
           <arg value="./assets/gitvers.txt" />
         </exec>

xwords4/android/scripts/genvers.sh

@@ -6,13 +6,11 @@ STRINGS_HASH=""
 OUT_PATH=""
 VARIANT=""
 CLIENT_VERS_RELAY=""
-CHAT_SUPPORTED=""
 GCM_SENDER_ID=${GCM_SENDER_ID:-""}
 CRITTERCISM_APP_ID=${CRITTERCISM_APP_ID:-""}
 
 usage() {
     echo "usage: $0 --variant <variant> --client-vers <relay_vers> \\"
-	echo "   --chat-enabled <trueOrFalse> <trueOrFalse> \\"
 	echo "   [--vers-outfile path/to/versout.txt]"
     exit 1
 }
@@ -28,10 +26,6 @@ while [ $# -gt 0 ]; do
 			CLIENT_VERS_RELAY=$2
 			shift
 			;;
-		--chat-enabled)
-			CHAT_SUPPORTED=$2
-			shift
-			;;
 		--vers-outfile)
 			OUT_PATH=$2
 			shift
@@ -43,7 +37,7 @@ while [ $# -gt 0 ]; do
 	shift
 done
 
-[ -n "$VARIANT" -a -n "$CLIENT_VERS_RELAY" -a -n "$CHAT_SUPPORTED" ] || usage
+[ -n "$VARIANT" -a -n "$CLIENT_VERS_RELAY" ] || usage
 
 BUILD_DIR=$(basename $(pwd))
 cd $(dirname $0)
@@ -114,7 +108,6 @@ public class BuildConstants {
     public static final String GIT_REV = "$SHORTVERS";
     public static final String STRINGS_HASH = "$STRINGS_HASH";
     public static final short CLIENT_VERS_RELAY = $CLIENT_VERS_RELAY;
-    public static final boolean CHAT_SUPPORTED = $CHAT_SUPPORTED;
     public static final long BUILD_STAMP = $(date +'%s');
     public static final String DBG_TAG = "$DBG_TAG";
     public static final String VARIANT = "$VARIANT";