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
Cleanup strings and SignalSender for testing
Luke Sd1511cd9f86c
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.javaindex 8fa160f..b0c5297 100644--- a/src/main/java/org/havenapp/main/SettingsFragment.java+++ b/src/main/java/org/havenapp/main/SettingsFragment.java@@ -120,13 +120,14 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared((SwitchPreferenceCompat) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).setChecked(true);boolean heartOn = ((SwitchPreferenceCompat) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).isChecked();boolean isMonitoring = preferences.getHeartbeatActive();- if (heartOn || isMonitoring) {++ if (heartOn || isMonitoring) { //Check for stray timers/monitorspreferences.activateHeartbeat(true);findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(preferences.getHeartbeatNotificationTimeMs() / 60000 + " " + getString(R.string.minutes));}else{- findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(R.string.heartbeat_time_dialog);preferences.activateHeartbeat(false);+ findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(R.string.heartbeat_time_dialog);}}diff --git a/src/main/java/org/havenapp/main/service/SignalSender.java b/src/main/java/org/havenapp/main/service/SignalSender.javaindex 8652ed3..076d2a6 100644--- a/src/main/java/org/havenapp/main/service/SignalSender.java+++ b/src/main/java/org/havenapp/main/service/SignalSender.java@@ -24,6 +24,7 @@ public class SignalSender {private Context mContext;private static SignalSender mInstance;private String mUsername; //aka your signal phone number+ private String emojiString;private CountDownTimer mCountdownTimer;private PreferenceManager preferences;@@ -94,7 +95,6 @@ public class SignalSender {mCountdownTimer.cancel();mCountdownTimer = null;Log.d("HEARTBEAT TIMER", "Stopped" );-}public void startHeartbeatTimer (int countMs)@@ -121,7 +121,7 @@ public class SignalSender {{preferences = new PreferenceManager(mContext);int unicodeBeat = 0x1F493;- String emojiString = new String(Character.toChars(unicodeBeat));+ emojiString = new String(Character.toChars(unicodeBeat));if (!TextUtils.isEmpty(mUsername)) {SignalSender sender = SignalSender.getInstance(mContext, mUsername.trim());diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xmlindex 25112e6..e4986e9 100644--- a/src/main/res/values/strings.xml+++ b/src/main/res/values/strings.xml@@ -153,12 +153,7 @@<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 send heartbeat notifications. Minimum recommended delay is 5 minutes.</string>+ <string name="heartbeat_time_dialog">Enter time (minutes) to send heartbeat notifications. Default is 5 minutes, the minimum is 1.</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>- <string name="beatingHeartUnicode">0x1F493</string>- <string name="brokenHeartUnicode">0x1F494</string>-+</resources>