FIX: Sender avatar is missing when delivered by app-specific mirror with API level >= 28.

Author: oasisfeng

src/main/java/com/oasisfeng/nevo/decorators/wechat/ConversationManager.java

@@ -9,8 +9,10 @@
 import java.util.Map;
 
 import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.Person;
+import androidx.core.graphics.drawable.IconCompat;
 
 import static java.util.Objects.requireNonNull;
 
@@ -36,10 +38,12 @@ static class Conversation {
 		final int id;
 		@Nullable String key;
 		int count;
+		CharSequence title;
 		CharSequence summary;
 		CharSequence ticker;
 		long timestamp;
-		Person sender = SENDER_PLACEHOLDER;
+		IconCompat icon;
+		private @Nullable Person.Builder sender;
 
 		int getType() { return mType; }
 
@@ -48,22 +52,29 @@ int setType(final int type) {
 			if (type == mType) return type;
 			final int previous_type = mType;
 			mType = type;
-			sender = type == TYPE_UNKNOWN || type == TYPE_GROUP_CHAT ? SENDER_PLACEHOLDER
-					: sender.toBuilder().setKey(key).setBot(type == TYPE_BOT_MESSAGE).build();	// Always set key as it may change
+			sender = type == TYPE_UNKNOWN || type == TYPE_GROUP_CHAT ? null : sender().setKey(key).setBot(type == TYPE_BOT_MESSAGE);	// Always set key as it may change
 			if (type != TYPE_GROUP_CHAT) mParticipants.clear();
 			return previous_type;
 		}
 
-		boolean isGroupChat() { return mType == TYPE_GROUP_CHAT; }
-
-		CharSequence getTitle() { return mTitle; }
-
-		void setTitle(final CharSequence title) {
-			if (TextUtils.equals(title, mTitle)) return;
-			mTitle = title;
-			sender = sender.toBuilder().setName(title).build();		// Rename the sender
+		@NonNull Person.Builder sender() {
+			return sender != null ? sender : new Person.Builder() { @NonNull @Override public Person build() {
+				switch (mType) {
+				case TYPE_GROUP_CHAT:
+					return SENDER_PLACEHOLDER;
+				case TYPE_BOT_MESSAGE:
+					setBot(true);	// Fall-through
+				case TYPE_UNKNOWN:
+				case TYPE_DIRECT_MESSAGE:
+					setIcon(icon).setName(title != null ? title : " ");		// Cannot be empty string, or it will be treated as null.
+					break;
+				}
+				return super.build();
+			}};
 		}
 
+		boolean isGroupChat() { return mType == TYPE_GROUP_CHAT; }
+
 		Person getGroupParticipant(final String key, final String name) {
 			if (! isGroupChat()) throw new IllegalStateException("Not group chat");
 			Person.Builder builder = null;
@@ -83,7 +94,6 @@ static CharSequence getOriginalName(final Person person) {
 		Conversation(final int id) { this.id = id; }
 
 		@ConversationType private int mType;
-		private CharSequence mTitle;
 		private final Map<String, Person> mParticipants = new ArrayMap<>();
 	}
 

src/main/java/com/oasisfeng/nevo/decorators/wechat/MessagingBuilder.java

@@ -196,7 +196,7 @@ private static Message buildMessage(final Conversation conversation, final long
 			sender = extractSenderFromText(text);
 			if (sender != null) {
 				actual_text = text.subSequence(sender.length() + SENDER_MESSAGE_SEPARATOR.length(), text.length());
-				if (TextUtils.equals(conversation.getTitle(), sender)) sender = null;		// In this case, the actual sender is user itself.
+				if (TextUtils.equals(conversation.title, sender)) sender = null;		// In this case, the actual sender is user itself.
 			}
 		}
 		actual_text = EmojiTranslator.translate(actual_text);
@@ -206,7 +206,7 @@ private static Message buildMessage(final Conversation conversation, final long
 		else if (conversation.isGroupChat()) {
 			final String ticker_sender = ticker != null ? extractSenderFromText(ticker) : null;	// Group nick is used in ticker and content text, while original nick in sender.
 			person = sender == null ? null : conversation.getGroupParticipant(sender, ticker_sender != null ? ticker_sender : sender);
-		} else person = conversation.sender;
+		} else person = conversation.sender().build();
 		return new Message(actual_text, when, person);
 	}
 

src/main/java/com/oasisfeng/nevo/decorators/wechat/WeChatDecorator.java

@@ -26,6 +26,7 @@
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.graphics.drawable.Icon;
 import android.media.AudioAttributes;
 import android.net.Uri;
 import android.os.Bundle;
@@ -53,6 +54,7 @@
 import androidx.annotation.RequiresApi;
 import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat.MessagingStyle;
+import androidx.core.graphics.drawable.IconCompat;
 
 import static android.app.Notification.EXTRA_TEXT;
 import static android.app.Notification.EXTRA_TITLE;
@@ -120,7 +122,9 @@ public class WeChatDecorator extends NevoDecoratorService {
 			conversation = mConversationManager.getConversation(title_hash);
 		} else conversation = mConversationManager.getConversation(evolving.getOriginalId());
 
-		conversation.setTitle(title);
+		final Icon icon = n.getLargeIcon();
+		conversation.icon = icon != null ? IconCompat.createFromIcon(this, icon) : null;
+		conversation.title = title;
 		conversation.summary = content_text;
 		conversation.ticker = n.tickerText;
 		conversation.timestamp = n.when;

src/main/java/com/oasisfeng/nevo/decorators/wechat/WeChatMessage.java

@@ -116,7 +116,7 @@ static int guessConversationType(final Conversation conversation) {
 			// The content without unread count prefix, may or may not start with sender nick
 			final CharSequence message = pos > 0 && content.charAt(0) == '[' ? content.subSequence(pos, content.length()) : content;
 			// message.startsWith(title + SENDER_MESSAGE_SEPARATOR)
-			if (startsWith(message, conversation.getTitle(), SENDER_MESSAGE_SEPARATOR))		// The title of group chat is group name, not the message sender
+			if (startsWith(message, conversation.title, SENDER_MESSAGE_SEPARATOR))		// The title of group chat is group name, not the message sender
 				return Conversation.TYPE_DIRECT_MESSAGE;	// Most probably a direct message with more than 1 unread
 			return Conversation.TYPE_GROUP_CHAT;
 		} else if (TextUtils.indexOf(ticker, content) >= 0) {
@@ -135,7 +135,7 @@ private static WeChatMessage buildFromCarMessage(final Conversation conversation
 		final int pos = from_self ? 0 : TextUtils.indexOf(message, SENDER_MESSAGE_SEPARATOR);
 		if (pos > 0) {
 			sender = message.substring(0, pos);
-			final boolean title_as_sender = TextUtils.equals(sender, conversation.getTitle());
+			final boolean title_as_sender = TextUtils.equals(sender, conversation.title);
 			if (conversation.isGroupChat() || title_as_sender) {	// Verify the sender with title for non-group conversation
 				text = message.substring(pos + SENDER_MESSAGE_SEPARATOR.length());
 				if (conversation.isGroupChat() && title_as_sender) sender = SELF;		// WeChat incorrectly use group chat title as sender for self-sent messages.
@@ -145,7 +145,7 @@ private static WeChatMessage buildFromCarMessage(final Conversation conversation
 	}
 
 	private Message toMessage() {
-		final Person person = SELF.equals(sender) ? null : conversation.isGroupChat() ? conversation.getGroupParticipant(sender, nick) : conversation.sender;
+		final Person person = SELF.equals(sender) ? null : conversation.isGroupChat() ? conversation.getGroupParticipant(sender, nick) : conversation.sender().build();
 		return new Message(text, time, person);
 	}