From 5d7cc9e9e8c9310a6adc4779349ca4bb462b4a06 Mon Sep 17 00:00:00 2001 From: Eric House Date: Sun, 8 Sep 2013 19:09:49 -0700 Subject: [PATCH] disable chat, and include reason in change log --- xwords4/android/XWords4/jni/Android.mk | 1 - xwords4/android/XWords4/res/raw/changes | 4 ++ .../eehouse/android/xw4/BoardActivity.java | 58 ++++++++++++------- .../src/org/eehouse/android/xw4/XWApp.java | 1 + 4 files changed, 41 insertions(+), 23 deletions(-) diff --git a/xwords4/android/XWords4/jni/Android.mk b/xwords4/android/XWords4/jni/Android.mk index 2c72a0f92..18203564a 100644 --- a/xwords4/android/XWords4/jni/Android.mk +++ b/xwords4/android/XWords4/jni/Android.mk @@ -17,7 +17,6 @@ local_DEFINES += \ -DXWFEATURE_SMS \ -DXWFEATURE_COMMSACK \ -DXWFEATURE_TURNCHANGENOTIFY \ - -DXWFEATURE_CHAT \ -DCOMMS_XPORT_FLAGSPROC \ -DKEY_SUPPORT \ -DXWFEATURE_CROSSHAIRS \ diff --git a/xwords4/android/XWords4/res/raw/changes b/xwords4/android/XWords4/res/raw/changes index 34f5ebf1f..5469751b3 100644 --- a/xwords4/android/XWords4/res/raw/changes +++ b/xwords4/android/XWords4/res/raw/changes @@ -10,6 +10,10 @@

New with this release

Next up

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java index bc8cf5718..26d854451 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java @@ -127,7 +127,7 @@ public class BoardActivity extends XWActivity private Button m_exchCommmitButton; private Button m_exchCancelButton; - private ArrayList m_pendingChats = new ArrayList(); + private ArrayList m_pendingChats; private String m_dlgBytes = null; private EditText m_passwdEdit = null; @@ -512,6 +512,10 @@ public class BoardActivity extends XWActivity requestWindowFeature( Window.FEATURE_NO_TITLE ); } + if ( XWApp.CHAT_SUPPORTED ) { + m_pendingChats = new ArrayList(); + } + m_utils = new BoardUtilCtxt(); m_jniu = JNIUtilsImpl.get( this ); setContentView( R.layout.board ); @@ -601,10 +605,12 @@ public class BoardActivity extends XWActivity if ( Activity.RESULT_CANCELED != resultCode ) { switch ( requestCode ) { case CHAT_REQUEST: - String msg = data.getStringExtra( INTENT_KEY_CHAT ); - if ( null != msg && msg.length() > 0 ) { - m_pendingChats.add( msg ); - trySendChats(); + if ( XWApp.CHAT_SUPPORTED ) { + String msg = data.getStringExtra( INTENT_KEY_CHAT ); + if ( null != msg && msg.length() > 0 ) { + m_pendingChats.add( msg ); + trySendChats(); + } } break; case BT_INVITE_RESULT: @@ -1660,13 +1666,15 @@ public class BoardActivity extends XWActivity @Override public void showChat( final String msg ) { - post( new Runnable() { - public void run() { - DBUtils.appendChatHistory( BoardActivity.this, - m_rowid, msg, false ); - startChatActivity(); - } - } ); + if ( XWApp.CHAT_SUPPORTED ) { + post( new Runnable() { + public void run() { + DBUtils.appendChatHistory( BoardActivity.this, + m_rowid, msg, false ); + startChatActivity(); + } + } ); + } } } // class BoardUtilCtxt @@ -1846,10 +1854,12 @@ public class BoardActivity extends XWActivity R.string.not_again_undo, R.string.key_notagain_undo, UNDO_ACTION ); - m_toolbar.setListener( Toolbar.BUTTON_CHAT, - R.string.not_again_chat, - R.string.key_notagain_chat, - CHAT_ACTION ); + if ( XWApp.CHAT_SUPPORTED ) { + m_toolbar.setListener( Toolbar.BUTTON_CHAT, + R.string.not_again_chat, + R.string.key_notagain_chat, + CHAT_ACTION ); + } } // populateToolbar private OnDismissListener makeODLforBlocking( final int id ) @@ -1933,9 +1943,11 @@ public class BoardActivity extends XWActivity private void startChatActivity() { - Intent intent = new Intent( this, ChatActivity.class ); - intent.putExtra( GameUtils.INTENT_KEY_ROWID, m_rowid ); - startActivityForResult( intent, CHAT_REQUEST ); + if ( XWApp.CHAT_SUPPORTED ) { + Intent intent = new Intent( this, ChatActivity.class ); + intent.putExtra( GameUtils.INTENT_KEY_ROWID, m_rowid ); + startActivityForResult( intent, CHAT_REQUEST ); + } } private void waitCloseGame( boolean save ) @@ -1979,7 +1991,7 @@ public class BoardActivity extends XWActivity private void trySendChats() { - if ( null != m_jniThread ) { + if ( XWApp.CHAT_SUPPORTED && null != m_jniThread ) { Iterator iter = m_pendingChats.iterator(); while ( iter.hasNext() ) { m_jniThread.handle( JNICmd.CMD_SENDCHAT, iter.next() ); @@ -2026,7 +2038,8 @@ public class BoardActivity extends XWActivity 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_gsi.gameIsConnected ); + m_toolbar.update( Toolbar.BUTTON_CHAT, + XWApp.CHAT_SUPPORTED && m_gsi.gameIsConnected ); m_toolbar.update( Toolbar.BUTTON_BROWSE_DICT, null != m_gi.dictName( m_view.getCurPlayer() ) ); } @@ -2048,7 +2061,8 @@ public class BoardActivity extends XWActivity hideShowItem( menu, R.id.board_menu_undo_current, m_gsi.canRedo ); hideShowItem( menu, R.id.board_menu_hint_prev, m_gsi.canHint ); hideShowItem( menu, R.id.board_menu_hint_next, m_gsi.canHint ); - hideShowItem( menu, R.id.board_menu_chat, m_gsi.gameIsConnected ); + hideShowItem( menu, R.id.board_menu_chat, + XWApp.CHAT_SUPPORTED && m_gsi.gameIsConnected ); } } 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 1f0790181..6ace129e7 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java @@ -31,6 +31,7 @@ public class XWApp extends Application { public static final boolean BTSUPPORTED = false; public static final boolean SMSSUPPORTED = true; public static final boolean GCMSUPPORTED = true; + public static final boolean CHAT_SUPPORTED = false; public static final boolean ATTACH_SUPPORTED = true; public static final boolean REMATCH_SUPPORTED = false; public static final boolean DEBUG = false;