From 8a57954eb37a43eb0e2b3e918df6e62729cf6576 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Tue, 28 Oct 2025 23:16:35 +0100 Subject: [PATCH] rename permanent channel id, delete old/deprecated one --- .../org/thoughtcrime/securesms/ApplicationContext.java | 7 +++++++ .../securesms/notifications/NotificationCenter.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index dbe09ab9a..5a0bafd8f 100644 --- a/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -12,6 +12,7 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatDelegate; +import androidx.core.app.NotificationManagerCompat; import androidx.multidex.MultiDexApplication; import androidx.work.Constraints; import androidx.work.ExistingPeriodicWorkPolicy; @@ -89,6 +90,12 @@ public class ApplicationContext extends MultiDexApplication { dcAccounts = new DcAccounts(new File(getFilesDir(), "accounts").getAbsolutePath()); rpc = new Rpc(new FFITransport(dcAccounts.getJsonrpcInstance())); AccountManager.getInstance().migrateToDcAccounts(this); + + // October-2025 migration: delete deprecated "permanent channel" id + NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this); + notificationManager.deleteNotificationChannel("dc_foreground_notification_ch"); + // end October-2025 migration + int[] allAccounts = dcAccounts.getAll(); for (int accountId : allAccounts) { DcContext ac = dcAccounts.getAccount(accountId); diff --git a/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java b/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java index 4c96c1c2b..11ef6a130 100644 --- a/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java +++ b/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java @@ -241,7 +241,7 @@ public class NotificationCenter { // channelIds: CH_MSG_* are used here, the other ones from outside (defined here to have some overview) public static final String CH_MSG_PREFIX = "ch_msg"; public static final String CH_MSG_VERSION = "5"; - public static final String CH_PERMANENT = "dc_foreground_notification_ch"; + public static final String CH_PERMANENT = "dc_fg_notification_ch"; public static final String CH_GENERIC = "ch_generic"; public static final String CH_CALLS_PREFIX = "call_chan";