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

for #21, add signal sending support for event notifications

n8fr8404e46a8ee1f
diff --git a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java
index 6c321c2..389d49c 100644
--- a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java
@@ -326,7 +326,8 @@ public class SettingsActivity extends AppCompatActivity {
@Override
public void onClick(DialogInterface dialog, int which) {
preferences.setSignalUsername(input.getText().toString());
- activateSignal(input.getText().toString(),null);
+ resetSignal(preferences.getSignalUsername());
+ activateSignal(preferences.getSignalUsername(),null);
checkSignalUsername();
}
});
@@ -362,6 +363,12 @@ public class SettingsActivity extends AppCompatActivity {
}
+ private void resetSignal (String username)
+ {
+ SignalSender sender =SignalSender.getInstance(this, username);
+ sender.reset();
+ }
+
private void activateSignal (String username, String verifyCode)
{
SignalSender sender =SignalSender.getInstance(this, username);
diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/MicrophoneMonitor.java b/src/main/java/info/guardianproject/phoneypot/sensors/MicrophoneMonitor.java
index 5ca1aa5..8251594 100644
--- a/src/main/java/info/guardianproject/phoneypot/sensors/MicrophoneMonitor.java
+++ b/src/main/java/info/guardianproject/phoneypot/sensors/MicrophoneMonitor.java
@@ -99,7 +99,8 @@ public final class MicrophoneMonitor implements MicSamplerTask.MicListener {
public void stop (Context context)
{
context.unbindService(mConnection);
- microphone.cancel(true);
+ if (microphone != null)
+ microphone.cancel(true);
}
diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
index 7d9c0bc..62a38ba 100644
--- a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
+++ b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
@@ -25,8 +25,12 @@ import android.telephony.SmsManager;
import android.text.TextUtils;
import android.util.Log;
+import org.asamk.Signal;
+
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.StringTokenizer;
import info.guardianproject.phoneypot.MonitorActivity;
import info.guardianproject.phoneypot.R;
@@ -266,20 +270,39 @@ public class MonitorService extends Service {
* If SMS mode is on we send an SMS alert to the specified
* number
*/
- if (isNewEvent && prefs.getSmsActivation()) {
+ if (isNewEvent) {
//get the manager
StringBuffer alertMessage = new StringBuffer();
alertMessage.append(getString(R.string.intrusion_detected,eventTrigger.getStringType()));
- if (prefs.getRemoteAccessActive() && (!TextUtils.isEmpty(prefs.getRemoteAccessOnion())))
+ if (prefs.getSignalUsername() != null)
+ {
+ //since this is a secure channel, we can add the Onion address
+ if (prefs.getRemoteAccessActive() && (!TextUtils.isEmpty(prefs.getRemoteAccessOnion())))
+ {
+ alertMessage.append(" http://").append(prefs.getRemoteAccessOnion())
+ .append(':').append(WebServer.LOCAL_PORT);
+ }
+
+ SignalSender sender = SignalSender.getInstance(this,prefs.getSignalUsername());
+ ArrayList<String> recips = new ArrayList<>();
+ StringTokenizer st = new StringTokenizer(prefs.getSmsNumber(),",");
+ while (st.hasMoreTokens())
+ recips.add(st.nextToken());
+ sender.sendMessage(recips,alertMessage.toString());
+ }
+ else if (prefs.getSmsActivation())
{
- alertMessage.append(" http://").append(prefs.getRemoteAccessOnion())
- .append(':').append(WebServer.LOCAL_PORT);
+ SmsManager manager = SmsManager.getDefault();
+
+ StringTokenizer st = new StringTokenizer(prefs.getSmsNumber(),",");
+ while (st.hasMoreTokens())
+ manager.sendTextMessage(st.nextToken(), null, alertMessage.toString(), null, null);
+
}
- SmsManager manager = SmsManager.getDefault();
- manager.sendTextMessage(prefs.getSmsNumber(), null, alertMessage.toString(), null, null);
+
}
diff --git a/src/main/java/info/guardianproject/phoneypot/service/SignalSender.java b/src/main/java/info/guardianproject/phoneypot/service/SignalSender.java
index 47a03d4..610d890 100644
--- a/src/main/java/info/guardianproject/phoneypot/service/SignalSender.java
+++ b/src/main/java/info/guardianproject/phoneypot/service/SignalSender.java
@@ -41,6 +41,13 @@ public class SignalSender {
mUsername = username;
}
+ public void reset ()
+ {
+ Main mainSignal = new Main(mContext);
+ mainSignal.resetUser();
+ mInstance = null;
+ }
+
public void register ()
{
execute (new Runnable() {
@@ -82,6 +89,7 @@ public class SignalSender {
Main mainSignal = new Main(mContext);
HashMap<String, Object> map = new HashMap<>();
+ map.put("username", mUsername);
map.put("endsession",false);
map.put("recipient", recipients);
map.put("command", "send");