From ca93f808f3a39427221a4c6118ebae342f46095f Mon Sep 17 00:00:00 2001 From: Eric House Date: Wed, 26 Jul 2017 07:21:27 -0700 Subject: [PATCH] change invite alert track/dismiss logic Attempt to fix invite alert sticking around after game connection finishes, which resulted from the variable pointing to the alert having been set to null. So stop setting it in onDismiss listener. I think trying to track it via an iVar is a mistake, that dismiss by tag or somesuch is the right way to go. But my dialog fragment code isn't up to that yet. --- .../java/org/eehouse/android/xw4/BoardDelegate.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java index 4600cb275..95712fc20 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java @@ -537,12 +537,6 @@ public class BoardDelegate extends DelegateBase finish(); } } ); - alert.setOnDismissListener( new DBAlert.OnDismissListener() { - @Override - public void onDismissed( XWDialogFragment frag ) { - m_inviteAlert = null; - } - } ); } return dialog; } // makeInviteDialog @@ -2207,7 +2201,8 @@ public class BoardDelegate extends DelegateBase if ( m_relayMissing && connected ) { m_relayMissing = false; } - if ( 0 == nMissing || !m_relayMissing ) { + // Why this m_relayMissing thing? + if ( 0 == nMissing /* || !m_relayMissing*/ ) { Log.d( TAG, "dismissing invite alert %H", m_inviteAlert ); dismissInviteAlert(); } @@ -2310,7 +2305,7 @@ public class BoardDelegate extends DelegateBase private void showInviteAlertIf() { - if ( null == m_inviteAlert && m_mySIS.nMissing > 0 && !isFinishing() ) { + if ( /* null == m_inviteAlert && */m_mySIS.nMissing > 0 && !isFinishing() ) { InviteAlertState ias = new InviteAlertState(); ias.summary = m_summary; ias.gi = m_gi;