From 18f90b24a10be7796930a62e79288317f7ef8e29 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 26 Jun 2019 20:35:45 +0200
Subject: [PATCH] Revert "Blue as the sky"

This reverts commit 4cc1ed3a8548d182d49a7529e099d3e2b7b52818.
---
 app/src/main/java/eu/faircode/email/ActivitySetup.java  | 7 +------
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 1 -
 app/src/main/java/eu/faircode/email/ApplicationEx.java  | 2 --
 app/src/main/java/eu/faircode/email/EntityAccount.java  | 2 --
 app/src/main/java/eu/faircode/email/TupleFolderEx.java  | 2 --
 5 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 33cab33b65..c59ea75c8d 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -33,7 +33,6 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Configuration;
-import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.media.Ringtone;
@@ -990,11 +989,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
                 channel.setSound(uri, Notification.AUDIO_ATTRIBUTES_DEFAULT);
         }
 
-        boolean light = jchannel.getBoolean("light");
-        channel.enableLights(light);
-        if (light)
-            channel.setLightColor(Color.BLUE);
-
+        channel.enableLights(jchannel.getBoolean("light"));
         channel.enableVibration(jchannel.getBoolean("vibrate"));
 
         return channel;
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 5a4b4365b9..3e3b4b4944 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1621,7 +1621,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     channel.setDescription(from.getPersonal());
                     channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
                     channel.enableLights(true);
-                    channel.setLightColor(Color.BLUE);
                     nm.createNotificationChannel(channel);
                     onActionEditChannel();
                 }
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 6c7122d610..59b87a1d7d 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -28,7 +28,6 @@ import android.app.NotificationManager;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.DeadSystemException;
 import android.os.Handler;
@@ -309,7 +308,6 @@ public class ApplicationEx extends Application {
                     NotificationManager.IMPORTANCE_HIGH);
             notification.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
             notification.enableLights(true);
-            notification.setLightColor(Color.BLUE);
             nm.createNotificationChannel(notification);
 
             if (!Helper.isPlayStoreInstall(this)) {
diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index ce18a8d427..0168c9e813 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -24,7 +24,6 @@ import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.content.Context;
-import android.graphics.Color;
 import android.os.Build;
 
 import androidx.annotation.NonNull;
@@ -123,7 +122,6 @@ public class EntityAccount extends EntityOrder implements Serializable {
         channel.setGroup(group.getId());
         channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
         channel.enableLights(true);
-        channel.setLightColor(Color.BLUE);
         nm.createNotificationChannel(channel);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/TupleFolderEx.java b/app/src/main/java/eu/faircode/email/TupleFolderEx.java
index c46c7c837a..d44394ded0 100644
--- a/app/src/main/java/eu/faircode/email/TupleFolderEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleFolderEx.java
@@ -24,7 +24,6 @@ import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.content.Context;
-import android.graphics.Color;
 import android.os.Build;
 
 import androidx.annotation.RequiresApi;
@@ -92,7 +91,6 @@ public class TupleFolderEx extends EntityFolder implements Serializable {
         channel.setGroup(group.getId());
         channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
         channel.enableLights(true);
-        channel.setLightColor(Color.BLUE);
         nm.createNotificationChannel(channel);
     }