From 59f9dd51b832aa0299d6e7d376c806950c16b264 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 22 Jul 2015 06:50:05 -0700
Subject: [PATCH] remove mistaken test: relay's an option too and always
 supported

---
 .../eehouse/android/xw4/BoardDelegate.java    | 92 +++++++++----------
 1 file changed, 44 insertions(+), 48 deletions(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
index a97cc2b83..22009a4f2 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
@@ -2356,55 +2356,52 @@ public class BoardDelegate extends DelegateBase
 
     private void tryInvites()
     {
-        if ( XWApp.BTSUPPORTED || XWApp.SMSSUPPORTED ) {
-            // test if summary knows of rematch pending first
-            if ( 0 < m_nMissing && m_summary.hasRematchInfo() ) {
-                tryRematchInvites();
-            } else if ( null != m_missingDevs ) {
-                Assert.assertNotNull( m_missingMeans );
-                String gameName = GameUtils.getName( m_activity, m_rowid );
-                m_invitesPending = m_missingDevs.length;
-                for ( int ii = 0; ii < m_missingDevs.length; ++ii ) {
-                    String dev = m_missingDevs[ii];
-                    int nPlayers = m_missingCounts[ii];
-                    Assert.assertTrue( 0 <= m_nGuestDevs );
-                    int forceChannel = ii + m_nGuestDevs + 1;
-                    NetLaunchInfo nli = new NetLaunchInfo( m_summary, m_gi, 
-                                                           nPlayers, forceChannel );
-                    if ( !m_relayConnected ) {
-                        nli.removeAddress( CommsConnType.COMMS_CONN_RELAY );
-                    }
-
-                    switch ( m_missingMeans ) {
-                    case BLUETOOTH:
-                        if ( ! m_progressShown ) {
-                            m_progressShown = true;
-                            String progMsg = BTService.nameForAddr( dev );
-                            progMsg = getString( R.string.invite_progress_fmt, progMsg );
-                            startProgress( R.string.invite_progress_title, progMsg,
-                                           new OnCancelListener() {
-                                               public void onCancel( DialogInterface dlg )
-                                               {
-                                                   m_progressShown = false;
-                                               }
-                                           });
-                        }
-                        BTService.inviteRemote( m_activity, dev, nli );
-                        break;
-                    case SMS:
-                        SMSService.inviteRemote( m_activity, dev, nli );
-                        break;
-                    case RELAY:
-                        int destDevID = Integer.parseInt( dev );
-                        RelayService.inviteRemote( m_activity, destDevID, 
-                                                   null, nli );
-                        break;
-                    }
+        if ( 0 < m_nMissing && m_summary.hasRematchInfo() ) {
+            tryRematchInvites();
+        } else if ( null != m_missingDevs ) {
+            Assert.assertNotNull( m_missingMeans );
+            String gameName = GameUtils.getName( m_activity, m_rowid );
+            m_invitesPending = m_missingDevs.length;
+            for ( int ii = 0; ii < m_missingDevs.length; ++ii ) {
+                String dev = m_missingDevs[ii];
+                int nPlayers = m_missingCounts[ii];
+                Assert.assertTrue( 0 <= m_nGuestDevs );
+                int forceChannel = ii + m_nGuestDevs + 1;
+                NetLaunchInfo nli = new NetLaunchInfo( m_summary, m_gi, 
+                                                       nPlayers, forceChannel );
+                if ( !m_relayConnected ) {
+                    nli.removeAddress( CommsConnType.COMMS_CONN_RELAY );
+                }
+
+                switch ( m_missingMeans ) {
+                case BLUETOOTH:
+                    if ( ! m_progressShown ) {
+                        m_progressShown = true;
+                        String progMsg = BTService.nameForAddr( dev );
+                        progMsg = getString( R.string.invite_progress_fmt, progMsg );
+                        startProgress( R.string.invite_progress_title, progMsg,
+                                       new OnCancelListener() {
+                                           public void onCancel( DialogInterface dlg )
+                                           {
+                                               m_progressShown = false;
+                                           }
+                                       });
+                    }
+                    BTService.inviteRemote( m_activity, dev, nli );
+                    break;
+                case SMS:
+                    SMSService.inviteRemote( m_activity, dev, nli );
+                    break;
+                case RELAY:
+                    int destDevID = Integer.parseInt( dev );
+                    RelayService.inviteRemote( m_activity, destDevID, 
+                                               null, nli );
+                    break;
                 }
-                m_missingDevs = null;
-                m_missingCounts = null;
-                m_missingMeans = null;
             }
+            m_missingDevs = null;
+            m_missingCounts = null;
+            m_missingMeans = null;
         }
     }
 
@@ -2599,7 +2596,6 @@ public class BoardDelegate extends DelegateBase
             if ( null != value ) {
                 BTService.inviteRemote( m_activity, value, nli );
             }
-
             value = m_summary.getStringExtra( GameSummary.EXTRA_REMATCH_RELAY );
             if ( null != value ) {
                 RelayService.inviteRemote( m_activity, 0, value, nli );