From af1ac3f779bbcbc0a5937bfdd591841fcf27dafc Mon Sep 17 00:00:00 2001 From: Eric House Date: Sun, 14 Jul 2019 15:10:32 -0700 Subject: [PATCH] don't optimize for email-only case The test got out-of-date, and with SMS and clipboard options always present there's no point in testing: should always pass. --- .../org/eehouse/android/xw4/DlgDelegate.java | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) 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 1a42e8263..35299e55d 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 @@ -422,24 +422,10 @@ public class DlgDelegate { public void showInviteChoicesThen( final Action action, SentInvitesInfo info ) { - if ( (Utils.deviceSupportsNBS( m_activity )) - || XWPrefs.getNFCToSelfEnabled( m_activity ) - || NFCUtils.nfcAvail( m_activity )[0] - || WiDirWrapper.enabled() - || BTService.BTAvailable() ) { - DlgState state = new DlgState( DlgID.INVITE_CHOICES_THEN ) - .setAction( action ) - .setParams( info ); - m_dlgt.show( state ); - } else { - post( new Runnable() { - public void run() { - DlgClickNotify.InviteMeans means - = DlgClickNotify.InviteMeans.EMAIL; - m_clickCallback.inviteChoiceMade( action, means ); - } - }); - } + DlgState state = new DlgState( DlgID.INVITE_CHOICES_THEN ) + .setAction( action ) + .setParams( info ); + m_dlgt.show( state ); } public void doSyncMenuitem()