Merge branch 'hb-notification-mods' of https://github.com/lukeswitz/haven into lukeswitz-hb-notification-mods

Author: n8fr8

src/main/java/org/havenapp/main/PreferenceManager.java

@@ -363,7 +363,7 @@ public void setHeartbeatMonitorMessage (String hearbeatMessage)
         prefsEditor.commit();
     }
 
-    public String getHearbeatPrefix() {
+    public String getHeartbeatPrefix() {
         return context.getString(R.string.hearbeat_monitor_initial_message_1);
     }
 

src/main/java/org/havenapp/main/service/SignalSender.java

@@ -40,7 +40,7 @@ private SignalSender(Context context, String username)
         mUsername = username;
         mAlertCount = 0;
         preferences = new PreferenceManager(mContext);
-        prefix = preferences.getHearbeatPrefix();
+        prefix = preferences.getHeartbeatPrefix();
         suffix = preferences.getHeartbeatSuffix();
         messageString = preferences.getHeartbeatMonitorMessage();
         interval = preferences.getHeartbeatNotificationTimeMs() / 60000;
@@ -128,28 +128,18 @@ public void onTick(long millisUntilFinished) {
                 // 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 @@ else if (messageString != null)
     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)