Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Heartbeat cleanup and fixes #374

Merged
merged 2 commits into from
Feb 28, 2019
Merged

Heartbeat cleanup and fixes #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c778ff
ensure explanation is sent first, fix possible crash
lukeswitz Feb 12, 2019
b3b6f9a
fix misspelled method name
lukeswitz Feb 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/havenapp/main/PreferenceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
21 changes: 5 additions & 16 deletions src/main/java/org/havenapp/main/service/SignalSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down