Skip to content

armgit / haven

Public Imported from GitHub
0

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

Merge branch 'master' of github.com:guardianproject/haven into remove_sms_support

Arka Prava Basu3ae21daeca89
diff --cc src/main/java/org/havenapp/main/service/SignalSender.java
index 689e1f2,59b1848..d7b2a9b
--- a/src/main/java/org/havenapp/main/service/SignalSender.java
+++ b/src/main/java/org/havenapp/main/service/SignalSender.java
@@@ -126,9 -165,17 +165,12 @@@ public class SignalSender
if (!TextUtils.isEmpty(mUsername)) {
getInstance(mContext, mUsername.trim());
ArrayList<String> recipient = new ArrayList<>();
- recipient.add(preferences.getSmsNumber());
+ recipient.add(preferences.getRemotePhoneNumber());
- sendMessage(recipient, emojiString,null);
+ sendMessage(recipient, message,null);
- } else if (!TextUtils.isEmpty(preferences.getSmsNumber())) {
- 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)