ensure sensor configurations are properly saved

guardianproject · Jan 19, 2018 · 51186eb · 51186eb
1 parent 8ff99eb
commit 51186eb
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java
@@ -91,6 +91,8 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void onValueChanged(int oldValue, int newValue) {
                 mWaveform.setThreshold(newValue);
+                mPrefManager.setAccelerometerSensitivity(newValue+"");
+
             }
         });
 
@@ -268,23 +270,24 @@ protected void onDestroy() {
 
     }
 
-    private void save ()
-    {
-        //mPrefManager.setMicrophoneSensitivity(mNumberTrigger.getValue()+"");
 
-        mPrefManager.setAccelerometerSensitivity(mNumberTrigger.getValue()+"");
-        finish();
-    }
 
 
     @Override
-    public boolean onOptionsItemSelected (MenuItem item) {
-        switch (item.getItemId()){
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
             case android.R.id.home:
-                save();
                 finish();
                 break;
         }
         return true;
     }
+
+    /**
+     * When user closes the activity
+     */
+    @Override
+    public void onBackPressed() {
+        finish();
+    }
 }
diff --git a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
@@ -105,20 +105,12 @@ else if (camera.equals(PreferenceManager.BACK))
     }
 
 
-    /**
-     * Closes the monitor activity and unset session properties
-     */
-    private void close() {
-
-        finish();
-
-    }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
-                close();
+                finish();
                 break;
         }
         return true;
@@ -129,7 +121,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
      */
     @Override
     public void onBackPressed() {
-        close();
+        finish();
     }
 
     @Override

diff --git a/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java
@@ -60,6 +60,7 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void onValueChanged(int oldValue, int newValue) {
                 mWaveform.setThreshold(newValue);
+                mPrefManager.setMicrophoneSensitivity(newValue+"");
             }
         });
 
@@ -193,12 +194,6 @@ protected void onDestroy() {
 
     }
 
-    private void save ()
-    {
-        mPrefManager.setMicrophoneSensitivity(mNumberTrigger.getValue()+"");
-        finish();
-    }
-
     @Override
     public void onSignalReceived(short[] signal) {
         /*
@@ -247,14 +242,24 @@ public void onMicError() {
 
     }
 
+
+
+
     @Override
-    public boolean onOptionsItemSelected (MenuItem item) {
-        switch (item.getItemId()){
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
             case android.R.id.home:
-                save();
                 finish();
                 break;
         }
         return true;
     }
+
+    /**
+     * When user closes the activity
+     */
+    @Override
+    public void onBackPressed() {
+        finish();
+    }
 }