diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java index 8e533ba29..513473c4f 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java @@ -72,7 +72,6 @@ public class DlgDelegateAlert extends DialogFragment { protected void checkNotAgainCheck( DlgState state, NotAgainView naView ) { if ( null != naView && naView.getChecked() ) { - DbgUtils.logd( TAG, "is checked" ); if ( 0 != state.m_prefsKey ) { XWPrefs.setPrefsBoolean( getActivity(), m_state.m_prefsKey, true ); @@ -83,6 +82,19 @@ public class DlgDelegateAlert extends DialogFragment { } } + protected OnClickListener mkCallbackClickListener( final ActionPair pair, + final NotAgainView naView ) + { + return new OnClickListener() { + @Override + public void onClick( DialogInterface dlg, int button ) { + checkNotAgainCheck( m_state, naView ); + XWActivity xwact = (XWActivity)getActivity(); + xwact.onPosButton( pair.action, m_state.m_params ); + } + }; + } + protected OnClickListener mkCallbackClickListener( final NotAgainView naView ) { OnClickListener cbkOnClickLstnr; diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NotAgainAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NotAgainAlert.java index 30665042a..d12a0cd4e 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NotAgainAlert.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NotAgainAlert.java @@ -49,14 +49,12 @@ public class NotAgainAlert extends DlgDelegateAlert { @Override public Dialog onCreateDialog( Bundle sis ) { - final Context context = getActivity(); + Context context = getActivity(); + DlgState state = getState( sis ); - final DlgState state = getState( sis ); - - final NotAgainView naView = (NotAgainView) + NotAgainView naView = (NotAgainView) LocUtils.inflate( context, R.layout.not_again_view ); naView.setMessage( state.m_msg ); - // final OnClickListener lstnr_p = mkCallbackClickListener( state, naView ); AlertDialog.Builder builder = LocUtils.makeAlertBuilder( context ) .setTitle( R.string.newbie_title ) @@ -65,17 +63,11 @@ public class NotAgainAlert extends DlgDelegateAlert { mkCallbackClickListener( naView ) ); if ( null != state.m_pair ) { - final ActionPair more = state.m_pair; - OnClickListener lstnr = new OnClickListener() { - public void onClick( DialogInterface dlg, int item ) { - checkNotAgainCheck( state, naView ); - // m_clickCallback.onPosButton( more.action, more.params ); - } - }; - builder.setNegativeButton( more.buttonStr, lstnr ); + ActionPair pair = state.m_pair; + builder.setNegativeButton( pair.buttonStr, + mkCallbackClickListener( pair, naView ) ); } - Dialog dialog = builder.create(); - return dialog; + return builder.create(); } }