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
Catch '0' value, use existing methods to test
Luke Sd06527c6a7f5
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.javaindex 757e2be..8fa160f 100644--- a/src/main/java/org/havenapp/main/SettingsFragment.java+++ b/src/main/java/org/havenapp/main/SettingsFragment.java@@ -115,11 +115,6 @@ public class SettingsFragment extends PreferenceFragmentCompat implements SharedfindPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(R.string.register_signal_desc);}- if (preferences.getNotificationTimeMs()>0)- {- findPreference(PreferenceManager.NOTIFICATION_TIME).setSummary(preferences.getNotificationTimeMs()/60000 + " " + getString(R.string.minutes));- }-if (preferences.getHeartbeatActive()){((SwitchPreferenceCompat) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).setChecked(true);@@ -131,12 +126,13 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared}else{findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(R.string.heartbeat_time_dialog);+ preferences.activateHeartbeat(false);}}- if (preferences.getHeartbeatNotificationTimeMs()>0 )+ if (preferences.getHeartbeatNotificationTimeMs()> 300000){- findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(preferences.getHeartbeatNotificationTimeMs()/60000 + " " + getString(R.string.minutes));+ findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(preferences.getHeartbeatNotificationTimeMs() / 60000 + " " + getString(R.string.minutes));}Preference prefCameraSensitivity = findPreference(PreferenceManager.CAMERA_SENSITIVITY);@@ -396,6 +392,9 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Sharedtry {String text = ((EditTextPreference) findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY)).getText();int notificationTimeMs = Integer.parseInt(text) * 60000;+ if (notificationTimeMs <= 0)+ notificationTimeMs = 300000;+preferences.setHeartbeatMonitorNotifications(notificationTimeMs);findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(preferences.getHeartbeatNotificationTimeMs() / 60000 + " " + getString(R.string.minutes));diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xmlindex 7a07de5..25112e6 100644--- a/src/main/res/values/strings.xml+++ b/src/main/res/values/strings.xml@@ -153,8 +153,8 @@<string name="hearbeat_monitor">Heartbeat Notifications</string><string name="hearbeat_monitor_enable">Enable Heartbeat Monitor</string><string name="hearbeat_monitor_summary">Set Monitor Alert Interval</string>- <string name="heartbeat_time_dialog">Enter time (minutes) to limit heartbeat notifications. Minimum delay is 5.</string>- <string name="hearbeat_monitor_dialog">Send monitor status icon messages</string>+ <string name="heartbeat_time_dialog">Enter time (minutes) to send heartbeat notifications. Minimum recommended delay is 5 minutes.</string>+ <string name="hearbeat_monitor_dialog">Send status icon messages</string><string name="thumbsUp"><node>👍</node></string><string name="beatingHeart"><node>💓</node></string><string name="brokenHeart"><node>💔</node></string>