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

More tweaks to Settings, SMS / Signal setup and testing

n8fr837396bc1bec7
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.java
index 1f4fcca..748b171 100644
--- a/src/main/java/org/havenapp/main/ListActivity.java
+++ b/src/main/java/org/havenapp/main/ListActivity.java
@@ -35,6 +35,8 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.support.v7.widget.helper.ItemTouchHelper;
+import android.telephony.SmsManager;
+import android.text.TextUtils;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
@@ -45,6 +47,7 @@ import com.mikepenz.aboutlibraries.LibsBuilder;
import org.havenapp.main.model.Event;
import org.havenapp.main.model.EventTrigger;
+import org.havenapp.main.service.SignalSender;
import org.havenapp.main.ui.EventActivity;
import org.havenapp.main.ui.EventAdapter;
import org.havenapp.main.ui.PPAppIntro;
@@ -54,7 +57,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-
+import java.util.StringTokenizer;
public class ListActivity extends AppCompatActivity {
@@ -327,6 +330,9 @@ public class ListActivity extends AppCompatActivity {
case R.id.action_licenses:
showLicenses();
break;
+ case R.id.action_test_notification:
+ testNotifications();
+ break;
}
return true;
}
@@ -342,4 +348,24 @@ public class ListActivity extends AppCompatActivity {
//start the activity
.start(this);
}
+
+ private void testNotifications ()
+ {
+
+ if (!TextUtils.isEmpty(preferences.getSignalUsername())) {
+ SignalSender sender = SignalSender.getInstance(this, preferences.getSignalUsername().trim());
+ ArrayList<String> recip = new ArrayList<>();
+ recip.add(preferences.getSmsNumber());
+ sender.sendMessage(recip, getString(R.string.signal_test_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, getString(R.string.signal_test_message), null, null);
+
+ }
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/havenapp/main/SettingsActivity.java b/src/main/java/org/havenapp/main/SettingsActivity.java
index 3a02420..850029d 100644
--- a/src/main/java/org/havenapp/main/SettingsActivity.java
+++ b/src/main/java/org/havenapp/main/SettingsActivity.java
@@ -57,4 +57,9 @@ public class SettingsActivity extends AppCompatActivity {
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
mFragment.onRequestPermissionsResult(requestCode, permissions, grantResults);
}
+
+ @Override
+ public void onBackPressed() {
+ mFragment.save();
+ }
}
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.java
index 5fe707e..bec878d 100644
--- a/src/main/java/org/havenapp/main/SettingsFragment.java
+++ b/src/main/java/org/havenapp/main/SettingsFragment.java
@@ -88,7 +88,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
((EditTextPreference) findPreference(PreferenceManager.SMS_NUMBER)).setText(preferences.getSmsNumber().trim());
findPreference(PreferenceManager.SMS_NUMBER).setSummary(preferences.getSmsNumber().trim());
} else {
- findPreference(PreferenceManager.SMS_NUMBER).setSummary(R.string.sms_dialog_message);
+ findPreference(PreferenceManager.SMS_NUMBER).setSummary(R.string.sms_dialog_summary);
}
if (preferences.getRemoteAccessActive()) {
@@ -110,11 +110,9 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
}
if (checkValidString(preferences.getSignalUsername())) {
- findPreference(PreferenceManager.SEND_SMS).setSelectable(true);
String signalNum = "+" + preferences.getSignalUsername().trim().replaceAll("[^0-9]", "");
findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(signalNum);
} else {
- findPreference(PreferenceManager.SEND_SMS).setSelectable(false);
findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(R.string.register_signal_desc);
}
@@ -155,7 +153,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
return false;
}
- private void save() {
+ protected void save() {
preferences.activateAccelerometer(true);
preferences.activateCamera(true);
@@ -247,11 +245,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
}
} else if (PreferenceManager.SMS_ACTIVE.equals(key)) {
- boolean smsActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.SMS_ACTIVE)).isChecked();
- if (smsActive && TextUtils.isEmpty(preferences.getSignalUsername())) {
- askForPermission(Manifest.permission.SEND_SMS, 6);
- askForPermission(Manifest.permission.READ_PHONE_STATE, 6);
- }
+
setPhoneNumber();
} else if (PreferenceManager.REMOTE_ACCESS_ACTIVE.equals(key)) {
boolean remoteAccessActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).isChecked();
@@ -265,7 +259,6 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
String signalNum = ((EditTextPreference) findPreference(PreferenceManager.REGISTER_SIGNAL)).getText();
if (checkValidString(signalNum)) {
- findPreference(PreferenceManager.SEND_SMS).setSelectable(true);
signalNum = "+" + signalNum.trim().replaceAll("[^0-9]", "");
preferences.setSignalUsername(signalNum);
@@ -274,18 +267,18 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
resetSignal(preferences.getSignalUsername());
activateSignal(preferences.getSignalUsername(), null);
} else {
- preferences.setSignalUsername(signalNum);
- findPreference(PreferenceManager.SEND_SMS).setSelectable(false);
+ preferences.setSignalUsername("");
findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(R.string.register_signal_desc);
}
- } else if (PreferenceManager.SEND_SMS.equals(key)) {
- String text = ((EditTextPreference) findPreference(PreferenceManager.SEND_SMS)).getText();
- sendTestNotification(text);
} else if (PreferenceManager.VERIFY_SIGNAL.equals(key)) {
String text = ((EditTextPreference) findPreference(PreferenceManager.VERIFY_SIGNAL)).getText();
activateSignal(preferences.getSignalUsername(), text);
- ((EditTextPreference) findPreference(PreferenceManager.VERIFY_SIGNAL)).setText("");
} else if (PreferenceManager.SMS_NUMBER.equals(key)) {
+ boolean smsActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.SMS_ACTIVE)).isChecked();
+ if (smsActive && TextUtils.isEmpty(preferences.getSignalUsername())) {
+ askForPermission(Manifest.permission.SEND_SMS, 6);
+ askForPermission(Manifest.permission.READ_PHONE_STATE, 6);
+ }
setPhoneNumber();
} else if (PreferenceManager.REMOTE_ACCESS_ONION.equals(key)) {
String text = ((EditTextPreference) findPreference(PreferenceManager.REMOTE_ACCESS_ONION)).getText();
@@ -321,6 +314,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
preferences.setSmsNumber(phoneNumber.trim());
findPreference(PreferenceManager.SMS_NUMBER).setSummary(phoneNumber.trim());
} else {
+ preferences.setSmsNumber("");
findPreference(PreferenceManager.SMS_NUMBER).setSummary(R.string.sms_dialog_message);
}
}
@@ -346,33 +340,12 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
return a != null && !a.trim().isEmpty() && b != null && !b.trim().isEmpty();
}
- private void sendTestNotification(String testMessage) {
- if (checkValidStrings(testMessage, preferences.getSignalUsername())) {
- SignalSender sender = SignalSender.getInstance(mActivity, preferences.getSignalUsername().trim());
- ArrayList<String> recip = new ArrayList<>();
- recip.add(testMessage);
- sender.sendMessage(recip, getString(R.string.signal_test_message), null);
- }
- else if (preferences.getSmsActivation()
- && checkValidStrings(testMessage,preferences.getSmsNumber())) {
-
- SmsManager manager = SmsManager.getDefault();
-
- StringTokenizer st = new StringTokenizer(preferences.getSmsNumber(),",");
- while (st.hasMoreTokens())
- manager.sendTextMessage(st.nextToken(), null, testMessage, null, null);
-
- }
- }
-
private void checkSignalUsername() {
if (checkValidString(preferences.getSignalUsername())) {
findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(preferences.getSignalUsername().trim());
((EditTextPreference) findPreference(PreferenceManager.REGISTER_SIGNAL)).setText(preferences.getSignalUsername().trim());
- findPreference(PreferenceManager.SEND_SMS).setSelectable(true);
} else {
- findPreference(PreferenceManager.SEND_SMS).setSelectable(false);
- findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(R.string.register_signal_desc);
+ findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(R.string.signal_dialog_summary);
}
}
diff --git a/src/main/res/menu/menu_main.xml b/src/main/res/menu/menu_main.xml
index 91c56b4..dac4975 100644
--- a/src/main/res/menu/menu_main.xml
+++ b/src/main/res/menu/menu_main.xml
@@ -7,6 +7,12 @@
android:icon="@drawable/ic_settings_white_24dp"
app:showAsAction="always" />
+ <item
+ android:id="@+id/action_test_notification"
+ android:orderInCategory="100"
+ android:title="@string/send_text_message"
+ app:showAsAction="never" />
+
<item
android:id="@+id/action_about"
android:orderInCategory="100"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 19180c1..7c5f944 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -98,7 +98,7 @@
<string name="enter_verification">Enter the verification code you received from the Signal registration step</string>
<string name="cancel">Cancel</string>
<string name="register_title">Register with Signal</string>
- <string name="register_signal_desc">Register a new phone number (+12125551212) with Signal to send secure notifications. DO NOT USE YOUR EXISTING/PRIMARY SIGNAL NUMBER.</string>
+ <string name="register_signal_desc">Enter a phone number to register with Signal, to use to send secure notifications. You can use this device\'s phone number or setup a virtual number.\n\nWARNING: If this number is already configured with a Signal app install, it will stop working there, and only work within Haven.</string>
<string name="phone_hint">+12125551212</string>
<string name="menu_licenses">Licenses...</string>
@@ -115,15 +115,17 @@
<!--Preference Settings -->
<string name="hint_number" translatable="false">+12125551212</string>
- <string name="sms_dialog_message">Register a phone number (+12125551212) to receive a text when the app hears or sees something</string>
- <string name="sms_dialog_summary">Register a phone number to receive a text when the app hears or sees something</string>
- <string name="signal_dialog_summary">Register a new phone number with signal to send secure notifications</string>
- <string name="verification_dialog_summary">Verify the code received from the signal registration step</string>
- <string name="send_message_dialog">Enter a phone number (+12125551212) to send a text message to</string>
- <string name="send_text_message">Send test message</string>
+ <string name="sms_dialog_summary">Remote phone number to send notifications to</string>
+ <string name="sms_dialog_message">Enter a remote phone number to send alert notifications to</string>
+ <string name="signal_dialog_summary">A phone number to send from using Signal</string>
+ <string name="verification_dialog_summary">Tap to verify your Signal number</string>
+ <string name="send_message_dialog">Enter a phone number to send a test alert notification message to</string>
+ <string name="send_text_message">Test notifications...</string>
<string name="service_address">Service Address</string>
<string name="password">Password</string>
- <string name="signal_number">Signal Number</string>
- <string name="phone_number">Phone Number</string>
+ <string name="signal_number">Signal Number (Local)</string>
+ <string name="phone_number">Notification Number (Remote)</string>
+ <string name="sensors">Sensors</string>
+ <string name="label_notifications">Notifications</string>
</resources>
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index 41ba536..eb35088 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -1,11 +1,17 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <ListPreference
- android:entries="@array/camera"
- android:entryValues="@array/camera_alias"
- android:key="camera"
- android:title="@string/camera_prompt" />
- <PreferenceCategory android:title="@string/action_configure">
+
+ <Preference
+ android:key="config_delay_time"
+ android:title="@string/timer_delay_label" />
+
+ <PreferenceCategory android:title="@string/sensors">
+
+ <ListPreference
+ android:entries="@array/camera"
+ android:entryValues="@array/camera_alias"
+ android:key="camera"
+ android:title="@string/camera_prompt" />
<Preference
android:key="config_sound"
@@ -15,12 +21,9 @@
android:key="config_movement"
android:title="@string/accelerometer_prompt" />
- <Preference
- android:key="config_delay_time"
- android:title="@string/timer_delay_label" />
</PreferenceCategory>
- <PreferenceCategory android:title="@string/activate_signal">
+ <PreferenceCategory android:title="@string/label_notifications">
<SwitchPreferenceCompat
android:defaultValue="true"
@@ -53,16 +56,10 @@
android:key="verify_signal"
android:summary="@string/verification_dialog_summary"
android:title="@string/verify_signal" />
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/remote_access">
- <EditTextPreference
- style="@style/AppPreference.DialogPreferenceSendText"
- android:dialogLayout="@layout/pref_dialog_edit_text"
- android:dialogMessage="@string/send_message_dialog"
- android:inputType="phone"
- android:key="send_sms"
- android:title="@string/send_text_message" />
-
- <SwitchPreferenceCompat
+ <SwitchPreferenceCompat
android:defaultValue="false"
android:key="remote_access_active"
android:summary="@string/remote_access_label"