|
@@ -569,9 +569,10 @@ public class BridgeServerActivity extends AppCompatActivity {
|
|
|
@Override
|
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
|
|
|
|
+ final String device_name = info.getName();
|
|
|
bridgeServer.deleteVirtualOCFDevice(device.getVODIndex());
|
|
|
Toast.makeText(BridgeServerActivity.this,
|
|
|
- getString(R.string.removeVODOkMessage).replace("?", info.getName())
|
|
|
+ getString(R.string.removeVODOkMessage).replace("?", device_name)
|
|
|
, Toast.LENGTH_LONG).show();
|
|
|
}
|
|
|
});
|
|
@@ -634,14 +635,16 @@ public class BridgeServerActivity extends AppCompatActivity {
|
|
|
confirmBridgeDialogBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
|
|
|
@Override
|
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
|
- if(bridgeService != null && bridgeServer != null) {
|
|
|
+ if(bridgeService != null ) {
|
|
|
bridgeService.stopScheduledTaskForLightControl();
|
|
|
- bridgeService.unbindLightControlService();
|
|
|
- for(VirtualOCFDevice vod : bridgeServer.getVirtualOCFDeviceList()) {
|
|
|
- if(vod.getEcoName().equalsIgnoreCase(BridgeService.LightControlServiceConnection.ECO_NAME)) {
|
|
|
- bridgeServer.removeVirtualOCFDevice(vod.getVODIndex());
|
|
|
+ if(bridgeServer != null && bridgeServer.getVirtualOCFDeviceList() != null) {
|
|
|
+ for (VirtualOCFDevice vod : bridgeServer.getVirtualOCFDeviceList()) {
|
|
|
+ if (vod.getEcoName().equalsIgnoreCase(BridgeService.LightControlServiceConnection.ECO_NAME)) {
|
|
|
+ bridgeServer.removeVirtualOCFDevice(vod.getVODIndex());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+ bridgeService.unbindLightControlService();
|
|
|
}
|
|
|
}
|
|
|
});
|