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

Remove SMS msg feature while testing notification

Arka Prava Basu1d8e83f58e09
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.java
index 1f8b8cb..89df388 100644
--- a/src/main/java/org/havenapp/main/ListActivity.java
+++ b/src/main/java/org/havenapp/main/ListActivity.java
@@ -369,17 +369,8 @@ public class ListActivity extends AppCompatActivity {
if (!TextUtils.isEmpty(preferences.getSignalUsername())) {
SignalSender sender = SignalSender.getInstance(this, preferences.getSignalUsername().trim());
ArrayList<String> recip = new ArrayList<>();
- recip.add(preferences.getSmsNumber());
+ recip.add(preferences.getRemotePhoneNumber());
sender.sendMessage(recip, resourceManager.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, resourceManager.getString(R.string.signal_test_message), null, null);
-
- }
}
}
diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.java
index 4a88e3b..dabbd2c 100644
--- a/src/main/java/org/havenapp/main/PreferenceManager.java
+++ b/src/main/java/org/havenapp/main/PreferenceManager.java
@@ -22,12 +22,17 @@ package org.havenapp.main;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
+import android.text.TextUtils;
import org.havenapp.main.sensors.motion.LuminanceMotionDetector;
import java.io.File;
import java.util.Date;
+import java.util.Objects;
+import javax.annotation.Nullable;
+
+import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
@@ -61,8 +66,6 @@ public class PreferenceManager {
private static final String MICROPHONE_SENSITIVITY="microphone_sensitivity";
public static final String CONFIG_SOUND = "config_sound";
public static final String CONFIG_TIME_DELAY = "config_delay_time";
- public static final String SMS_ACTIVE = "sms_active";
- public static final String SMS_NUMBER = "sms_number";
public static final String REGISTER_SIGNAL = "register_signal";
public static final String VERIFY_SIGNAL = "verify_signal";
public static final String VOICE_VERIFY_SIGNAL = "voice_verify_signal";
@@ -95,6 +98,8 @@ public class PreferenceManager {
public static final String CONFIG_BASE_STORAGE = "config_base_storage";
private static final String CONFIG_BASE_STORAGE_DEFAULT = "/haven";
+ static final String REMOTE_PHONE_NUMBER = "remote_phone_number";
+
private Context context;
public PreferenceManager(Context context) {
@@ -241,20 +246,15 @@ public class PreferenceManager {
public String getMicrophoneSensitivity() {
return appSharedPrefs.getString(MICROPHONE_SENSITIVITY, MEDIUM);
}
-
- public void activateSms(boolean active) {
- prefsEditor.putBoolean(SMS_ACTIVE, active);
- prefsEditor.commit();
- }
-
- public void setSmsNumber(String number) {
- prefsEditor.putString(SMS_NUMBER, number);
- prefsEditor.commit();
+ public void setRemotePhoneNumber(@NonNull String remotePhoneNumber) {
+ prefsEditor.putString(REMOTE_PHONE_NUMBER, remotePhoneNumber.trim());
+ prefsEditor.apply();
}
-
- public String getSmsNumber() {
- return appSharedPrefs.getString(SMS_NUMBER, "");
+
+ @NonNull
+ public String getRemotePhoneNumber() {
+ return Objects.requireNonNull(appSharedPrefs.getString(REMOTE_PHONE_NUMBER, ""));
}
public int getTimerDelay ()
diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.java
index c7ebb9d..0273ef0 100644
--- a/src/main/java/org/havenapp/main/SettingsFragment.java
+++ b/src/main/java/org/havenapp/main/SettingsFragment.java
@@ -85,9 +85,9 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
}
- findPreference(PreferenceManager.SMS_NUMBER).setOnPreferenceClickListener(preference -> {
- if (preferences.getSmsNumber().isEmpty()) {
- ((EditTextPreference) findPreference(PreferenceManager.SMS_NUMBER)).setText(getCountryCode());
+ findPreference(PreferenceManager.REMOTE_PHONE_NUMBER).setOnPreferenceClickListener(preference -> {
+ if (preferences.getRemotePhoneNumber().isEmpty()) {
+ ((EditTextPreference) findPreference(PreferenceManager.REMOTE_PHONE_NUMBER)).setText(getCountryCode());
}
return false;
});
@@ -98,11 +98,12 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
return false;
});
- if (checkValidString(preferences.getSmsNumber())) {
- ((EditTextPreference) findPreference(PreferenceManager.SMS_NUMBER)).setText(preferences.getSmsNumber().trim());
- findPreference(PreferenceManager.SMS_NUMBER).setSummary(preferences.getSmsNumber().trim());
+ if (checkValidString(preferences.getRemotePhoneNumber())) {
+ ((EditTextPreference) findPreference(PreferenceManager.REMOTE_PHONE_NUMBER))
+ .setText(preferences.getRemotePhoneNumber());
+ findPreference(PreferenceManager.REMOTE_PHONE_NUMBER).setSummary(preferences.getRemotePhoneNumber());
} else {
- findPreference(PreferenceManager.SMS_NUMBER).setSummary(R.string.sms_dialog_summary);
+ findPreference(PreferenceManager.REMOTE_PHONE_NUMBER).setSummary(R.string.sms_dialog_summary);
}
if (preferences.getRemoteAccessActive()) {
@@ -310,10 +311,6 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
}
break;
- case PreferenceManager.SMS_ACTIVE:
-
- setPhoneNumber();
- break;
case PreferenceManager.REMOTE_ACCESS_ACTIVE:
boolean remoteAccessActive = ((SwitchPreference) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).isChecked();
if (remoteAccessActive) {
@@ -344,12 +341,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
activateSignal(preferences.getSignalUsername(), text);
break;
}
- case PreferenceManager.SMS_NUMBER:
- boolean smsActive = ((SwitchPreference) findPreference(PreferenceManager.SMS_ACTIVE)).isChecked();
- if (smsActive && TextUtils.isEmpty(preferences.getSignalUsername())) {
- askForPermission(Manifest.permission.SEND_SMS, 6);
- askForPermission(Manifest.permission.READ_PHONE_STATE, 6);
- }
+ case PreferenceManager.REMOTE_PHONE_NUMBER:
setPhoneNumber();
break;
case PreferenceManager.NOTIFICATION_TIME:
@@ -448,20 +440,14 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
}
private void setPhoneNumber() {
- boolean smsActive = ((SwitchPreference) findPreference(PreferenceManager.SMS_ACTIVE)).isChecked();
- String phoneNumber = ((EditTextPreference) findPreference(PreferenceManager.SMS_NUMBER)).getText();
- if (smsActive && checkValidString(phoneNumber)) {
- preferences.activateSms(true);
- } else {
- preferences.activateSms(false);
- }
+ String phoneNumber = ((EditTextPreference) findPreference(PreferenceManager.REMOTE_PHONE_NUMBER)).getText();
if (checkValidString(phoneNumber) && !getCountryCode().equalsIgnoreCase(phoneNumber)) {
- preferences.setSmsNumber(phoneNumber.trim());
- findPreference(PreferenceManager.SMS_NUMBER).setSummary(phoneNumber.trim());
+ preferences.setRemotePhoneNumber(phoneNumber.trim());
+ findPreference(PreferenceManager.REMOTE_PHONE_NUMBER).setSummary(phoneNumber.trim());
} else if (!getCountryCode().equalsIgnoreCase(phoneNumber)){
- preferences.setSmsNumber("");
- findPreference(PreferenceManager.SMS_NUMBER).setSummary(R.string.sms_dialog_message);
+ preferences.setRemotePhoneNumber("");
+ findPreference(PreferenceManager.REMOTE_PHONE_NUMBER).setSummary(R.string.sms_dialog_message);
}
}
diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.java
index 1dc2004..32ab1f2 100644
--- a/src/main/java/org/havenapp/main/service/MonitorService.java
+++ b/src/main/java/org/havenapp/main/service/MonitorService.java
@@ -352,7 +352,7 @@ public class MonitorService extends Service {
SignalSender sender = SignalSender.getInstance(this, mPrefs.getSignalUsername());
ArrayList<String> recips = new ArrayList<>();
- StringTokenizer st = new StringTokenizer(mPrefs.getSmsNumber(), ",");
+ StringTokenizer st = new StringTokenizer(mPrefs.getRemotePhoneNumber(), ",");
while (st.hasMoreTokens())
recips.add(st.nextToken());
diff --git a/src/main/java/org/havenapp/main/service/SignalSender.java b/src/main/java/org/havenapp/main/service/SignalSender.java
index da30cbb..689e1f2 100644
--- a/src/main/java/org/havenapp/main/service/SignalSender.java
+++ b/src/main/java/org/havenapp/main/service/SignalSender.java
@@ -126,17 +126,9 @@ public class SignalSender {
if (!TextUtils.isEmpty(mUsername)) {
getInstance(mContext, mUsername.trim());
ArrayList<String> recipient = new ArrayList<>();
- recipient.add(preferences.getSmsNumber());
+ recipient.add(preferences.getRemotePhoneNumber());
sendMessage(recipient, emojiString,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, emojiString, null, null);
- }
}
public void sendMessage (final ArrayList<String> recipients, final String message, final String attachment)
diff --git a/src/main/java/org/havenapp/main/ui/CustomSlideNotify.java b/src/main/java/org/havenapp/main/ui/CustomSlideNotify.java
index 1611997..c292865 100644
--- a/src/main/java/org/havenapp/main/ui/CustomSlideNotify.java
+++ b/src/main/java/org/havenapp/main/ui/CustomSlideNotify.java
@@ -5,19 +5,17 @@ package org.havenapp.main.ui;
*/
-import android.Manifest;
import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
-import org.havenapp.main.PreferenceManager;
import org.havenapp.main.R;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
@@ -62,15 +60,10 @@ public class CustomSlideNotify extends Fragment {
mEditNumber = view.findViewById(R.id.editNumber);
mEditNumber.setOnClickListener(new View.OnClickListener() {
@Override
- public void onClick(View v) {
- askForPermission(Manifest.permission.SEND_SMS,6);
- askForPermission(Manifest.permission.READ_PHONE_STATE,6);
-
- }
+ public void onClick(View v) { }
});
- PreferenceManager pm = new PreferenceManager(getActivity());
- if (!TextUtils.isEmpty(pm.getSmsNumber()))
- mEditNumber.setText(pm.getSmsNumber());
+
+ // todo describe why we are asking this maybe
Button button = view.findViewById(R.id.btnSaveNumber);
button.setOnClickListener(mListener);
@@ -78,9 +71,10 @@ public class CustomSlideNotify extends Fragment {
}
+ @NonNull
public String getPhoneNumber ()
{
- return mEditNumber.getText().toString();
+ return mEditNumber.getText() != null ? mEditNumber.getText().toString() : "";
}
private void askForPermission(String permission, Integer requestCode) {
diff --git a/src/main/java/org/havenapp/main/ui/PPAppIntro.java b/src/main/java/org/havenapp/main/ui/PPAppIntro.java
index 33a6f8a..3df657e 100644
--- a/src/main/java/org/havenapp/main/ui/PPAppIntro.java
+++ b/src/main/java/org/havenapp/main/ui/PPAppIntro.java
@@ -59,8 +59,7 @@ public class PPAppIntro extends AppIntro {
@Override
public void onClick(View v) {
PreferenceManager pm = new PreferenceManager(PPAppIntro.this);
- pm.activateSms(true);
- pm.setSmsNumber(cs4.getPhoneNumber());
+ pm.setRemotePhoneNumber(cs4.getPhoneNumber());
Toast.makeText(PPAppIntro.this, R.string.phone_saved,Toast.LENGTH_SHORT).show();
getPager().setCurrentItem(getPager().getCurrentItem()+1);
}
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index 24cbcc8..1784fb0 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -66,7 +66,7 @@
android:dialogLayout="@layout/pref_dialog_edit_text_hint"
android:dialogMessage="@string/sms_dialog_message"
android:inputType="phone"
- android:key="sms_number"
+ android:key="remote_phone_number"
android:summary="@string/sms_dialog_summary"
android:title="@string/phone_number" />