AA-252

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/guiUtilities/supportfragments/SignalsToPlotFragment.java

@@ -196,9 +196,8 @@ public static String joinStrings(String[] a){
 
     public void setDeviceNotStreamingView() {
         String[] notStreamingMsg = new String[]{"Device not streaming", "Signals to plot can only be displayed when device is streaming"};
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(context, android.R.layout.simple_list_item_1, notStreamingMsg);
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>(getActivity(), android.R.layout.simple_list_item_1, notStreamingMsg);
         setListAdapter(adapter);
     }
 
-
 }

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java

@@ -169,7 +169,7 @@ public void onCharacteristicChanged(byte[] data) {
 
     @Override
     public void disconnect() {
-
+        BleManager.getInstance().disconnect(mBleDevice);
     }
 
     @Override

ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmerserviceexample/MainActivity.java

@@ -358,6 +358,7 @@ public void onShimmerDeviceSelected(String macAddress, String deviceName) {
         dynamicPlot = plotFragment.getDynamicPlot();
 
         mService.stopStreamingAllDevices();
+        signalsToPlotFragment.setDeviceNotStreamingView();
     }
 
     @Override