Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

don't autoactive timer unless already running

n8fr8b5868a1e416c
diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.java
index 0e6bc3a..257701b 100644
--- a/src/main/java/org/havenapp/main/MonitorActivity.java
+++ b/src/main/java/org/havenapp/main/MonitorActivity.java
@@ -208,13 +208,19 @@ public class MonitorActivity extends FragmentActivity {
private void showSettings ()
{
+ Intent i = new Intent(this,SettingsActivity.class);
+
if (cTimer != null) {
cTimer.cancel();
cTimer = null;
+ startActivityForResult(i,9999);
+
+ }
+ else
+ {
+ startActivity(i);
}
- Intent i = new Intent(this,SettingsActivity.class);
- startActivityForResult(i,9999);
}
@Override