diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileActivity.java index 5960ce3b..b1256c1f 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileActivity.java @@ -238,8 +238,6 @@ public abstract class BleProfileActivity extends AppCompatActivity implements Bl } mDeviceName = name; mBleManager.setLogger(mLogSession); - mDeviceNameView.setText(name != null ? name : getString(R.string.not_available)); - mConnectButton.setText(R.string.action_connecting); mBleManager.connect(device); } @@ -250,7 +248,10 @@ public abstract class BleProfileActivity extends AppCompatActivity implements Bl @Override public void onDeviceConnecting(final BluetoothDevice device) { - // do nothing + runOnUiThread(() -> { + mDeviceNameView.setText(mDeviceName != null ? mDeviceName : getString(R.string.not_available)); + mConnectButton.setText(R.string.action_connecting); + }); } @Override @@ -261,7 +262,7 @@ public abstract class BleProfileActivity extends AppCompatActivity implements Bl @Override public void onDeviceDisconnecting(final BluetoothDevice device) { - // do nothing + runOnUiThread(() -> mConnectButton.setText(R.string.action_disconnecting)); } @Override diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileExpandableListActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileExpandableListActivity.java index 6b66fa89..01880610 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileExpandableListActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileExpandableListActivity.java @@ -238,8 +238,6 @@ public abstract class BleProfileExpandableListActivity extends ExpandableListAct } mDeviceName = name; mBleManager.setLogger(mLogSession); - mDeviceNameView.setText(name != null ? name : getString(R.string.not_available)); - mConnectButton.setText(R.string.action_connecting); mBleManager.connect(device); } @@ -250,7 +248,10 @@ public abstract class BleProfileExpandableListActivity extends ExpandableListAct @Override public void onDeviceConnecting(final BluetoothDevice device) { - // do nothing + runOnUiThread(() -> { + mDeviceNameView.setText(mDeviceName != null ? mDeviceName : getString(R.string.not_available)); + mConnectButton.setText(R.string.action_connecting); + }); } @Override @@ -261,7 +262,7 @@ public abstract class BleProfileExpandableListActivity extends ExpandableListAct @Override public void onDeviceDisconnecting(final BluetoothDevice device) { - // do nothing + runOnUiThread(() -> mConnectButton.setText(R.string.action_disconnecting)); } @Override diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileServiceReadyActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileServiceReadyActivity.java index a6cde509..a8a4b136 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileServiceReadyActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileServiceReadyActivity.java @@ -464,8 +464,6 @@ public abstract class BleProfileServiceReadyActivityADD DEVICE CONNECTING… DISCONNECT + DISCONNECTING… Open Close