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
ensure explanation is sent first, fix possible crash
Luke S0c778ffa29a8
diff --git a/src/main/java/org/havenapp/main/service/SignalSender.java b/src/main/java/org/havenapp/main/service/SignalSender.javaindex 59b1848..123da8e 100644--- a/src/main/java/org/havenapp/main/service/SignalSender.java+++ b/src/main/java/org/havenapp/main/service/SignalSender.java@@ -128,28 +128,18 @@ public class SignalSender {// Log.d("HEARTBEAT MONITOR," seconds remaining: " + millisUntilFinished / 1000);}public void onFinish() {- try {- beatingHeart();- } catch(Throwable e) {- e.printStackTrace();- }+ beatingHeart();start();}}.start();}private void beatingHeart () {+int unicodeBeat = 0x1F493;String emojiString = new String(Character.toChars(unicodeBeat));messageString = preferences.getHeartbeatMonitorMessage();- /**- * Use compiler for optimized concatenation.- * Send an explanatory message first, then the unicode symbol.- * Ensure above message sent before updating count.- * Check for a custom message, send that instead.- **/-if (mAlertCount < 1 )messageString = prefix + " " + interval + " " + suffix + "\n" + mContext.getString(R.string.battery_level_msg_text) + ": " + Utils.getBatteryPercentage(mContext) + "%";else if (messageString != null)@@ -163,19 +153,18 @@ public class SignalSender {private void initHbMessage (String message){if (!TextUtils.isEmpty(mUsername)) {+ mAlertCount ++;getInstance(mContext, mUsername.trim());ArrayList<String> recipient = new ArrayList<>();recipient.add(preferences.getSmsNumber());sendMessage(recipient, message,null);} else if (!TextUtils.isEmpty(preferences.getSmsNumber())) {+ mAlertCount ++;SmsManager manager = SmsManager.getDefault();StringTokenizer st = new StringTokenizer(preferences.getSmsNumber(),",");while (st.hasMoreTokens())manager.sendTextMessage(st.nextToken(), null, message, null, null);}-- mAlertCount ++; //moved outside of the send functions for now- Log.d("HEARTBEAT MONITOR", "Sent: " + message);}public void sendMessage (final ArrayList<String> recipients, final String message, final String attachment)