update strings and settings

guardianproject · Feb 8, 2019 · f7b002c · f7b002c
1 parent a45e395
commit f7b002c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.java
@@ -154,6 +154,13 @@ public void onCreatePreferences(Bundle bundle, String s) {
             findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(preferences.getHeartbeatNotificationTimeMs() / 60000 + " " + getString(R.string.minutes));
         }
 
+        if (preferences.getHeartbeatMonitorMessage() == null)
+        {
+            findPreference(PreferenceManager.HEARTBEAT_MONITOR_MESSAGE).setSummary(R.string.hearbeat_message_summary);
+        } else {
+            findPreference(PreferenceManager.HEARTBEAT_MONITOR_MESSAGE).setSummary(R.string.hearbeat_message_summary_on);
+        }
+
         Preference prefCameraSensitivity = findPreference(PreferenceManager.CAMERA_SENSITIVITY);
         prefCameraSensitivity.setOnPreferenceClickListener(preference -> {
             startActivity(new Intent(mActivity, CameraConfigureActivity.class));
@@ -434,6 +441,19 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
                 }
                 break;
             }
+            case PreferenceManager.HEARTBEAT_MONITOR_MESSAGE: {
+                String text = ((EditTextPreference) findPreference(PreferenceManager.HEARTBEAT_MONITOR_MESSAGE)).getText();
+
+                if (checkValidString(text)) {
+                    preferences.setHeartbeatMonitorMessage(text);
+                    findPreference(PreferenceManager.HEARTBEAT_MONITOR_MESSAGE).setSummary(R.string.hearbeat_message_summary_on);
+                }
+                else {
+                    preferences.setHeartbeatMonitorMessage(null);
+                    findPreference(PreferenceManager.HEARTBEAT_MONITOR_MESSAGE).setSummary(R.string.hearbeat_message_summary);
+                }
+                break;
+            }
             case PreferenceManager.CONFIG_BASE_STORAGE: {
                 setDefaultStoragePath();
                 break;

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
@@ -140,7 +140,7 @@
     <string name="notification_time">Notification Time Interval</string>
     <string name="notification_time_summary">Only send notifications at configured interval</string>
     <string name="notification_time_dialog">Enter time (minutes) to limit notifications. \'0\' to send every notification.</string>
-    <string name="minutes">minutes(s)</string>
+    <string name="minutes">minute(s)</string>
     <string name="keep_watch">Keep Watch!</string>
     <string name="camera_sensitivity_tip">Switch camera or use the slider to adjust motion detection sensitivity</string>
     <string name="disable_battery_opt_title">Disable Battery Optimizations</string>
@@ -150,11 +150,19 @@
     <string name="remove_all_logs">Remove all logs</string>
     <string name="events_deleted">Events deleted</string>
 
-    <string name="hearbeat_monitor">Heartbeat Monitor</string>
-    <string name="hearbeat_monitor_enable">Enable Heartbeat Notifications</string>
-    <string name="hearbeat_monitor_summary">Monitor Time Interval</string>
-    <string name="heartbeat_time_dialog">Enter interval time (minutes) to receive notifications:\n\nMinimum of 1, default is 5.</string>
-    <string name="hearbeat_monitor_dialog">Set alert delay for the status notifications </string>
+    <string name="hearbeat_monitor">Haven Heartbeat Monitor</string>
+    <string name="hearbeat_monitor_enable">Enable Heartbeat Alert</string>
+    <string name="hearbeat_monitor_summary">Checkup Interval</string>
+    <string name="heartbeat_time_dialog">Enter time (minutes) for battery % and a single-character, heart emoji to be sent. Alerts cease if monitoring is deactivated for any reason</string>
+    <string name="hearbeat_monitor_dialog">Configure delay between alerts</string>
+    <string name="hearbeat_message_dialog">Customize message sent for heartbeat notifications. Leave blank to use default heart emoji</string>
+    <string name="hearbeat_message_title">Alert Message</string>
+    <string name="hearbeat_message_summary">Receive customized messages</string>
+    <string name="hearbeat_message_summary_on">Custom alerts enabled</string>
+    <string name="hearbeat_monitor_initial_message_1">Heartbeat monitor activate: You will receive a notification every</string>
+    <string name="hearbeat_monitor_initial_message_2">minute(s) Haven is active &amp; monitoring.</string>
+    <string name="battery_level_msg_text">Battery Level</string>
+
     <string name="title_activity_video_player">VideoPlayerActivity</string>
     <string name="config_storage_path">Storage Folder Path</string>
     <string name="config_storage_page_hint">Where captured media is stored</string>