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

Change scope of 💓 to MonitorService.

Luke Seb494d544373
diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.java
index e630b7f..24bf755 100644
--- a/src/main/java/org/havenapp/main/PreferenceManager.java
+++ b/src/main/java/org/havenapp/main/PreferenceManager.java
@@ -51,6 +51,7 @@ public class PreferenceManager {
public static final String CONFIG_MOVEMENT ="config_movement";
public static final String HEARTBEAT_MONITOR_ACTIVE="heartbeat_monitor_active";
public static final String HEARTBEAT_MONITOR_DELAY="heartbeat_monitor_delay";
+ public static final String MONITOR_SERVICE_ACTIVE="monitor_service_active";
private static final String FLASH_ACTIVE="flash_active";
private static final String MICROPHONE_ACTIVE="microphone_active";
private static final String MICROPHONE_SENSITIVITY="microphone_sensitivity";
@@ -122,6 +123,16 @@ public class PreferenceManager {
return appSharedPrefs.getBoolean(REMOTE_ACCESS_ACTIVE,false);
}
+ public void activateMonitorService (boolean active) {
+ prefsEditor.putBoolean(MONITOR_SERVICE_ACTIVE,active);
+ prefsEditor.commit();
+ }
+
+ public boolean getMonitorServiceActive ()
+ {
+ return appSharedPrefs.getBoolean(MONITOR_SERVICE_ACTIVE,false);
+ }
+
public void setRemoteAccessOnion (String onionAddress) {
prefsEditor.putString(REMOTE_ACCESS_ONION,onionAddress);
prefsEditor.commit();
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.java
index d58b8eb..2cbf079 100644
--- a/src/main/java/org/havenapp/main/SettingsFragment.java
+++ b/src/main/java/org/havenapp/main/SettingsFragment.java
@@ -25,12 +25,14 @@ import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.SwitchPreferenceCompat;
import android.text.TextUtils;
+import android.util.Log;
import android.view.MenuItem;
import android.widget.Toast;
import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat;
import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
+import org.havenapp.main.service.MonitorService;
import org.havenapp.main.service.SignalSender;
import org.havenapp.main.service.WebServer;
import org.havenapp.main.ui.AccelConfigureActivity;
@@ -123,17 +125,11 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
if (preferences.getHeartbeatActive())
{
((SwitchPreferenceCompat) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).setChecked(true);
- boolean heartOn = ((SwitchPreferenceCompat) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).isChecked();
- boolean isMonitoring = preferences.getHeartbeatActive();
-
- if (heartOn || isMonitoring) { //Check for stray timers/monitors
- preferences.activateHeartbeat(true);
+ if (preferences.getHeartbeatActive()) {
findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(preferences.getHeartbeatNotificationTimeMs() / 60000 + " " + getString(R.string.minutes));
}
- else{
- preferences.activateHeartbeat(false);
+ else
findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(R.string.heartbeat_time_dialog);
- }
}
if (preferences.getHeartbeatNotificationTimeMs()> 300000)
@@ -377,21 +373,22 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
break;
}
case PreferenceManager.HEARTBEAT_MONITOR_ACTIVE: {
- boolean heartbeatActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).isChecked();
boolean isMonitoring = preferences.getHeartbeatActive();
- if (heartbeatActive && !isMonitoring)
- {
+ boolean hbSwitchOn = ((SwitchPreferenceCompat) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).isChecked();
+ if (!isMonitoring && hbSwitchOn) {
preferences.activateHeartbeat(true);
findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(preferences.getHeartbeatNotificationTimeMs() / 60000 + " " + getString(R.string.minutes));
- SignalSender sender = SignalSender.getInstance(getContext(), preferences.getSignalUsername());
- sender.startHeartbeatTimer(preferences.getHeartbeatNotificationTimeMs());
- }
- else if (!heartbeatActive && isMonitoring)
- {
+ if (preferences.getMonitorServiceActive()) {
+ SignalSender sender = SignalSender.getInstance(getContext(), preferences.getSignalUsername());
+ sender.startHeartbeatTimer(preferences.getHeartbeatNotificationTimeMs());
+ }
+ } else if (!hbSwitchOn && isMonitoring) {
preferences.activateHeartbeat(false);
findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(R.string.hearbeat_monitor_dialog);
- SignalSender sender = SignalSender.getInstance(getContext(), preferences.getSignalUsername());
- sender.stopHeartbeatTimer();
+ if (preferences.getMonitorServiceActive()) {
+ SignalSender sender = SignalSender.getInstance(getContext(), preferences.getSignalUsername());
+ sender.stopHeartbeatTimer();
+ }
}
break;
}
@@ -406,12 +403,11 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(preferences.getHeartbeatNotificationTimeMs() / 60000 + " " + getString(R.string.minutes));
boolean heartbeatActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).isChecked();
- if (heartbeatActive) {
+ if (heartbeatActive && preferences.getMonitorServiceActive()) {
SignalSender sender = SignalSender.getInstance(getContext(), preferences.getSignalUsername());
sender.stopHeartbeatTimer();
sender.startHeartbeatTimer(preferences.getHeartbeatNotificationTimeMs());
}
-
} catch (NumberFormatException ne) {
//error parsing user value
}
diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.java
index 68a2a25..78ebf07 100644
--- a/src/main/java/org/havenapp/main/service/MonitorService.java
+++ b/src/main/java/org/havenapp/main/service/MonitorService.java
@@ -114,6 +114,7 @@ public class MonitorService extends Service {
/**
* Called on service creation, sends a notification
*/
+ @SuppressLint("InvalidWakeLockTag")
@Override
public void onCreate() {
@@ -230,6 +231,13 @@ public class MonitorService extends Service {
mBaroMonitor = new BarometerMonitor(this);
mLightMonitor = new AmbientLightMonitor(this);
+ mPrefs.activateMonitorService(true);
+
+ if (mPrefs.getHeartbeatActive()){
+ SignalSender sender = SignalSender.getInstance(this, mPrefs.getSignalUsername());
+ sender.startHeartbeatTimer(mPrefs.getHeartbeatNotificationTimeMs());
+ }
+
// && !mPrefs.getVideoMonitoringActive()
if (!mPrefs.getMicrophoneSensitivity().equals(PreferenceManager.OFF))
@@ -259,6 +267,14 @@ public class MonitorService extends Service {
if (!mPrefs.getMicrophoneSensitivity().equals(PreferenceManager.OFF))
mMicMonitor.stop(this);
+
+ if (mPrefs.getMonitorServiceActive()) {
+ mPrefs.activateMonitorService(false);
+ if (mPrefs.getHeartbeatActive()) {
+ SignalSender sender = SignalSender.getInstance(this, mPrefs.getSignalUsername());
+ sender.stopHeartbeatTimer();
+ }
+ }
}
/**