always show number of connected accounts in foreground notification

8 files changed, 38 insertions, 46 deletions

diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java
index 5ad1f873c..6bbf2b1d0 100644
--- a/src/main/java/de/pixart/messenger/Config.java
+++ b/src/main/java/de/pixart/messenger/Config.java
@@ -63,8 +63,6 @@ public final class Config {
 
     public static final boolean HIDE_MESSAGE_TEXT_IN_NOTIFICATION = false;
 
-    public static final boolean SHOW_CONNECTED_ACCOUNTS = false; //show number of connected accounts in foreground notification
-
     public static final boolean ALWAYS_NOTIFY_BY_DEFAULT = false;
     public static final boolean SUPPRESS_ERROR_NOTIFICATION = false;
 
diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java
index c3f97a7fe..7b2dc2122 100644
--- a/src/main/java/de/pixart/messenger/services/NotificationService.java
+++ b/src/main/java/de/pixart/messenger/services/NotificationService.java
@@ -910,57 +910,52 @@ public class NotificationService {
     Notification createForegroundNotification() {
         final Notification.Builder mBuilder = new Notification.Builder(mXmppConnectionService);
         mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service));
-        if (Compatibility.runsAndTargetsTwentySix(mXmppConnectionService) || Config.SHOW_CONNECTED_ACCOUNTS) {
-            List<Account> accounts = mXmppConnectionService.getAccounts();
-            int enabled = 0;
-            int connected = 0;
-            String status;
-            Account mAccount = null;
-            if (accounts != null) {
-                for (Account account : accounts) {
-                    if (account.isOnlineAndConnected()) {
-                        connected++;
-                        enabled++;
-                    } else if (account.isEnabled()) {
-                        enabled++;
-                    }
-                }
-                if (accounts.size() == 1) {
-                    mAccount = accounts.get(0);
-                    if (mAccount.getStatus() == Account.State.ONLINE) {
-                        status = "(" + mXmppConnectionService.getString(R.string.account_status_online) + ")";
-                        status = " " + status;
-                        Log.d(Config.LOGTAG, "Status: " + status);
-                        mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service) + status);
-                    } else if (mAccount.getStatus() == Account.State.CONNECTING) {
-                        status = "(" + mXmppConnectionService.getString(R.string.account_status_connecting) + ")";
-                        status = " " + status;
-                        Log.d(Config.LOGTAG, "Status: " + status);
-                        mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service) + status);
-                    } else {
-                        status = "(" + mXmppConnectionService.getString(R.string.account_status_offline) + ")";
-                        status = " " + status;
-                        Log.d(Config.LOGTAG, "Status: " + status);
-                        mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service) + status);
-                    }
-                } else if (accounts.size() > 1) {
-                    mBuilder.setContentText(mXmppConnectionService.getString(R.string.connected_accounts, connected, enabled));
-                } else {
-                    status = "(" + mXmppConnectionService.getString(R.string.account_status_offline) + ")";
-                    status = " " + status;
-                    Log.d(Config.LOGTAG, "Status: " + status);
-                    mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service) + status);
+        Account mAccount = null;
+        String status;
+        final List<Account> accounts = mXmppConnectionService.getAccounts();
+        int enabled = 0;
+        int connected = 0;
+        if (accounts != null) {
+            for (Account account : accounts) {
+                if (account.isOnlineAndConnected()) {
+                    connected++;
+                    enabled++;
+                } else if (account.isEnabled()) {
+                    enabled++;
                 }
+            }
+        }
+        if (accounts.size() == 1) {
+            mAccount = accounts.get(0);
+            if (mAccount.getStatus() == Account.State.ONLINE) {
+                status = "(" + mXmppConnectionService.getString(R.string.account_status_online) + ")";
+                status = " " + status;
+                Log.d(Config.LOGTAG, "Status: " + status);
+                mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service) + status);
+            } else if (mAccount.getStatus() == Account.State.CONNECTING) {
+                status = "(" + mXmppConnectionService.getString(R.string.account_status_connecting) + ")";
+                status = " " + status;
+                Log.d(Config.LOGTAG, "Status: " + status);
+                mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service) + status);
             } else {
-                mBuilder.setContentText(mXmppConnectionService.getString(R.string.touch_to_open_conversations));
+                status = "(" + mXmppConnectionService.getString(R.string.account_status_offline) + ")";
+                status = " " + status;
+                Log.d(Config.LOGTAG, "Status: " + status);
+                mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service) + status);
             }
+        } else if (accounts.size() > 1) {
+            mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service));
         } else {
-            mBuilder.setContentText(mXmppConnectionService.getString(R.string.touch_to_open_conversations));
+            status = "(" + mXmppConnectionService.getString(R.string.account_status_offline) + ")";
+            status = " " + status;
+            Log.d(Config.LOGTAG, "Status: " + status);
+            mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service) + status);
         }
+        mBuilder.setContentText(mXmppConnectionService.getString(R.string.connected_accounts, connected, enabled));
         mBuilder.setContentIntent(createOpenConversationsIntent());
         mBuilder.setWhen(0);
         mBuilder.setPriority(Notification.PRIORITY_MIN);
-        mBuilder.setSmallIcon(R.drawable.ic_link_white_24dp);
+        mBuilder.setSmallIcon(connected > 0 ? R.drawable.ic_link_white_24dp : R.drawable.ic_link_off_white_24dp);
         if (Compatibility.runsTwentySix()) {
             mBuilder.setChannelId(FOREGROUND_CHANNEL_ID);
         }
diff --git a/src/main/res/drawable-hdpi/ic_link_off_white_24dp.png b/src/main/res/drawable-hdpi/ic_link_off_white_24dp.png
new file mode 100644
index 000000000..54aa6708c
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_link_off_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_link_off_white_24dp.png b/src/main/res/drawable-mdpi/ic_link_off_white_24dp.png
new file mode 100644
index 000000000..7e5e52942
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_link_off_white_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_link_off_white_24dp.png b/src/main/res/drawable-xhdpi/ic_link_off_white_24dp.png
new file mode 100644
index 000000000..dfad023bf
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_link_off_white_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_link_off_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_link_off_white_24dp.png
new file mode 100644
index 000000000..44da13a51
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_link_off_white_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_link_off_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_link_off_white_24dp.png
new file mode 100644
index 000000000..e0831c527
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_link_off_white_24dp.png
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index b0912e1c9..1f227a3ff 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -404,7 +404,6 @@
     <string name="pdf_document">PDF document</string>
     <string name="apk">Android App</string>
     <string name="vcard">Contact</string>
-    <string name="touch_to_open_conversations">Touch to open Pix-Art Messenger</string>
     <string name="avatar_has_been_published">Avatar has been published!</string>
     <string name="sending_x_file">Sending %s</string>
     <string name="offering_x_file">Offering %s</string>