From 9c117d7b2bf1245e874557938dffc1cec4e15b04 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 17 Mar 2019 18:07:53 +0000
Subject: [PATCH] Refactoring

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java     | 6 +++---
 app/src/main/java/eu/faircode/email/Core.java               | 2 +-
 app/src/main/java/eu/faircode/email/EntityAccount.java      | 6 +++---
 app/src/main/java/eu/faircode/email/ServiceSynchronize.java | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 2b030b7892..43af7d2136 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1230,10 +1230,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
             InternetAddress from = (InternetAddress) message.from[0];
-            String channelName = "notification." + from.getAddress().toLowerCase();
+            String channelId = "notification." + from.getAddress().toLowerCase();
 
             NotificationChannel channel = new NotificationChannel(
-                    channelName, from.getAddress(),
+                    channelId, from.getAddress(),
                     NotificationManager.IMPORTANCE_HIGH);
             channel.setGroup("contacts");
             channel.setDescription(from.getPersonal());
@@ -1242,7 +1242,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             Intent intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
                     .putExtra(Settings.EXTRA_APP_PACKAGE, context.getPackageName())
-                    .putExtra(Settings.EXTRA_CHANNEL_ID, channelName);
+                    .putExtra(Settings.EXTRA_CHANNEL_ID, channelId);
             context.startActivity(intent);
         }
 
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 9d108d3df9..b1ed4349c4 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1683,7 +1683,7 @@ class Core {
                     channelName = channel.getId();
             }
             if (channelName == null)
-                channelName = EntityAccount.getNotificationChannelName(message.accountNotify ? message.account : 0);
+                channelName = EntityAccount.getNotificationChannelId(message.accountNotify ? message.account : 0);
 
             // Get folder name
             String folderName = message.folderDisplay == null
diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index fd748bbe8a..8500042b99 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -97,7 +97,7 @@ public class EntityAccount implements Serializable {
         return "imap" + (starttls ? "" : "s");
     }
 
-    static String getNotificationChannelName(long account) {
+    static String getNotificationChannelId(long account) {
         return "notification" + (account == 0 ? "" : "." + account);
     }
 
@@ -105,7 +105,7 @@ public class EntityAccount implements Serializable {
     void createNotificationChannel(Context context) {
         NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         NotificationChannel channel = new NotificationChannel(
-                getNotificationChannelName(id), name,
+                getNotificationChannelId(id), name,
                 NotificationManager.IMPORTANCE_HIGH);
         channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
         nm.createNotificationChannel(channel);
@@ -114,7 +114,7 @@ public class EntityAccount implements Serializable {
     @RequiresApi(api = Build.VERSION_CODES.O)
     void deleteNotificationChannel(Context context) {
         NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        nm.deleteNotificationChannel(getNotificationChannelName(id));
+        nm.deleteNotificationChannel(getNotificationChannelId(id));
     }
 
     public JSONObject toJSON() throws JSONException {
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 1dbe356027..c04e82f748 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -314,7 +314,7 @@ public class ServiceSynchronize extends LifecycleService {
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                         NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
                         for (EntityAccount account : db.account().getAccountsTbd())
-                            nm.deleteNotificationChannel(EntityAccount.getNotificationChannelName(account.id));
+                            nm.deleteNotificationChannel(EntityAccount.getNotificationChannelId(account.id));
                     }
 
                     int accounts = db.account().deleteAccountsTbd();