|
|
@ -1788,10 +1788,6 @@ public class ServiceSynchronize extends LifecycleService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
db.identity().setIdentityState(ident.id, "connected");
|
|
|
|
db.identity().setIdentityState(ident.id, "connected");
|
|
|
|
db.identity().setIdentityError(ident.id, null);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
|
|
|
|
|
|
|
|
nm.cancel("send", message.identity.intValue());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Send message
|
|
|
|
// Send message
|
|
|
|
Address[] to = imessage.getAllRecipients();
|
|
|
|
Address[] to = imessage.getAllRecipients();
|
|
|
@ -1799,6 +1795,11 @@ public class ServiceSynchronize extends LifecycleService {
|
|
|
|
EntityLog.log(this, "Sent via " + ident.host + "/" + ident.user +
|
|
|
|
EntityLog.log(this, "Sent via " + ident.host + "/" + ident.user +
|
|
|
|
" to " + TextUtils.join(", ", to));
|
|
|
|
" to " + TextUtils.join(", ", to));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
db.identity().setIdentityError(ident.id, null);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
|
|
|
|
|
|
|
|
nm.cancel("send", message.identity.intValue());
|
|
|
|
|
|
|
|
|
|
|
|
// Append replied/forwarded text
|
|
|
|
// Append replied/forwarded text
|
|
|
|
if (message.replying != null || message.forwarding != null) {
|
|
|
|
if (message.replying != null || message.forwarding != null) {
|
|
|
|
String html = message.read(this);
|
|
|
|
String html = message.read(this);
|
|
|
|