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, building, but now working, support for Signal
n8fr8e4a1f0d700c3
diff --git a/build.gradle b/build.gradleindex 5977b62..97039aa 100644--- a/build.gradle+++ b/build.gradle@@ -24,7 +24,13 @@ allprojects {version_number="0.0.13"group_info="haven"signal_version="2.3.0"+ buildToolsVersion="26.0.2"+ compileSdkVersion=25+ minSdkVersion=16+ targetSdkVersion=25+ appcompat='com.android.support:appcompat-v7:25.2.0'}+}@@ -80,7 +86,7 @@ android {dependencies {-// compile project(':external:libsignal-service-java:java')+ compile project(':external:signal-cli')compile 'com.android.support:support-v4:25.4.0'compile 'com.github.satyan:sugar:1.5'compile 'com.android.support:appcompat-v7:25.4.0'diff --git a/settings.gradle b/settings.gradleindex e69de29..16cc12b 100644--- a/settings.gradle+++ b/settings.gradle@@ -0,0 +1 @@+include 'external:signal-cli'diff --git a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.javaindex 18c3746..72e7a19 100644--- a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java+++ b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java@@ -36,6 +36,7 @@ import android.widget.Toast;import info.guardianproject.netcipher.proxy.OrbotHelper;+import info.guardianproject.phoneypot.service.SignalSender;import info.guardianproject.phoneypot.service.WebServer;import info.guardianproject.phoneypot.ui.MicrophoneConfigureActivity;import me.angrybyte.numberpicker.view.ActualNumberPicker;@@ -124,13 +125,13 @@ public class SettingsActivity extends AppCompatActivity {timerDelay.setMinValue(0);timerDelay.setValue(preferences.getTimerDelay());- /**- findViewById(R.id.action_configure_movement).setOnClickListener(new View.OnClickListener() {+ findViewById(R.id.action_activate_signal).setOnClickListener(new View.OnClickListener() {@Overridepublic void onClick(View v) {+ activateSignal();}- });**/+ });findViewById(R.id.action_configure_mic).setOnClickListener(new View.OnClickListener() {@Override@@ -286,5 +287,11 @@ public class SettingsActivity extends AppCompatActivity {}}+ private void activateSignal ()+ {+ SignalSender.getInstance(this).register("+17185697272");+ // SignalSender.getInstance(this).verify("+17185697272","484177");++ }}diff --git a/src/main/java/info/guardianproject/phoneypot/service/SignalSender.java b/src/main/java/info/guardianproject/phoneypot/service/SignalSender.javanew file mode 100644index 0000000..de50f61--- /dev/null+++ b/src/main/java/info/guardianproject/phoneypot/service/SignalSender.java@@ -0,0 +1,74 @@+package info.guardianproject.phoneypot.service;++import android.content.Context;++import net.sourceforge.argparse4j.inf.Namespace;++import org.asamk.Signal;+import org.asamk.signal.Main;++import java.util.HashMap;++/**+ * Created by n8fr8 on 11/6/17.+ */++public class SignalSender {++ private Context mContext;+ private static SignalSender mInstance;++ private SignalSender(Context context)+ {+ mContext = context;+ }++ public static synchronized SignalSender getInstance (Context context)+ {+ if (mInstance == null)+ {+ mInstance = new SignalSender(context);+ }++ return mInstance;+ }++ public void register (final String phoneNumber)+ {+ execute (new Runnable() {+ public void run() {+ Main mainSignal = new Main(mContext);+ HashMap<String, Object> map = new HashMap<>();++ map.put("username", phoneNumber);+ map.put("command", "register");+ map.put("voice", false);++ Namespace ns = new Namespace(map);+ mainSignal.handleCommands(ns);+ }+ });+ }++ public void verify (final String phoneNumber, final String verificationCode)+ {+ execute (new Runnable() {+ public void run() {+ Main mainSignal = new Main(mContext);+ HashMap<String, Object> map = new HashMap<>();++ map.put("username", phoneNumber);+ map.put("command", "verify");+ map.put("verificationCode", verificationCode);++ Namespace ns = new Namespace(map);+ mainSignal.handleCommands(ns);+ }+ });+ }++ private void execute (Runnable runnable)+ {+ new Thread (runnable).start();+ }+}diff --git a/src/main/res/layout/activity_settings.xml b/src/main/res/layout/activity_settings.xmlindex 97c7770..f58bc60 100644--- a/src/main/res/layout/activity_settings.xml+++ b/src/main/res/layout/activity_settings.xml@@ -178,6 +178,29 @@android:layout_height="wrap_content"android:paddingTop="10dp"/>+ <LinearLayout+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:orientation="horizontal"+ android:paddingTop="10dp"++ >++ <TextView+ android:id="@+id/label_signal"+ android:text="Activate Secure Notifications"+ android:layout_alignParentLeft="true"+ android:layout_width="200dp"+ android:layout_height="wrap_content"+ />+ <Button+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="Activate Signal"+ android:id="@+id/action_activate_signal"+ />+ </LinearLayout></LinearLayout>+</ScrollView></LinearLayout>\ No newline at end of filediff --git a/src/main/res/menu/menu_main.xml b/src/main/res/menu/menu_main.xmlindex eda4a0c..b79b156 100644--- a/src/main/res/menu/menu_main.xml+++ b/src/main/res/menu/menu_main.xml@@ -5,6 +5,7 @@android:orderInCategory="100"android:title="@string/action_settings"app:showAsAction="never" />+<itemandroid:id="@+id/action_about"android:orderInCategory="100"