caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge

Browse source
This commit is contained in:
Bart Sopers 2020-12-26 18:03:50 +01:00
parent abb380b219 12ea97aa6f
commit 00469a71f5
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.java
View file

@ -59,7 +59,6 @@ public class RileyLinkBLEConfigActivity extends NoSplashAppCompatActivity {
private ScanSettings settings; private ScanSettings settings;
private List<ScanFilter> filters; private List<ScanFilter> filters;
private ListView deviceList;
private TextView currentlySelectedRileyLinkName; private TextView currentlySelectedRileyLinkName;
private TextView currentlySelectedRileyLinkAddress; private TextView currentlySelectedRileyLinkAddress;
private Button buttonRemoveRileyLink; private Button buttonRemoveRileyLink;
@ -71,7 +70,6 @@ public class RileyLinkBLEConfigActivity extends NoSplashAppCompatActivity {
private Handler handler; private Handler handler;
public boolean scanning; public boolean scanning;
private boolean rlDisconnected;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@ -87,7 +85,7 @@ public class RileyLinkBLEConfigActivity extends NoSplashAppCompatActivity {
buttonRemoveRileyLink = findViewById(R.id.riley_link_ble_config_button_remove_riley_link); buttonRemoveRileyLink = findViewById(R.id.riley_link_ble_config_button_remove_riley_link);
buttonStartScan = findViewById(R.id.riley_link_ble_config_scan_start); buttonStartScan = findViewById(R.id.riley_link_ble_config_scan_start);
buttonStopScan = findViewById(R.id.riley_link_ble_config_button_scan_stop); buttonStopScan = findViewById(R.id.riley_link_ble_config_button_scan_stop);
deviceList = findViewById(R.id.riley_link_ble_config_scan_device_list); ListView deviceList = findViewById(R.id.riley_link_ble_config_scan_device_list);
deviceList.setAdapter(deviceListAdapter); deviceList.setAdapter(deviceListAdapter);
deviceList.setOnItemClickListener((parent, view, position, id) -> { deviceList.setOnItemClickListener((parent, view, position, id) -> {
// stop scanning if still active // stop scanning if still active
@ -111,8 +109,6 @@ public class RileyLinkBLEConfigActivity extends NoSplashAppCompatActivity {
buttonStartScan.setOnClickListener(view -> { buttonStartScan.setOnClickListener(view -> {
// disable currently selected RL, so that we can discover it // disable currently selected RL, so that we can discover it
rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkDisconnect, this); rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkDisconnect, this);
rlDisconnected = true;
startLeDeviceScan(); startLeDeviceScan();
}); });