Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-23 07:27:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

close InviteChoicesAlert when game connects

Browse source 
That'll happen if QR code is used in its current location.
This commit is contained in:
Eric House 2020-10-04 21:35:56 -07:00
parent 359e1d12d1
commit 4f17c64301
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
View file

@ -2553,6 +2553,8 @@ public class BoardDelegate extends DelegateBase
runOnUiThread( new Runnable() { runOnUiThread( new Runnable() {
@Override @Override
public void run() { public void run() {
InviteChoicesAlert.dismissAny();
if ( m_relayMissing && connected ) { if ( m_relayMissing && connected ) {
m_relayMissing = false; m_relayMissing = false;
} }

22
xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java
View file

@ -26,6 +26,7 @@ import android.content.DialogInterface;
import android.widget.Button; import android.widget.Button;
import android.widget.RadioGroup; import android.widget.RadioGroup;
import java.lang.ref.WeakReference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -40,15 +41,36 @@ import org.eehouse.android.xw4.loc.LocUtils;
public class InviteChoicesAlert extends DlgDelegateAlert public class InviteChoicesAlert extends DlgDelegateAlert
implements InviteView.ItemClicked { implements InviteView.ItemClicked {
private static WeakReference<InviteChoicesAlert> sSelf;
public static InviteChoicesAlert newInstance( DlgState state ) public static InviteChoicesAlert newInstance( DlgState state )
{ {
InviteChoicesAlert result = new InviteChoicesAlert(); InviteChoicesAlert result = new InviteChoicesAlert();
result.addStateArgument( state ); result.addStateArgument( state );
sSelf = new WeakReference<>(result);
return result; return result;
} }
public static void dismissAny()
{
WeakReference<InviteChoicesAlert> ref = sSelf;
if ( null != ref ) {
InviteChoicesAlert self = ref.get();
if ( null != self ) {
self.dismiss();
}
}
}
public InviteChoicesAlert() {} public InviteChoicesAlert() {}
@Override
public void onDestroy()
{
sSelf = null;
super.onDestroy();
}
@Override @Override
public void populateBuilder( final Context context, final DlgState state, public void populateBuilder( final Context context, final DlgState state,
AlertDialog.Builder builder ) AlertDialog.Builder builder )