Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-25 15:10:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use account id as group id

Browse Source
This commit is contained in:
M66B
2019-06-08 09:51:00 +02:00
parent 183bb1b7a9
commit 9a9ebeb79c
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/ActivitySetup.java
View File

@@ -844,11 +844,12 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
account.deleteNotificationChannel(context);
if (account.notify)
if (jaccount.has("channel")) {
NotificationChannelGroup group = new NotificationChannelGroup(account.name, account.name);
NotificationChannelGroup group = new NotificationChannelGroup("group." + account.id, account.name);
nm.createNotificationChannelGroup(group);
JSONObject jchannel = (JSONObject) jaccount.get("channel");
jchannel.put("id", EntityAccount.getNotificationChannelId(account.id));
jchannel.put("group", group.getId());
nm.createNotificationChannel(channelFromJSON(context, jchannel));
Log.i("Imported account channel=" + jchannel);
@@ -892,11 +893,12 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (jfolder.has("channel")) {
NotificationChannelGroup group = new NotificationChannelGroup(account.name, account.name);
NotificationChannelGroup group = new NotificationChannelGroup("group." + account.id, account.name);
nm.createNotificationChannelGroup(group);
JSONObject jchannel = (JSONObject) jfolder.get("channel");
jchannel.put("id", EntityFolder.getNotificationChannelId(folder.id));
jchannel.put("group", group.getId());
nm.createNotificationChannel(channelFromJSON(context, jchannel));
Log.i("Imported folder channel=" + jchannel);