From 70a99b39fbe41e8aadf7c061cca41be6583387ae Mon Sep 17 00:00:00 2001 From: Eric House Date: Wed, 22 Feb 2017 22:35:19 -0800 Subject: [PATCH] remove dictGone dialog There's no way to get it invoked. I think that's a bug, but when it comes back it'll come back in different form. --- .../org/eehouse/android/xw4/DelegateBase.java | 5 ---- .../org/eehouse/android/xw4/DlgDelegate.java | 25 ------------------- .../java/org/eehouse/android/xw4/DlgID.java | 1 - .../android/xw4/GameConfigDelegate.java | 2 +- 4 files changed, 1 insertion(+), 32 deletions(-) diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java index 2f7ca54b9..dac9dead6 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java @@ -580,11 +580,6 @@ public class DelegateBase implements DlgClickNotify, m_dlgDelegate.stopProgress(); } - protected void showDictGoneFinish() - { - m_dlgDelegate.showDictGoneFinish(); - } - protected void showSMSEnableDialog( Action action, Object... params ) { m_dlgDelegate.showSMSEnableDialog( action, params ); diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java index a277fdca1..6e6aa5864 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java @@ -380,9 +380,6 @@ public class DlgDelegate { case DIALOG_ENABLESMS: Assert.assertFalse( BuildConfig.DEBUG ); break; - case DLG_DICTGONE: - dialog = createDictGoneDialog(); - break; default: DbgUtils.logd( TAG, "not creating %s", dlgID.toString() ); break; @@ -412,11 +409,6 @@ public class DlgDelegate { m_dlgt.show( OkOnlyAlert.newInstance( state ) ); } - public void showDictGoneFinish() - { - showDialog( DlgID.DLG_DICTGONE ); - } - // Puts up alert asking to choose a reason to enable SMS, and on dismiss // calls onPosButton/onNegButton with the action and in params a Boolean // indicating whether enabling is now ok. @@ -583,23 +575,6 @@ public class DlgDelegate { } } - private Dialog createDictGoneDialog() - { - Dialog dialog = LocUtils.makeAlertBuilder( m_activity ) - .setTitle( R.string.no_dict_title ) - .setMessage( R.string.no_dict_finish ) - .setPositiveButton( R.string.button_close_game, null ) - .create(); - - dialog.setOnDismissListener( new DialogInterface.OnDismissListener() { - public void onDismiss( DialogInterface di ) { - m_activity.finish(); - } - } ); - - return dialog; - } - private DlgState findForID( DlgID dlgID ) { DlgState state = m_dlgStates.get( dlgID ); diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgID.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgID.java index 21ab933b0..3250c8cd1 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgID.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgID.java @@ -32,7 +32,6 @@ public enum DlgID { , DICT_OR_DECLINE , DLG_CONNSTAT , DLG_DELETED - , DLG_DICTGONE , DLG_INVITE , DLG_OKONLY , ENABLE_NFC diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java index 09b2592fc..f37ef171b 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java @@ -553,7 +553,7 @@ public class GameConfigDelegate extends DelegateBase } if ( null == gamePtr ) { - showDictGoneFinish(); + Assert.assertFalse( BuildConfig.DEBUG ); } else { m_gameStarted = XwJNI.model_getNMoves( gamePtr ) > 0 || XwJNI.comms_isConnected( gamePtr );