fix: recording starts even when device not connected. (#2295)

apoorva-raj · web-flow · commit 8903556109c9 · 2022-01-17T07:42:24.000+01:00
diff --git a/app/src/main/java/io/pslab/activity/AccelerometerActivity.java b/app/src/main/java/io/pslab/activity/AccelerometerActivity.java
@@ -1,6 +1,8 @@
 package io.pslab.activity;
 
 import android.content.SharedPreferences;
+import android.hardware.SensorManager;
+import android.hardware.Sensor;
 import androidx.fragment.app.Fragment;
 
 import androidx.preference.PreferenceManager;
@@ -102,6 +104,12 @@ public void getDataFromDataLogger() {
         }
     }
 
+    @Override
+    public boolean sensorFound() {
+        SensorManager sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
+        return sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER) != null;
+    }
+
     /**
      * Once settings have been changed, those changes can be captured from onResume method.
      */
diff --git a/app/src/main/java/io/pslab/activity/BarometerActivity.java b/app/src/main/java/io/pslab/activity/BarometerActivity.java
@@ -1,6 +1,8 @@
 package io.pslab.activity;
 
 import android.content.SharedPreferences;
+import android.hardware.SensorManager;
+import android.hardware.Sensor;
 import androidx.fragment.app.Fragment;
 
 import androidx.preference.PreferenceManager;
@@ -105,6 +107,12 @@ public void getDataFromDataLogger() {
         }
     }
 
+    @Override
+    public boolean sensorFound() {
+        SensorManager sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
+        return sensorManager.getDefaultSensor(Sensor.TYPE_PRESSURE) != null;
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
diff --git a/app/src/main/java/io/pslab/activity/CompassActivity.java b/app/src/main/java/io/pslab/activity/CompassActivity.java
@@ -1,6 +1,8 @@
 package io.pslab.activity;
 
 import android.content.SharedPreferences;
+import android.hardware.SensorManager;
+import android.hardware.Sensor;
 import androidx.fragment.app.Fragment;
 
 import androidx.preference.PreferenceManager;
@@ -101,6 +103,12 @@ public void getDataFromDataLogger() {
         }
     }
 
+    @Override
+    public boolean sensorFound() {
+        SensorManager sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
+        return sensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION) != null;
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
diff --git a/app/src/main/java/io/pslab/activity/DustSensorActivity.java b/app/src/main/java/io/pslab/activity/DustSensorActivity.java
@@ -133,4 +133,9 @@ public void getDataFromDataLogger() {
             getSupportActionBar().setTitle(title);
         }
     }
+
+    @Override
+    public boolean sensorFound() {
+        return false;
+    }
 }
diff --git a/app/src/main/java/io/pslab/activity/GasSensorActivity.java b/app/src/main/java/io/pslab/activity/GasSensorActivity.java
@@ -98,4 +98,9 @@ public void getDataFromDataLogger() {
             getSupportActionBar().setTitle(title);
         }
     }
+
+    @Override
+    public boolean sensorFound() {
+        return false;
+    }
 }
diff --git a/app/src/main/java/io/pslab/activity/GyroscopeActivity.java b/app/src/main/java/io/pslab/activity/GyroscopeActivity.java
@@ -1,8 +1,9 @@
 package io.pslab.activity;
 
 import android.content.SharedPreferences;
+import android.hardware.SensorManager;
+import android.hardware.Sensor;
 import androidx.fragment.app.Fragment;
-
 import androidx.preference.PreferenceManager;
 
 import io.pslab.R;
@@ -101,6 +102,12 @@ public void getDataFromDataLogger() {
         }
     }
 
+    @Override
+    public boolean sensorFound() {
+        SensorManager sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
+        return sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE) != null;
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
diff --git a/app/src/main/java/io/pslab/activity/LuxMeterActivity.java b/app/src/main/java/io/pslab/activity/LuxMeterActivity.java
@@ -1,8 +1,9 @@
 package io.pslab.activity;
 
 import android.content.SharedPreferences;
+import android.hardware.SensorManager;
+import android.hardware.Sensor;
 import androidx.fragment.app.Fragment;
-
 import androidx.preference.PreferenceManager;
 
 import io.pslab.R;
@@ -102,6 +103,12 @@ public void getDataFromDataLogger() {
         }
     }
 
+    @Override
+    public boolean sensorFound() {
+        SensorManager sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
+        return sensorManager.getDefaultSensor(Sensor.TYPE_LIGHT) != null;
+    }
+
     /**
      * Once settings have been changed, those changes can be captured from onResume method.
      * reinstateConfigurations() will update the logs with new settings
diff --git a/app/src/main/java/io/pslab/activity/OscilloscopeActivity.java b/app/src/main/java/io/pslab/activity/OscilloscopeActivity.java
@@ -527,6 +527,9 @@ public void onClick(View view) {
                                     startActivity(intent);
                                 }
                             }, Snackbar.LENGTH_SHORT);
+                } else if (!isRecording && !scienceLab.isConnected()) {
+                    CustomSnackBar.showSnackBar(mainLayout, getString(R.string.device_not_connected), null, null, Snackbar.LENGTH_SHORT);
+
                 } else {
                     isRecording = true;
                     item.setIcon(R.drawable.ic_record_stop_white);
diff --git a/app/src/main/java/io/pslab/activity/SoundMeterActivity.java b/app/src/main/java/io/pslab/activity/SoundMeterActivity.java
@@ -104,6 +104,11 @@ public void getDataFromDataLogger() {
         }
     }
 
+    @Override
+    public boolean sensorFound() {
+        return true;
+    }
+
     /**
      * Once settings have been changed, those changes can be captured from onResume method.
      * reinstateConfigurations() will update the logs with new settings
diff --git a/app/src/main/java/io/pslab/activity/ThermometerActivity.java b/app/src/main/java/io/pslab/activity/ThermometerActivity.java
@@ -1,8 +1,9 @@
 package io.pslab.activity;
 
 import android.content.SharedPreferences;
+import android.hardware.SensorManager;
+import android.hardware.Sensor;
 import androidx.fragment.app.Fragment;
-
 import androidx.preference.PreferenceManager;
 
 import io.pslab.R;
@@ -102,6 +103,12 @@ public void getDataFromDataLogger() {
         }
     }
 
+    @Override
+    public boolean sensorFound() {
+        SensorManager sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
+        return sensorManager.getDefaultSensor(Sensor.TYPE_AMBIENT_TEMPERATURE) != null;
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
diff --git a/app/src/main/java/io/pslab/models/PSLabSensor.java b/app/src/main/java/io/pslab/models/PSLabSensor.java
@@ -51,7 +51,9 @@
 import io.pslab.others.LocalDataLog;
 import io.pslab.others.MathUtils;
 import io.pslab.others.PSLabPermission;
+import io.pslab.others.ScienceLabCommon;
 import io.pslab.others.SwipeGestureDetector;
+import io.pslab.communication.ScienceLab;
 import io.realm.Realm;
 import io.realm.RealmObject;
 
@@ -69,6 +71,7 @@ public abstract class PSLabSensor extends AppCompatActivity {
     public CoordinatorLayout sensorParentView;
     public BottomSheetBehavior<View> bottomSheetBehavior;
     public GestureDetector gestureDetector;
+    public ScienceLab scienceLab;
 
     public JSONArray markers;
 
@@ -227,6 +230,11 @@ public abstract class PSLabSensor extends AppCompatActivity {
      */
     public abstract void getDataFromDataLogger();
 
+    /**
+     * This method will check whether the device has in-built sensor or not
+     **/
+    public abstract boolean sensorFound();
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -247,6 +255,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setUpBottomSheet();
         fillUpFragment();
         invalidateOptionsMenu();
+        scienceLab = ScienceLabCommon.scienceLab;
     }
 
     /**
@@ -316,8 +325,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
               will fire up. If user declines to give permission, don't do anything.
              */
             case R.id.record_data:
-                if (!isRecording) {
+                if (!isRecording && (sensorFound() || scienceLab.isConnected())) {
                     dataRecordingCycle();
+                } else if (!isRecording && !sensorFound() && !scienceLab.isConnected()) {
+                    CustomSnackBar.showSnackBar(sensorParentView, getString(R.string.device_not_connected), null, null, Snackbar.LENGTH_SHORT);
                 } else {
                     stopRecordSensorData();
                     displayLogLocationOnSnackBar();
@@ -336,8 +347,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
                         ((OperationCallback) fragment).playData();
                     }
                 } else {
-                    if(getSensorFragment() instanceof SoundMeterDataFragment) {
-                        if(!playingData) {
+                    if (getSensorFragment() instanceof SoundMeterDataFragment) {
+                        if (!playingData) {
                             ((SoundMeterDataFragment) getSupportFragmentManager()
                                     .findFragmentByTag(getSensorName())).pause();
                         } else {
@@ -582,7 +593,7 @@ private void setupGuideLayout() {
         // if sensor doesn't image in it's guide and hence returns 0 for getGuideSchematics(), hide the visibility of bottomSheetSchematic
         if (getGuideSchematics() != 0) {
             bottomSheetSchematic.setImageResource(getGuideSchematics());
-        }else{
+        } else {
             bottomSheetSchematic.setVisibility(View.GONE);
         }
         // If a sensor has extra content than provided in the standard layout, create a new layout

Original file line number	Diff line number	Diff line change
`@@ -133,4 +133,9 @@ public void getDataFromDataLogger() {`
`133`	`133`	`getSupportActionBar().setTitle(title);`
`134`	`134`	`}`
`135`	`135`	`}`
	`136`	`+`
	`137`	`+ @Override`
	`138`	`+ public boolean sensorFound() {`
	`139`	`+ return false;`
	`140`	`+ }`
`136`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,4 +98,9 @@ public void getDataFromDataLogger() {`
`98`	`98`	`getSupportActionBar().setTitle(title);`
`99`	`99`	`}`
`100`	`100`	`}`
	`101`	`+`
	`102`	`+ @Override`
	`103`	`+ public boolean sensorFound() {`
	`104`	`+ return false;`
	`105`	`+ }`
`101`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,11 @@ public void getDataFromDataLogger() {`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
	`107`	`+ @Override`
	`108`	`+ public boolean sensorFound() {`
	`109`	`+ return true;`
	`110`	`+ }`
	`111`	`+`
`107`	`112`	`/**`
`108`	`113`	`* Once settings have been changed, those changes can be captured from onResume method.`
`109`	`114`	`* reinstateConfigurations() will update the logs with new settings`