From 6fa07b99faf0f5d2d4afaad12cd777b7a616f8a2 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Thu, 3 Sep 2020 18:50:09 +0200 Subject: [PATCH 1/2] move generic-notification-id to NotificationCenter to keep the overview --- .../securesms/notifications/NotificationCenter.java | 1 + .../securesms/service/GenericForegroundService.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java b/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java index 382334455..4a0dbd6e9 100644 --- a/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java +++ b/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java @@ -149,6 +149,7 @@ public class NotificationCenter { public static final int ID_PERMANTENT = 1; public static final int ID_MSG_SUMMARY = 2; + public static final int ID_GENERIC = 3; public static final int ID_MSG_OFFSET = 0; // msgId is added - as msgId start at 10, there are no conflicts with lower numbers diff --git a/src/org/thoughtcrime/securesms/service/GenericForegroundService.java b/src/org/thoughtcrime/securesms/service/GenericForegroundService.java index 13570838b..34eb0165f 100644 --- a/src/org/thoughtcrime/securesms/service/GenericForegroundService.java +++ b/src/org/thoughtcrime/securesms/service/GenericForegroundService.java @@ -32,7 +32,6 @@ public final class GenericForegroundService extends Service { private final IBinder binder = new LocalBinder(); - private static final int NOTIFICATION_ID = 849319618; private static final String EXTRA_TITLE = "extra_title"; private static final String EXTRA_CONTENT_TEXT = "extra_content_text"; private static final String EXTRA_CHANNEL_ID = "extra_channel_id"; @@ -109,7 +108,7 @@ public final class GenericForegroundService extends Service { private void postObligatoryForegroundNotification(@NonNull Entry active) { lastPosted = active; - startForeground(NOTIFICATION_ID, new Builder(this, active.channelId) + startForeground(NotificationCenter.ID_GENERIC, new Builder(this, active.channelId) .setSmallIcon(active.iconRes) .setContentTitle(active.title) .setTicker(active.contentText) From 877a49e0ef2267cff7200be6d81f169069e7dbad Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sat, 5 Sep 2020 00:49:21 +0200 Subject: [PATCH 2/2] close generic foreground-service when hitting 'cancel' button --- src/org/thoughtcrime/securesms/WelcomeActivity.java | 1 + .../securesms/preferences/ListSummaryPreferenceFragment.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/WelcomeActivity.java b/src/org/thoughtcrime/securesms/WelcomeActivity.java index 307d641af..f1b1cb59b 100644 --- a/src/org/thoughtcrime/securesms/WelcomeActivity.java +++ b/src/org/thoughtcrime/securesms/WelcomeActivity.java @@ -132,6 +132,7 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen progressDialog.setCancelable(false); progressDialog.setButton(DialogInterface.BUTTON_NEGATIVE, getResources().getString(android.R.string.cancel), (dialog, which) -> { dcContext.stopOngoingProcess(); + notificationController.close(); }); progressDialog.show(); diff --git a/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java index 549256894..99d9cc0a9 100644 --- a/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java @@ -80,7 +80,10 @@ public abstract class ListSummaryPreferenceFragment extends CorrectedPreferenceF progressDialog.setMessage(getActivity().getString(R.string.one_moment)); progressDialog.setCanceledOnTouchOutside(false); progressDialog.setCancelable(false); - progressDialog.setButton(DialogInterface.BUTTON_NEGATIVE, getActivity().getString(android.R.string.cancel), (dialog, which) -> dcContext.stopOngoingProcess()); + progressDialog.setButton(DialogInterface.BUTTON_NEGATIVE, getActivity().getString(android.R.string.cancel), (dialog, which) -> { + dcContext.stopOngoingProcess(); + notificationController.close(); + }); progressDialog.show(); imexDir = dcContext.getImexDir().getAbsolutePath();