Fixed duplicate extras

master
M66B 7 months ago
parent 9ff4a4aeb8
commit b80587ec79

@ -9161,12 +9161,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
keyPosition.put(message.id, i); keyPosition.put(message.id, i);
positionKey.put(i, message.id); positionKey.put(i, message.id);
addExtra(message.from, message.extra);
if (threading) { if (threading) {
message.senders = merge(message.from, message.senders); message.senders = merge(message.from, message.senders);
message.recipients = merge(message.to, message.recipients); message.recipients = merge(message.to, message.recipients);
addExtra(message.senders, message.extra);
} else { } else {
message.senders = message.from; message.senders = message.from;
message.recipients = message.to; message.recipients = message.to;
@ -9215,29 +9212,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
return result.toArray(new Address[0]); return result.toArray(new Address[0]);
} }
static void addExtra(Address[] addresses, String extra) {
if (addresses == null || addresses.length == 0)
return;
if (extra == null)
return;
String email = ((InternetAddress) addresses[0]).getAddress();
if (email == null)
return;
Pair<String, String> p = MessageHelper.getExtra(email, extra);
if (p.first != null)
try {
((InternetAddress) addresses[0]).setPersonal(p.first);
} catch (Throwable ex) {
Log.e(ex);
}
if (p.second != null)
((InternetAddress) addresses[0]).setAddress(p.second);
}
PagedList<TupleMessageEx> getCurrentList() { PagedList<TupleMessageEx> getCurrentList() {
return differ.getCurrentList(); return differ.getCurrentList();
} }

Loading…
Cancel
Save