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
removing Signal as a submodule
n8fr822dbf35332cb
diff --git a/.gitmodules b/.gitmodulesindex 0b1cef0..e69de29 100644--- a/.gitmodules+++ b/.gitmodules@@ -1,3 +0,0 @@-[submodule "external/libsignal-service-java"]- path = external/libsignal-service-java- url = https://github.com/WhisperSystems/libsignal-service-java.gitdiff --git a/build.gradle b/build.gradleindex 096edea..5977b62 100644--- a/build.gradle+++ b/build.gradle@@ -80,7 +80,7 @@ android {dependencies {- compile project(':external:libsignal-service-java:java')+// compile project(':external:libsignal-service-java:java')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/external/libsignal-service-java b/external/libsignal-service-javadeleted file mode 160000index 70a0b22..0000000--- a/external/libsignal-service-java+++ /dev/null@@ -1 +0,0 @@-Subproject commit 70a0b223b2732e1ceb01799edcd806ca70d0c489diff --git a/settings.gradle b/settings.gradleindex 1cd4d14..e69de29 100644--- a/settings.gradle+++ b/settings.gradle@@ -1,2 +0,0 @@-include ':external:libsignal-service-java:java'-diff --git a/src/main/java/info/guardianproject/phoneypot/service/signal/SignalSender.java b/src/main/java/info/guardianproject/phoneypot/service/signal/SignalSender.javadeleted file mode 100644index 052a30d..0000000--- a/src/main/java/info/guardianproject/phoneypot/service/signal/SignalSender.java+++ /dev/null@@ -1,78 +0,0 @@-package info.guardianproject.phoneypot.service.signal;--import org.whispersystems.libsignal.IdentityKeyPair;-import org.whispersystems.libsignal.InvalidKeyException;-import org.whispersystems.libsignal.state.PreKeyRecord;-import org.whispersystems.libsignal.state.SignedPreKeyRecord;-import org.whispersystems.libsignal.util.KeyHelper;-import org.whispersystems.libsignal.util.guava.Optional;-import org.whispersystems.signalservice.api.SignalServiceAccountManager;-import org.whispersystems.signalservice.api.SignalServiceMessageSender;-import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;-import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;-import org.whispersystems.signalservice.api.push.SignalServiceAddress;-import org.whispersystems.signalservice.api.push.TrustStore;--import java.io.IOException;-import java.util.List;--/**- * Created by n8fr8 on 10/31/17.- */--public class SignalSender {-- private final String URL = "https://my.signal.server.com";- private final TrustStore TRUST_STORE = null;//new MyTrustStoreImpl();- private final String USERNAME = "+14151231234";- private final String PASSWORD = null;//generateRandomPassword();- private final String USER_AGENT = "[FILL_IN]";-- private SignalServiceAccountManager accountManager;-- public SignalSender ()- {- accountManager = null; //new SignalServiceAccountManager(URL, TRUST_STORE, USERNAME, PASSWORD, USER_AGENT);--- }- public void generateKeys ()- {-- }-- public void register () throws IOException {-- accountManager.requestSmsVerificationCode();- }-- public void verify (String receivedSmsVerificationCode) throws IOException, InvalidKeyException {-- // accountManager.verifyAccountWithCode(receivedSmsVerificationCode, generateRandomSignalingKey(),- // generateRandomInstallId(), false);-- int signedPreKeyId = 1;-- IdentityKeyPair identityKey = KeyHelper.generateIdentityKeyPair();- List<PreKeyRecord> oneTimePreKeys = KeyHelper.generatePreKeys(0, 100);- SignedPreKeyRecord signedPreKeyRecord = KeyHelper.generateSignedPreKey(identityKey, signedPreKeyId);-- //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));- accountManager.setPreKeys(identityKey.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);- }-- public void sendMessage () throws IOException, UntrustedIdentityException {- SignalServiceMessageSender messageSender = null;-- /**- new SignalServiceMessageSender(URL, TRUST_STORE, USERNAME, PASSWORD,- new MySignalProtocolStore(),- USER_AGENT, Optional.absent());- **/-- messageSender.sendMessage(new SignalServiceAddress("+14159998888"),- SignalServiceDataMessage.newBuilder()- .withBody("Hello, world!")- .build());- }-}