|
|
@ -1197,13 +1197,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
String from = ((InternetAddress) message.from[0]).getAddress();
|
|
|
|
String from = ((InternetAddress) message.from[0]).getAddress();
|
|
|
|
EntityIdentity identity = db.identity().getIdentity(message.identity);
|
|
|
|
EntityIdentity identity = db.identity().getIdentity(message.identity);
|
|
|
|
outgoing = MessageHelper.canonicalAddress(identity.email)
|
|
|
|
outgoing = MessageHelper.canonicalAddress(identity.email).equals(MessageHelper.canonicalAddress(from));
|
|
|
|
.equals(MessageHelper.canonicalAddress(from));
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return (outgoing
|
|
|
|
return (outgoing ? message.to : message.from);
|
|
|
|
? message.to
|
|
|
|
|
|
|
|
: (message.reply == null || message.reply.length == 0 ? message.from : message.reply));
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|