|
|
@ -146,12 +146,10 @@ public class MessageHelper {
|
|
|
|
imessage.addHeader("X-Correlation-ID", message.msgid);
|
|
|
|
imessage.addHeader("X-Correlation-ID", message.msgid);
|
|
|
|
|
|
|
|
|
|
|
|
// Addresses
|
|
|
|
// Addresses
|
|
|
|
if (identity != null && identity.sender_extra &&
|
|
|
|
if (message.from != null && message.from.length > 0) {
|
|
|
|
!TextUtils.isEmpty(message.extra) &&
|
|
|
|
|
|
|
|
message.from != null && message.from.length > 0) {
|
|
|
|
|
|
|
|
String email = ((InternetAddress) message.from[0]).getAddress();
|
|
|
|
String email = ((InternetAddress) message.from[0]).getAddress();
|
|
|
|
String name = ((InternetAddress) message.from[0]).getPersonal();
|
|
|
|
String name = ((InternetAddress) message.from[0]).getPersonal();
|
|
|
|
if (email != null) {
|
|
|
|
if (email != null && identity != null && identity.sender_extra && !TextUtils.isEmpty(message.extra)) {
|
|
|
|
int at = email.indexOf('@');
|
|
|
|
int at = email.indexOf('@');
|
|
|
|
email = message.extra + email.substring(at);
|
|
|
|
email = message.extra + email.substring(at);
|
|
|
|
Log.i("extra=" + email);
|
|
|
|
Log.i("extra=" + email);
|
|
|
|