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

Change Switch logic for enabling/disabling remote notification

Arka Prava Basua3c36eb3b907
diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.java
index a49a374..50477b2 100644
--- a/src/main/java/org/havenapp/main/PreferenceManager.java
+++ b/src/main/java/org/havenapp/main/PreferenceManager.java
@@ -100,6 +100,7 @@ public class PreferenceManager {
// keeping the key value same for data migration.
static final String REMOTE_PHONE_NUMBER = "sms_number";
+ static final String REMOTE_NOTIFICATION_ACTIVE = "remote_notification_active";
private Context context;
@@ -248,6 +249,15 @@ public class PreferenceManager {
return appSharedPrefs.getString(MICROPHONE_SENSITIVITY, MEDIUM);
}
+ public void setRemoteNotificationActive(boolean isRemoteNotificationActive) {
+ prefsEditor.putBoolean(REMOTE_NOTIFICATION_ACTIVE, isRemoteNotificationActive);
+ prefsEditor.apply();
+ }
+
+ public boolean isRemoteNotificationActive() {
+ return appSharedPrefs.getBoolean(REMOTE_NOTIFICATION_ACTIVE, false);
+ }
+
public void setRemotePhoneNumber(@NonNull String remotePhoneNumber) {
prefsEditor.putString(REMOTE_PHONE_NUMBER, remotePhoneNumber.trim());
prefsEditor.apply();
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.java
index 636e998..819afbb 100644
--- a/src/main/java/org/havenapp/main/SettingsFragment.java
+++ b/src/main/java/org/havenapp/main/SettingsFragment.java
@@ -5,6 +5,7 @@ package org.havenapp.main;
*/
import android.Manifest;
+import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@@ -84,6 +85,26 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
}
+ SwitchPreference switchPreference =
+ (SwitchPreference) findPreference(PreferenceManager.REMOTE_NOTIFICATION_ACTIVE);
+
+ switchPreference.setChecked(preferences.isRemoteNotificationActive());
+
+ switchPreference.setOnPreferenceChangeListener((preference, newValue) -> {
+ // user wants to enable/disable remote notification
+
+ boolean enabled = (Boolean) newValue;
+
+ if (enabled && !canSendRemoteNotification()) {
+ collectDataForRemoteNotification();
+ }
+
+ preferences.setRemoteNotificationActive(enabled && canSendRemoteNotification());
+ switchPreference.setChecked(enabled && canSendRemoteNotification());
+
+ return false;
+ });
+
findPreference(PreferenceManager.REMOTE_PHONE_NUMBER).setOnPreferenceClickListener(preference -> {
if (preferences.getRemotePhoneNumber().isEmpty()) {
((EditTextPreference) findPreference(PreferenceManager.REMOTE_PHONE_NUMBER)).setText(getCountryCode());
@@ -199,6 +220,31 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
}
+ private boolean canSendRemoteNotification() {
+ String remotePhoneNumber = preferences.getRemotePhoneNumber();
+ String signalUsername = preferences.getSignalUsername();
+ return !remotePhoneNumber.isEmpty() && !getCountryCode().equalsIgnoreCase(remotePhoneNumber) &&
+ !TextUtils.isEmpty(signalUsername);
+ }
+
+ /**
+ * Collect data required for Remote notification with Signal.
+ * We need a remote phone number and a verified signal Username.
+ */
+ @SuppressLint("RestrictedApi")
+ private void collectDataForRemoteNotification() {
+ String remotePhoneNumber = preferences.getRemotePhoneNumber();
+ if (remotePhoneNumber.isEmpty() || getCountryCode().equalsIgnoreCase(remotePhoneNumber)) {
+ findPreference(PreferenceManager.REMOTE_PHONE_NUMBER).performClick();
+ }
+ String signalUsername = preferences.getSignalUsername();
+ if (TextUtils.isEmpty(signalUsername)) {
+ findPreference(PreferenceManager.REGISTER_SIGNAL).performClick();
+ } else {
+ activateSignal(signalUsername, null);
+ }
+ }
+
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
@@ -227,6 +273,10 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
preferences.setSignalUsername(((EditTextPreference) findPreference(PreferenceManager.REGISTER_SIGNAL)).getText());
+ boolean remoteNotificationActive =
+ ((SwitchPreference) findPreference(PreferenceManager.REMOTE_NOTIFICATION_ACTIVE)).isChecked();
+ preferences.setRemoteNotificationActive(remoteNotificationActive);
+
boolean remoteAccessActive = ((SwitchPreference) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).isChecked();
preferences.activateRemoteAccess(remoteAccessActive);
@@ -347,6 +397,9 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
activateSignal(preferences.getSignalUsername(), text);
break;
}
+ case PreferenceManager.REMOTE_NOTIFICATION_ACTIVE:
+ // todo not - needed: Test this out.
+ break;
case PreferenceManager.REMOTE_PHONE_NUMBER:
setPhoneNumber();
break;
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index f08f92e..2346dd7 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -17,7 +17,7 @@
Verzögerungszeit setzen
</string>
- <string name="sms_label">"Bei Alarm SMS oder Signal Nachricht senden "</string>
+ <string name="remote_notification_label">"Bei Alarm SMS oder Signal Nachricht senden "</string>
<string name="sms_hint">+4917712345678</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index ed2905f..305802a 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -17,7 +17,7 @@
Temporizador
</string>
- <string name="sms_label">
+ <string name="remote_notification_label">
Enviar SMS o mensaje de alerta por Signal
</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 6be980e..ac0ae29 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -17,7 +17,7 @@
Déterminer un délai
</string>
- <string name="sms_label">
+ <string name="remote_notification_label">
Envoyer SMS ou des alertes par message Signal
</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index c17e1df..bec6af6 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -19,7 +19,7 @@
Imposta il timer di avvio
</string>
- <string name="sms_label">
+ <string name="remote_notification_label">
Invia SMS o messaggi via Signal
</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 6b42d54..d172241 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -17,7 +17,7 @@
開始遅延時間
</string>
- <string name="sms_label">
+ <string name="remote_notification_label">
ショートメールで警告を送信
</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 2c491f0..f7e780d 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -17,7 +17,7 @@
Definir tempo de atraso
</string>
- <string name="sms_label">
+ <string name="remote_notification_label">
Enviar mensagens de alerta de SMS ou Signal
</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 4489f5d..3f83ac6 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -17,7 +17,7 @@
Установка времени задержки
</string>
- <string name="sms_label">
+ <string name="remote_notification_label">
Оповещать по SMS или через Signal
</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 9aca615..37c9301 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -17,7 +17,7 @@
Vreme odlaganja
</string>
- <string name="sms_label">
+ <string name="remote_notification_label">
Šalji SMS ili Signal upozorenja
</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index a68f011..6e7c8c2 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -17,7 +17,7 @@
Bekleme Süresi
</string>
- <string name="sms_label">
+ <string name="remote_notification_label">
SMS veya Signal ile uyarı mesajı gönder
</string>
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 2078c0d..6b7c67c 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -19,7 +19,7 @@
设置延时
</string>
- <string name="sms_label">
+ <string name="remote_notification_label">
使用发送短信或 Signal 发送警告
</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 348e99d..d274150 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -19,8 +19,8 @@
Set Delay Time
</string>
- <string name="sms_label">
- Send SMS or Signal message alerts
+ <string name="remote_notification_label">
+ Send Signal message alerts
</string>
<string name="sms_hint">
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index 46785b6..d8ae0d5 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -57,9 +57,9 @@
<PreferenceCategory android:title="@string/label_notifications">
<SwitchPreference
- android:defaultValue="true"
- android:key="sms_active"
- android:title="@string/sms_label" />
+ android:defaultValue="false"
+ android:key="remote_notification_active"
+ android:title="@string/remote_notification_label" />
<EditTextPreference
style="@style/AppPreference.DialogPreferenceSave"