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

Better way to check Signal setup while sending notifications

Arka Prava Basue4eec7a7af9c
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.java
index 13dd71b..8df8623 100644
--- a/src/main/java/org/havenapp/main/ListActivity.java
+++ b/src/main/java/org/havenapp/main/ListActivity.java
@@ -33,6 +33,7 @@ import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import android.widget.Toast;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;
@@ -370,12 +371,14 @@ public class ListActivity extends AppCompatActivity {
private void testNotifications ()
{
- if (!TextUtils.isEmpty(preferences.getSignalUsername())) {
+ if (preferences.isSignalVerified()) {
SignalSender sender = SignalSender.getInstance(this, preferences.getSignalUsername().trim());
ArrayList<String> recip = new ArrayList<>();
recip.add(preferences.getRemotePhoneNumber());
sender.sendMessage(recip, resourceManager.getString(R.string.signal_test_message),
null, null);
+ } else {
+ Toast.makeText(this, getString(R.string.setup_signal_toast), Toast.LENGTH_SHORT).show();
}
}
}
diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.java
index 0977d0f..c0edc9d 100644
--- a/src/main/java/org/havenapp/main/service/MonitorService.java
+++ b/src/main/java/org/havenapp/main/service/MonitorService.java
@@ -368,8 +368,7 @@ public class MonitorService extends Service {
alertMessage.append(getString(R.string.intrusion_detected,
eventTrigger.getStringType(new ResourceManager(this))));
- if (mPrefs.isRemoteNotificationActive() &&
- mPrefs.getSignalUsername() != null) {
+ if (mPrefs.isRemoteNotificationActive() && mPrefs.isSignalVerified()) {
//since this is a secure channel, we can add the Onion address
if (mPrefs.getRemoteAccessActive() && (!TextUtils.isEmpty(mPrefs.getRemoteAccessOnion()))) {
alertMessage.append(" http://").append(mPrefs.getRemoteAccessOnion())
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e7d314c..463a1e8 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -187,5 +187,6 @@
<string name="signal_reg_success_desc">You have successfully registered to Signal services. Next Step is to verify the registration for %s</string>
<string name="verification_successful">Verification Successful</string>
<string name="signal_verification_success_desc">All set to send Haven alerts from Signal!</string>
+ <string name="setup_signal_toast">Please set up Signal notifications from settings</string>
</resources>