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
add support for sending photos via Signal
n8fr80574cebd27b3
diff --git a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.javaindex 389d49c..5135e01 100644--- a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java+++ b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java@@ -396,7 +396,7 @@ public class SettingsActivity extends AppCompatActivity {SignalSender sender =SignalSender.getInstance(SettingsActivity.this, preferences.getSignalUsername());ArrayList<String> recip = new ArrayList<>();recip.add(input.getText().toString());- sender.sendMessage(recip,getString(R.string.signal_test_message));+ sender.sendMessage(recip,getString(R.string.signal_test_message),null);}});diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.javaindex 62a38ba..bc071c8 100644--- a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java+++ b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java@@ -290,7 +290,14 @@ public class MonitorService extends Service {StringTokenizer st = new StringTokenizer(prefs.getSmsNumber(),",");while (st.hasMoreTokens())recips.add(st.nextToken());- sender.sendMessage(recips,alertMessage.toString());++ String attachment = null;+ if (eventTrigger.getType() == EventTrigger.CAMERA)+ {+ attachment = eventTrigger.getPath();+ }++ sender.sendMessage(recips,alertMessage.toString(), attachment);}else if (prefs.getSmsActivation()){diff --git a/src/main/java/info/guardianproject/phoneypot/service/SignalSender.java b/src/main/java/info/guardianproject/phoneypot/service/SignalSender.javaindex 610d890..b4a9c1a 100644--- a/src/main/java/info/guardianproject/phoneypot/service/SignalSender.java+++ b/src/main/java/info/guardianproject/phoneypot/service/SignalSender.java@@ -82,7 +82,7 @@ public class SignalSender {});}- public void sendMessage (final ArrayList<String> recipients, final String message)+ public void sendMessage (final ArrayList<String> recipients, final String message, final String attachment){execute (new Runnable() {public void run() {@@ -95,6 +95,13 @@ public class SignalSender {map.put("command", "send");map.put("message", message);+ if (attachment != null)+ {+ ArrayList<String> attachments = new ArrayList<>();+ attachments.add(attachment);+ map.put("attachment",attachments);+ }+Namespace ns = new Namespace(map);mainSignal.handleCommands(ns);}