fix: handle configuration changes in SensorActivity

Fixes #2596
fossasia · Jan 28, 2025 · 6e94f1b · 6e94f1b
1 parent 98445e1
commit 6e94f1b
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/app/src/main/java/io/pslab/activity/SensorActivity.java b/app/src/main/java/io/pslab/activity/SensorActivity.java
@@ -10,6 +10,7 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
@@ -45,6 +46,11 @@
  */
 
 public class SensorActivity extends GuideActivity {
+    private static final String TAG = SensorActivity.class.getSimpleName();
+
+    private static final String KEY_ENTRIES_ADDRESSES = TAG + "_entries_addrs";
+    private static final String KEY_ENTRIES_NAMES = TAG + "_entries_names";
+    private static final String KEY_VALUE_SCAN = TAG + "_value_tvscan";
 
     private I2C i2c;
     private ScienceLab scienceLab;
@@ -94,6 +100,15 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         lvSensor = findViewById(R.id.lv_sensor);
         lvSensor.setAdapter(adapter);
 
+        if (savedInstanceState != null) {
+            String savedScanResults = savedInstanceState.getString(KEY_VALUE_SCAN);
+            List<String> savedNames = savedInstanceState.getStringArrayList(KEY_ENTRIES_NAMES);
+            List<String> savedAddresses = savedInstanceState.getStringArrayList(KEY_ENTRIES_ADDRESSES);
+            if (savedScanResults != null) tvSensorScan.setText(savedScanResults);
+            if (savedNames != null) dataName.addAll(savedNames);
+            if (savedAddresses != null) dataAddress.addAll(savedAddresses);
+        }
+
         buttonSensorAutoScan.setOnClickListener(v -> {
             buttonSensorAutoScan.setClickable(false);
             tvSensorScan.setText(getResources().getString(R.string.scanning));
@@ -155,6 +170,14 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         });
     }
 
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(KEY_VALUE_SCAN, tvSensorScan.getText().toString());
+        outState.putStringArrayList(KEY_ENTRIES_NAMES, new ArrayList<>(dataName));
+        outState.putStringArrayList(KEY_ENTRIES_ADDRESSES, new ArrayList<>(dataAddress));
+    }
+
     private class PopulateSensors extends AsyncTask<Void, Void, Void> {
         private List<Integer> detectedSensors;