From e300245f8d3f81c1126ee2e5772de9d4c24dd64d Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 26 Jul 2018 17:55:14 -0300
Subject: [PATCH] Remove sign-in reminder when PasswordActivity starts
---
.../java/org/briarproject/briar/android/BriarService.java | 7 ++-----
.../briarproject/briar/android/login/PasswordActivity.java | 7 +++++++
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java b/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java
index 523935278b..b2a30ecb25 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java
@@ -54,7 +54,6 @@ import static org.briarproject.briar.api.android.AndroidNotificationManager.FAIL
import static org.briarproject.briar.api.android.AndroidNotificationManager.FAILURE_NOTIFICATION_ID;
import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_CHANNEL_ID;
import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_NOTIFICATION_ID;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.REMINDER_NOTIFICATION_ID;
public class BriarService extends Service {
@@ -103,9 +102,9 @@ public class BriarService extends Service {
}
// Create notification channels
- NotificationManager nm = (NotificationManager)
- getSystemService(NOTIFICATION_SERVICE);
if (SDK_INT >= 26) {
+ NotificationManager nm = (NotificationManager)
+ getSystemService(NOTIFICATION_SERVICE);
NotificationChannel ongoingChannel = new NotificationChannel(
ONGOING_CHANNEL_ID,
getString(R.string.ongoing_notification_title),
@@ -137,8 +136,6 @@ public class BriarService extends Service {
}
b.setPriority(PRIORITY_MIN);
startForeground(ONGOING_NOTIFICATION_ID, b.build());
- // Remove sign-in reminder notification
- nm.cancel(REMINDER_NOTIFICATION_ID);
// Start the services in a background thread
new Thread(() -> {
String nickname = databaseConfig.getLocalAuthorName();
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordActivity.java
index f4368dd9a0..4058019130 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordActivity.java
@@ -1,5 +1,6 @@
package org.briarproject.briar.android.login;
+import android.app.NotificationManager;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
@@ -28,6 +29,7 @@ import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;
+import static org.briarproject.briar.api.android.AndroidNotificationManager.REMINDER_NOTIFICATION_ID;
public class PasswordActivity extends BaseActivity {
@@ -88,6 +90,11 @@ public class PasswordActivity extends BaseActivity {
if (briarController.hasEncryptionKey()) {
setResult(RESULT_OK);
finish();
+ } else {
+ // Remove sign-in reminder notification
+ NotificationManager nm = (NotificationManager)
+ getSystemService(NOTIFICATION_SERVICE);
+ nm.cancel(REMINDER_NOTIFICATION_ID);
}
}
--
GitLab