Skip to content

Commit 0131104

Browse files
committed
Improve rigctl icon visibility
1 parent 568448d commit 0131104

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

codec2talkie/src/main/java/com/radio/codec2talkie/MainActivity.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ public class MainActivity extends AppCompatActivity implements ServiceConnection
110110
private boolean _isConnecting = false;
111111
private boolean _isAppExit = false;
112112
private boolean _isAppRestart = false;
113+
private boolean _isRigCtlUsbConnected = false;
113114

114115
private long _backPressedTimestamp;
115116

@@ -290,6 +291,7 @@ private void startTransportConnection() {
290291
int resultCode = result.getResultCode();
291292
String transportType = _sharedPreferences.getString(PreferenceKeys.PORTS_TYPE, "loopback");
292293
if (transportType.equals("sound_modem")) {
294+
_isRigCtlUsbConnected = resultCode == RESULT_OK;
293295
startAppService(TransportFactory.TransportType.SOUND_MODEM);
294296
} else if (resultCode == RESULT_CANCELED) {
295297
_textConnInfo.setText(R.string.main_status_loopback_test);
@@ -303,6 +305,7 @@ private void startTransportConnection() {
303305

304306
protected void startUsbConnectActivity() {
305307
_isConnecting = true;
308+
_isRigCtlUsbConnected = false;
306309
_usbActivityLauncher.launch(new Intent(this, UsbConnectActivity.class));
307310
}
308311

@@ -465,7 +468,7 @@ private void updateStatusText(ProtocolFactory.ProtocolType protocolType) {
465468

466469
// rig CAT control
467470
String rigName = _sharedPreferences.getString(PreferenceKeys.PORTS_SOUND_MODEM_RIG, "Disabled");
468-
if (!rigName.equals("Disabled") && UsbPortHandler.getPort() != null) {
471+
if (!rigName.equals("Disabled") && _isRigCtlUsbConnected) {
469472
status += getString(R.string.ports_sound_modem_rig_label);
470473
}
471474

0 commit comments

Comments
 (0)