From 1388e1a996d88552c0db46c7e38cb218b0fb631d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Asiel=20D=C3=ADaz=20Ben=C3=ADtez?= <asieldbenitez@gmail.com>
Date: Tue, 30 Jan 2024 23:28:28 -0500
Subject: [PATCH] add global unread messages badge counter (#2942)

* add global unread messages badge counter

* Update src/org/thoughtcrime/securesms/connect/DcEventCenter.java

Co-authored-by: bjoern <r10s@b44t.com>

* Update src/org/thoughtcrime/securesms/connect/DcEventCenter.java

Co-authored-by: bjoern <r10s@b44t.com>

* improve code

* use more specific names, remove from multiAccountObservers also in removeObserver()

---------

Co-authored-by: bjoern <r10s@b44t.com>
---
 res/layout/conversation_list_activity.xml     | 19 +++++-
 .../securesms/ConversationListActivity.java   | 40 ++++++++++++-
 .../securesms/ConversationListFragment.java   | 12 +++-
 .../securesms/connect/DcEventCenter.java      | 60 ++++++++++++-------
 4 files changed, 104 insertions(+), 27 deletions(-)

diff --git a/res/layout/conversation_list_activity.xml b/res/layout/conversation_list_activity.xml
index 70d57ce5a..4a8136aaf 100644
--- a/res/layout/conversation_list_activity.xml
+++ b/res/layout/conversation_list_activity.xml
@@ -24,19 +24,36 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
+          <RelativeLayout
+              android:id="@+id/self_avatar_container"
+              android:orientation="vertical"
+              android:layout_width="wrap_content"
+              android:layout_height="match_parent">
             <org.thoughtcrime.securesms.components.AvatarImageView
                 android:id="@+id/self_avatar"
                 android:foreground="@drawable/contact_photo_background"
                 android:layout_width="35dp"
                 android:layout_height="35dp"
-                android:layout_gravity="center_vertical"
                 android:layout_marginRight="10dp"
                 android:layout_marginEnd="10dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
                 android:cropToPadding="true"
                 android:clickable="true"
                 app:inverted="true"
                 tools:src="@drawable/ic_contact_picture"
                 android:contentDescription="@string/pref_profile_info_headline" />
+            <ImageView android:id="@+id/unread_indicator"
+                       android:layout_width="20dp"
+                       android:layout_height="20dp"
+                       android:layout_marginLeft="20dp"
+                       android:layout_marginStart="20dp"
+                       app:layout_constraintTop_toTopOf="parent"
+                       android:layout_marginBottom="16dp"
+                       android:contentDescription="@null"
+                       android:visibility="gone"
+                       />
+          </RelativeLayout>
 
             <TextView style="@style/TextSecure.TitleTextStyle"
                       android:id="@+id/toolbar_title"
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index c57753dff..c1cf85ebd 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -28,6 +28,7 @@ import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent
 import static org.thoughtcrime.securesms.util.RelayUtil.resetRelayingMessageContent;
 
 import android.content.Intent;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -46,6 +47,8 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.appcompat.widget.TooltipCompat;
 
+import com.amulyakhare.textdrawable.TextDrawable;
+import com.b44t.messenger.DcAccounts;
 import com.b44t.messenger.DcContact;
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcMsg;
@@ -69,6 +72,7 @@ import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.SendRelayedMessageUtil;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.io.FileOutputStream;
 import java.io.InputStream;
@@ -87,10 +91,12 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
   private ConversationListFragment conversationListFragment;
   public TextView                  title;
   private AvatarImageView          selfAvatar;
+  private ImageView                unreadIndicator;
   private SearchFragment           searchFragment;
   private SearchToolbar            searchToolbar;
   private ImageView                searchAction;
   private ViewGroup                fragmentContainer;
+  private ViewGroup                selfAvatarContainer;
 
   @Override
   protected void onPreCreate() {
@@ -129,6 +135,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     Toolbar toolbar = findViewById(R.id.toolbar);
     setSupportActionBar(toolbar);
     selfAvatar               = findViewById(R.id.self_avatar);
+    selfAvatarContainer      = findViewById(R.id.self_avatar_container);
+    unreadIndicator          = findViewById(R.id.unread_indicator);
     title                    = findViewById(R.id.toolbar_title);
     searchToolbar            = findViewById(R.id.search_toolbar);
     searchAction             = findViewById(R.id.search_action);
@@ -229,6 +237,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     }
 
     refreshAvatar();
+    refreshUnreadIndicator();
     refreshTitle();
     handleOpenpgp4fpr();
     if (isDirectSharing(this)) {
@@ -257,9 +266,9 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
 
   public void refreshAvatar() {
     if (isRelayingMessageContent(this)) {
-      selfAvatar.setVisibility(View.GONE);
+      selfAvatarContainer.setVisibility(View.GONE);
     } else {
-      selfAvatar.setVisibility(View.VISIBLE);
+      selfAvatarContainer.setVisibility(View.VISIBLE);
       DcContext dcContext = DcHelper.getContext(this);
       DcContact self = dcContext.getContact(DcContact.DC_CONTACT_ID_SELF);
       String name = dcContext.getConfig("displayname");
@@ -270,6 +279,31 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     }
   }
 
+  public void refreshUnreadIndicator() {
+    int unreadCount = 0;
+    DcAccounts dcAccounts = DcHelper.getAccounts(this);
+    int skipId = dcAccounts.getSelectedAccount().getAccountId();
+    for (int accountId : dcAccounts.getAll()) {
+      if (accountId != skipId) {
+        unreadCount += dcAccounts.getAccount(accountId).getFreshMsgs().length;
+      }
+    }
+
+    if(unreadCount == 0) {
+      unreadIndicator.setVisibility(View.GONE);
+    } else {
+      unreadIndicator.setImageDrawable(TextDrawable.builder()
+              .beginConfig()
+              .width(ViewUtil.dpToPx(this, 24))
+              .height(ViewUtil.dpToPx(this, 24))
+              .textColor(Color.WHITE)
+              .bold()
+              .endConfig()
+              .buildRound(String.valueOf(unreadCount), getResources().getColor(R.color.unread_count)));
+      unreadIndicator.setVisibility(View.VISIBLE);
+    }
+  }
+
   @Override
   public void onResume() {
     super.onResume();
@@ -390,7 +424,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
   private void handleResetRelaying() {
     resetRelayingMessageContent(this);
     refreshTitle();
-    selfAvatar.setVisibility(View.VISIBLE);
+    selfAvatarContainer.setVisibility(View.VISIBLE);
     conversationListFragment.onNewIntent();
     invalidateOptionsMenu();
   }
diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index 9fdb7e443..205c0cc7f 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -111,11 +111,11 @@ public class ConversationListFragment extends Fragment
     archive = getArguments().getBoolean(ARCHIVE, false);
 
     DcEventCenter eventCenter = DcHelper.getEventCenter(getActivity());
+    eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_INCOMING_MSG, this);
+    eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_MSGS_NOTICED, this);
     eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this);
     eventCenter.addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this);
-    eventCenter.addObserver(DcContext.DC_EVENT_INCOMING_MSG, this);
     eventCenter.addObserver(DcContext.DC_EVENT_MSGS_CHANGED, this);
-    eventCenter.addObserver(DcContext.DC_EVENT_MSGS_NOTICED, this);
     eventCenter.addObserver(DcContext.DC_EVENT_MSG_DELIVERED, this);
     eventCenter.addObserver(DcContext.DC_EVENT_MSG_FAILED, this);
     eventCenter.addObserver(DcContext.DC_EVENT_MSG_READ, this);
@@ -630,7 +630,13 @@ public class ConversationListFragment extends Fragment
 
   @Override
   public void handleEvent(@NonNull DcEvent event) {
-    if (event.getId() == DcContext.DC_EVENT_CONNECTIVITY_CHANGED) {
+    if (event.getAccountId() != DcHelper.getContext(getActivity()).getAccountId()) {
+      Activity activity = getActivity();
+      if (activity instanceof ConversationListActivity) {
+        ((ConversationListActivity) activity).refreshUnreadIndicator();
+      }
+
+    } else if (event.getId() == DcContext.DC_EVENT_CONNECTIVITY_CHANGED) {
       Activity activity = getActivity();
       if (activity instanceof ConversationListActivity) {
         ((ConversationListActivity) activity).refreshTitle();
diff --git a/src/org/thoughtcrime/securesms/connect/DcEventCenter.java b/src/org/thoughtcrime/securesms/connect/DcEventCenter.java
index 3ca6a6a07..fe20ac10d 100644
--- a/src/org/thoughtcrime/securesms/connect/DcEventCenter.java
+++ b/src/org/thoughtcrime/securesms/connect/DcEventCenter.java
@@ -17,7 +17,8 @@ import java.util.ArrayList;
 import java.util.Hashtable;
 
 public class DcEventCenter {
-    private @NonNull final Hashtable<Integer, ArrayList<DcEventDelegate>> allObservers = new Hashtable<>();
+    private @NonNull final Hashtable<Integer, ArrayList<DcEventDelegate>> currentAccountObservers = new Hashtable<>();
+    private @NonNull final Hashtable<Integer, ArrayList<DcEventDelegate>> multiAccountObservers = new Hashtable<>();
     private final Object LOCK = new Object();
     private final @NonNull ApplicationContext context;
 
@@ -33,10 +34,18 @@ public class DcEventCenter {
     }
 
     public void addObserver(int eventId, @NonNull DcEventDelegate observer) {
+        addObserver(currentAccountObservers, eventId, observer);
+    }
+
+    public void addMultiAccountObserver(int eventId, @NonNull DcEventDelegate observer) {
+        addObserver(multiAccountObservers, eventId, observer);
+    }
+
+    private void addObserver(Hashtable<Integer, ArrayList<DcEventDelegate>> observers, int eventId, @NonNull DcEventDelegate observer) {
         synchronized (LOCK) {
-            ArrayList<DcEventDelegate> idObservers = allObservers.get(eventId);
+            ArrayList<DcEventDelegate> idObservers = observers.get(eventId);
             if (idObservers == null) {
-                allObservers.put(eventId, (idObservers = new ArrayList<>()));
+                observers.put(eventId, (idObservers = new ArrayList<>()));
             }
             idObservers.add(observer);
         }
@@ -44,7 +53,11 @@ public class DcEventCenter {
 
     public void removeObserver(int eventId, DcEventDelegate observer) {
         synchronized (LOCK) {
-            ArrayList<DcEventDelegate> idObservers = allObservers.get(eventId);
+            ArrayList<DcEventDelegate> idObservers = currentAccountObservers.get(eventId);
+            if (idObservers != null) {
+                idObservers.remove(observer);
+            }
+            idObservers = multiAccountObservers.get(eventId);
             if (idObservers != null) {
                 idObservers.remove(observer);
             }
@@ -53,8 +66,14 @@ public class DcEventCenter {
 
     public void removeObservers(DcEventDelegate observer) {
         synchronized (LOCK) {
-            for(Integer eventId : allObservers.keySet()) {
-                ArrayList<DcEventDelegate> idObservers = allObservers.get(eventId);
+            for(Integer eventId : currentAccountObservers.keySet()) {
+                ArrayList<DcEventDelegate> idObservers = currentAccountObservers.get(eventId);
+                if (idObservers != null) {
+                    idObservers.remove(observer);
+                }
+            }
+            for(Integer eventId : multiAccountObservers.keySet()) {
+                ArrayList<DcEventDelegate> idObservers = multiAccountObservers.get(eventId);
                 if (idObservers != null) {
                     idObservers.remove(observer);
                 }
@@ -62,9 +81,17 @@ public class DcEventCenter {
         }
     }
 
-    public void sendToObservers(@NonNull DcEvent event) {
+    private void sendToMultiAccountObservers(@NonNull DcEvent event) {
+        sendToObservers(multiAccountObservers, event);
+    }
+
+    private void sendToCurrentAccountObservers(@NonNull DcEvent event) {
+        sendToObservers(currentAccountObservers, event);
+    }
+
+    private void sendToObservers(Hashtable<Integer, ArrayList<DcEventDelegate>> observers, @NonNull DcEvent event) {
         synchronized (LOCK) {
-            ArrayList<DcEventDelegate> idObservers = allObservers.get(event.getId());
+            ArrayList<DcEventDelegate> idObservers = observers.get(event.getId());
             if (idObservers != null) {
                 for (DcEventDelegate observer : idObservers) {
                     // using try/catch blocks as under some circumstances eg. getContext() may return NULL -
@@ -139,6 +166,8 @@ public class DcEventCenter {
     int accountId = event.getAccountId();
     int id = event.getId();
 
+    sendToMultiAccountObservers(event);
+
     switch (id) {
       case DcContext.DC_EVENT_INCOMING_MSG:
         DcHelper.getNotificationCenter(context).addNotification(accountId, event.getData1Int(), event.getData2Int());
@@ -149,7 +178,7 @@ public class DcEventCenter {
         break;
 
       case DcContext.DC_EVENT_IMEX_PROGRESS:
-        sendToObservers(event);
+        sendToCurrentAccountObservers(event);
         return 0;
     }
 
@@ -174,18 +203,9 @@ public class DcEventCenter {
         handleError(id, event.getData2Str());
         break;
 
-      case DcContext.DC_EVENT_INCOMING_MSG:
-        sendToObservers(event);
+      default:
+        sendToCurrentAccountObservers(event);
         break;
-
-      case DcContext.DC_EVENT_MSGS_NOTICED:
-        sendToObservers(event);
-        break;
-
-      default: {
-        sendToObservers(event);
-      }
-      break;
     }
 
     if (id == DcContext.DC_EVENT_CHAT_MODIFIED) {