sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sm' into development 

Conflicts:
	src/eu/siacs/conversations/services/XmppConnectionService.java
This commit is contained in:
iNPUTmice 2014-08-30 09:24:58 +02:00
parent 9de77b190b 4435b0055e
commit c494f4f7ae
3 changed files with 250 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
src/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -49,6 +49,7 @@ import eu.siacs.conversations.xml.Element;
import eu.siacs.conversations.xmpp.OnBindListener;
import eu.siacs.conversations.xmpp.OnContactStatusChanged;
import eu.siacs.conversations.xmpp.OnIqPacketReceived;
import eu.siacs.conversations.xmpp.OnMessageAcknowledged;
import eu.siacs.conversations.xmpp.OnStatusChanged;
import eu.siacs.conversations.xmpp.XmppConnection;
import eu.siacs.conversations.xmpp.jingle.JingleConnectionManager;
@ -148,7 +149,8 @@ public class XmppConnectionService extends Service {
public void onStatusChanged(Account account) {
XmppConnection connection = account.getXmppConnection();
if (mOnAccountUpdate != null) {
mOnAccountUpdate.onAccountUpdate();;
mOnAccountUpdate.onAccountUpdate();
;
}
if (account.getStatus() == Account.STATUS_ONLINE) {
for (Conversation conversation : account.pendingConferenceLeaves) {
@ -167,7 +169,8 @@ public class XmppConnectionService extends Service {
}
if (connection != null && connection.getFeatures().csi()) {
if (checkListeners()) {
Log.d(LOGTAG,account.getJid() + " sending csi//inactive");
Log.d(LOGTAG, account.getJid()
+ " sending csi//inactive");
connection.sendInactive();
} else {
Log.d(LOGTAG, account.getJid() + " sending csi//active");
@ -177,11 +180,11 @@ public class XmppConnectionService extends Service {
syncDirtyContacts(account);
scheduleWakeupCall(PING_MAX_INTERVAL, true);
} else if (account.getStatus() == Account.STATUS_OFFLINE) {
resetSendingToWaiting(account);
if (!account.isOptionSet(Account.OPTION_DISABLED)) {
int timeToReconnect = mRandom.nextInt(50) + 10;
scheduleWakeupCall(timeToReconnect, false);
}
} else if (account.getStatus() == Account.STATUS_REGISTRATION_SUCCESSFULL) {
databaseBackend.updateAccount(account);
reconnectAccount(account, true);
@ -190,10 +193,9 @@ public class XmppConnectionService extends Service {
if (connection != null) {
int next = connection.getTimeToNextAttempt();
Log.d(LOGTAG, account.getJid()
+ ": error connecting account. try again in " + next
+ "s for the "
+ (connection.getAttempt() + 1)
+ " time");
+ ": error connecting account. try again in "
+ next + "s for the "
+ (connection.getAttempt() + 1) + " time");
scheduleWakeupCall((int) (next * 1.2), false);
}
}
@ -226,12 +228,32 @@ public class XmppConnectionService extends Service {
account.pendingConferenceLeaves.clear();
fetchRosterFromServer(account);
fetchBookmarks(account);
sendPresencePacket(account, mPresenceGenerator.sendPresence(account));
sendPresencePacket(account,
mPresenceGenerator.sendPresence(account));
connectMultiModeConversations(account);
updateConversationUi();
}
};
private OnMessageAcknowledged mOnMessageAcknowledgedListener = new OnMessageAcknowledged() {
@Override
public void onMessageAcknowledged(Account account, String uuid) {
for (Conversation conversation : getConversations()) {
if (conversation.getAccount() == account) {
for (Message message : conversation.getMessages()) {
if ((message.getStatus() == Message.STATUS_UNSEND || message
.getStatus() == Message.STATUS_WAITING)
&& message.getUuid().equals(uuid)) {
markMessage(message, Message.STATUS_SEND);
return;
}
}
}
}
}
};
public PgpEngine getPgpEngine() {
if (pgpServiceConnection.isBound()) {
if (this.mPgpEngine == null) {
@ -329,8 +351,10 @@ public class XmppConnectionService extends Service {
}
}
if (account.getStatus() == Account.STATUS_ONLINE) {
long lastReceived = account.getXmppConnection().getLastPacketReceived();
long lastSent = account.getXmppConnection().getLastPingSent();
long lastReceived = account.getXmppConnection()
.getLastPacketReceived();
long lastSent = account.getXmppConnection()
.getLastPingSent();
if (lastSent - lastReceived >= PING_TIMEOUT * 1000) {
Log.d(LOGTAG, account.getJid() + ": ping timeout");
this.reconnectAccount(account, true);
@ -378,7 +402,8 @@ public class XmppConnectionService extends Service {
ExceptionHelper.init(getApplicationContext());
PRNGFixes.apply();
this.mRandom = new SecureRandom();
this.mMemorizingTrustManager = new MemorizingTrustManager(getApplicationContext());
this.mMemorizingTrustManager = new MemorizingTrustManager(
getApplicationContext());
this.databaseBackend = DatabaseBackend
.getInstance(getApplicationContext());
this.fileBackend = new FileBackend(getApplicationContext());
@ -475,10 +500,11 @@ public class XmppConnectionService extends Service {
connection.setOnMessagePacketReceivedListener(this.mMessageParser);
connection.setOnStatusChangedListener(this.statusListener);
connection.setOnPresencePacketReceivedListener(this.mPresenceParser);
connection
.setOnUnregisteredIqPacketReceivedListener(this.mIqParser);
connection.setOnUnregisteredIqPacketReceivedListener(this.mIqParser);
connection.setOnJinglePacketReceivedListener(this.jingleListener);
connection.setOnBindListener(this.mOnBindListener);
connection
.setOnMessageAcknowledgeListener(this.mOnMessageAcknowledgedListener);
return connection;
}
@ -523,7 +549,6 @@ public class XmppConnectionService extends Service {
.getUserID());
packet = mMessageGenerator.generateOtrChat(message);
send = true;
message.setStatus(Message.STATUS_SEND);
} else if (message.getPresence() == null) {
message.setStatus(Message.STATUS_WAITING);
@ -532,14 +557,10 @@ public class XmppConnectionService extends Service {
message.getConversation().endOtrIfNeeded();
failWaitingOtrMessages(message.getConversation());
packet = mMessageGenerator.generatePgpChat(message);
message.setStatus(Message.STATUS_SEND);
send = true;
} else {
message.getConversation().endOtrIfNeeded();
failWaitingOtrMessages(message.getConversation());
if (message.getConversation().getMode() == Conversation.MODE_SINGLE || message.getType() == Message.TYPE_PRIVATE) {
message.setStatus(Message.STATUS_SEND);
}
packet = mMessageGenerator.generateChat(message);
send = true;
}
@ -571,11 +592,14 @@ public class XmppConnectionService extends Service {
databaseBackend.createMessage(message);
}
conv.getMessages().add(message);
updateConversationUi();
if ((send) && (packet != null)) {
if (!account.getXmppConnection().getFeatures().sm()
&& conv.getMode() != Conversation.MODE_MULTI) {
message.setStatus(Message.STATUS_SEND);
}
sendMessagePacket(account, packet);
}
updateConversationUi();
}
private void sendUnsendMessages(Conversation conversation) {
@ -681,7 +705,8 @@ public class XmppConnectionService extends Service {
public void onIqPacketReceived(Account account, IqPacket packet) {
Element query = packet.query();
List<Bookmark> bookmarks = new CopyOnWriteArrayList<Bookmark>();
Element storage = query.findChild("storage", "storage:bookmarks");
Element storage = query.findChild("storage",
"storage:bookmarks");
if (storage != null) {
for (Element item : storage.getChildren()) {
if (item.getName().equals("conference")) {
@ -692,7 +717,8 @@ public class XmppConnectionService extends Service {
conversation.setBookmark(bookmark);
} else {
if (bookmark.autojoin()) {
conversation = findOrCreateConversation(account, bookmark.getJid(), true);
conversation = findOrCreateConversation(
account, bookmark.getJid(), true);
conversation.setBookmark(bookmark);
joinMuc(conversation);
}
@ -805,7 +831,8 @@ public class XmppConnectionService extends Service {
return null;
}
public Conversation find(List<Conversation> haystack, Account account, String jid) {
public Conversation find(List<Conversation> haystack, Account account,
String jid) {
for (Conversation conversation : haystack) {
if ((conversation.getAccount().equals(account))
&& (conversation.getContactJid().split("/")[0].equals(jid))) {
@ -815,7 +842,6 @@ public class XmppConnectionService extends Service {
return null;
}
public Conversation findOrCreateConversation(Account account, String jid,
boolean muc) {
Conversation conversation = find(account, jid);
@ -970,7 +996,8 @@ public class XmppConnectionService extends Service {
}
private boolean checkListeners() {
return (this.mOnAccountUpdate == null && this.mOnConversationUpdate == null && this.mOnRosterUpdate == null);
return (this.mOnAccountUpdate == null
&& this.mOnConversationUpdate == null && this.mOnRosterUpdate == null);
}
private void switchToForeground() {
@ -1013,7 +1040,8 @@ public class XmppConnectionService extends Service {
account.pendingConferenceJoins.remove(conversation);
account.pendingConferenceLeaves.remove(conversation);
if (account.getStatus() == Account.STATUS_ONLINE) {
Log.d(LOGTAG,"joining conversation "+conversation.getContactJid());
Log.d(LOGTAG,
"joining conversation " + conversation.getContactJid());
String nick = conversation.getMucOptions().getProposedNick();
conversation.getMucOptions().setJoinNick(nick);
PresencePacket packet = new PresencePacket();
@ -1030,8 +1058,8 @@ public class XmppConnectionService extends Service {
final SimpleDateFormat mDateFormat = new SimpleDateFormat(
"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
mDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
Date date = new Date(
conversation.getLatestMessage().getTimeSent() + 1000);
Date date = new Date(conversation.getLatestMessage()
.getTimeSent() + 1000);
x.addChild("history").setAttribute("since",
mDateFormat.format(date));
}
@ -1066,7 +1094,8 @@ public class XmppConnectionService extends Service {
renameListener.onRename(success);
}
if (success) {
conversation.setContactJid(conversation.getMucOptions().getJoinJid());
conversation.setContactJid(conversation.getMucOptions()
.getJoinJid());
databaseBackend.updateConversation(conversation);
Bookmark bookmark = conversation.getBookmark();
if (bookmark != null) {
@ -1113,7 +1142,8 @@ public class XmppConnectionService extends Service {
sendPresencePacket(conversation.getAccount(), packet);
conversation.getMucOptions().setOffline();
conversation.deregisterWithBookmark();
Log.d(LOGTAG,conversation.getAccount().getJid()+" leaving muc "+conversation.getContactJid());
Log.d(LOGTAG, conversation.getAccount().getJid() + " leaving muc "
+ conversation.getContactJid());
} else {
account.pendingConferenceLeaves.add(conversation);
}
@ -1231,25 +1261,29 @@ public class XmppConnectionService extends Service {
Account account = contact.getAccount();
if (account.getStatus() == Account.STATUS_ONLINE) {
boolean ask = contact.getOption(Contact.Options.ASKING);
boolean sendUpdates = contact.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)
boolean sendUpdates = contact
.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)
&& contact.getOption(Contact.Options.PREEMPTIVE_GRANT);
IqPacket iq = new IqPacket(IqPacket.TYPE_SET);
iq.query("jabber:iq:roster").addChild(contact.asElement());
account.getXmppConnection().sendIqPacket(iq, null);
if (sendUpdates) {
sendPresencePacket(account, mPresenceGenerator.sendPresenceUpdatesTo(contact));
sendPresencePacket(account,
mPresenceGenerator.sendPresenceUpdatesTo(contact));
}
if (ask) {
sendPresencePacket(account, mPresenceGenerator.requestPresenceUpdatesFrom(contact));
sendPresencePacket(account,
mPresenceGenerator.requestPresenceUpdatesFrom(contact));
}
}
}
public void publishAvatar(Account account, Uri image, final UiCallback<Avatar> callback) {
public void publishAvatar(Account account, Uri image,
final UiCallback<Avatar> callback) {
final Bitmap.CompressFormat format = Defaults.AVATAR_FORMAT;
final int size = Defaults.AVATAR_SIZE;
final Avatar avatar = getFileBackend().getPepAvatar(image, size, format);
final Avatar avatar = getFileBackend()
.getPepAvatar(image, size, format);
if (avatar != null) {
avatar.height = size;
avatar.width = size;
@ -1270,23 +1304,29 @@ public class XmppConnectionService extends Service {
@Override
public void onIqPacketReceived(Account account, IqPacket result) {
if (result.getType() == IqPacket.TYPE_RESULT) {
IqPacket packet = XmppConnectionService.this.mIqGenerator.publishAvatarMetadata(avatar);
IqPacket packet = XmppConnectionService.this.mIqGenerator
.publishAvatarMetadata(avatar);
sendIqPacket(account, packet, new OnIqPacketReceived() {
@Override
public void onIqPacketReceived(Account account, IqPacket result) {
public void onIqPacketReceived(Account account,
IqPacket result) {
if (result.getType() == IqPacket.TYPE_RESULT) {
if (account.setAvatar(avatar.getFilename())) {
databaseBackend.updateAccount(account);
}
callback.success(avatar);
} else {
callback.error(R.string.error_publish_avatar_server_reject, avatar);
callback.error(
R.string.error_publish_avatar_server_reject,
avatar);
}
}
});
} else {
callback.error(R.string.error_publish_avatar_server_reject, avatar);
callback.error(
R.string.error_publish_avatar_server_reject,
avatar);
}
}
});
@ -1299,8 +1339,10 @@ public class XmppConnectionService extends Service {
fetchAvatar(account, avatar, null);
}
public void fetchAvatar(Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
Log.d(LOGTAG,account.getJid()+": retrieving avatar for "+avatar.owner);
public void fetchAvatar(Account account, final Avatar avatar,
final UiCallback<Avatar> callback) {
Log.d(LOGTAG, account.getJid() + ": retrieving avatar for "
+ avatar.owner);
IqPacket packet = this.mIqGenerator.retrieveAvatar(avatar);
sendIqPacket(account, packet, new OnIqPacketReceived() {
@ -1314,7 +1356,8 @@ public class XmppConnectionService extends Service {
databaseBackend.updateAccount(account);
}
} else {
Contact contact = account.getRoster().getContact(avatar.owner);
Contact contact = account.getRoster().getContact(
avatar.owner);
contact.setAvatar(avatar.getFilename());
}
if (callback != null) {
@ -1330,14 +1373,16 @@ public class XmppConnectionService extends Service {
});
}
public void checkForAvatar(Account account, final UiCallback<Avatar> callback) {
public void checkForAvatar(Account account,
final UiCallback<Avatar> callback) {
IqPacket packet = this.mIqGenerator.retrieveAvatarMetaData(null);
this.sendIqPacket(account, packet, new OnIqPacketReceived() {
@Override
public void onIqPacketReceived(Account account, IqPacket packet) {
if (packet.getType() == IqPacket.TYPE_RESULT) {
Element pubsub = packet.findChild("pubsub", "http://jabber.org/protocol/pubsub");
Element pubsub = packet.findChild("pubsub",
"http://jabber.org/protocol/pubsub");
if (pubsub != null) {
Element items = pubsub.findChild("items");
if (items != null) {
@ -1405,6 +1450,18 @@ public class XmppConnectionService extends Service {
sendMessagePacket(conversation.getAccount(), packet);
}
public void resetSendingToWaiting(Account account) {
for (Conversation conversation : getConversations()) {
if (conversation.getAccount() == account) {
for (Message message : conversation.getMessages()) {
if (message.getStatus() == Message.STATUS_UNSEND) {
markMessage(message, Message.STATUS_WAITING);
}
}
}
}
}
public boolean markMessage(Account account, String recipient, String uuid,
int status) {
for (Conversation conversation : getConversations()) {
@ -1493,7 +1550,8 @@ public class XmppConnectionService extends Service {
if (confirmMessages() && id != null) {
Account account = conversation.getAccount();
String to = conversation.getContactJid();
this.sendMessagePacket(conversation.getAccount(), mMessageGenerator.confirm(account, to, id));
this.sendMessagePacket(conversation.getAccount(),
mMessageGenerator.confirm(account, to, id));
}
}
@ -1576,7 +1634,8 @@ public class XmppConnectionService extends Service {
account.getXmppConnection().sendPresencePacket(packet);
}
public void sendIqPacket(Account account, IqPacket packet, OnIqPacketReceived callback) {
public void sendIqPacket(Account account, IqPacket packet,
OnIqPacketReceived callback) {
account.getXmppConnection().sendIqPacket(packet, callback);
}

7
src/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java Normal file
View File

@ -0,0 +1,7 @@
package eu.siacs.conversations.xmpp;
import eu.siacs.conversations.entities.Account;
public interface OnMessageAcknowledged {
public void onMessageAcknowledged(Account account, String id);
}

50
src/eu/siacs/conversations/xmpp/XmppConnection.java
View File

@ -31,6 +31,7 @@ import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
import android.os.SystemClock;
import android.util.Log;
import android.util.SparseArray;
import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.utils.CryptoHelper;
@ -76,6 +77,7 @@ public class XmppConnection implements Runnable {
private String streamId = null;
private int smVersion = 3;
private SparseArray<String> messageReceipts = new SparseArray<String>();
private boolean usingCompression = false;
@ -100,6 +102,7 @@ public class XmppConnection implements Runnable {
private OnMessagePacketReceived messageListener = null;
private OnStatusChanged statusListener = null;
private OnBindListener bindListener = null;
private OnMessageAcknowledged acknowledgedListener = null;
private MemorizingTrustManager mMemorizingTrustManager;
public XmppConnection(Account account, XmppConnectionService service) {
@ -250,7 +253,6 @@ public class XmppConnection implements Runnable {
challange,mRandom));
tagWriter.writeElement(response);
} else if (nextTag.isStart("enabled")) {
this.stanzasSent = 0;
Element enabled = tagReader.readElement(nextTag);
if ("true".equals(enabled.getAttribute("resume"))) {
this.streamId = enabled.getAttribute("id");
@ -266,9 +268,27 @@ public class XmppConnection implements Runnable {
tagWriter.writeStanzaAsync(r);
} else if (nextTag.isStart("resumed")) {
lastPaketReceived = SystemClock.elapsedRealtime();
Element resumed = tagReader.readElement(nextTag);
String h = resumed.getAttribute("h");
try {
int serverCount = Integer.parseInt(h);
if (serverCount!=stanzasSent) {
Log.d(LOGTAG,account.getJid() + ": session resumed with lost packages");
stanzasSent = serverCount;
} else {
Log.d(LOGTAG, account.getJid() + ": session resumed");
tagReader.readElement(nextTag);
sendPing();
}
if (acknowledgedListener!=null) {
for(int i = 0; i < messageReceipts.size(); ++i) {
if (serverCount>=messageReceipts.keyAt(i)) {
acknowledgedListener.onMessageAcknowledged(account, messageReceipts.valueAt(i));
}
}
}
messageReceipts.clear();
} catch (NumberFormatException e) {
}
changeStatus(Account.STATUS_ONLINE);
} else if (nextTag.isStart("r")) {
tagReader.readElement(nextTag);
@ -278,8 +298,12 @@ public class XmppConnection implements Runnable {
Element ack = tagReader.readElement(nextTag);
lastPaketReceived = SystemClock.elapsedRealtime();
int serverSequence = Integer.parseInt(ack.getAttribute("h"));
if (serverSequence > this.stanzasSent) {
this.stanzasSent = serverSequence;
String msgId = this.messageReceipts.get(serverSequence);
if (msgId != null) {
if (this.acknowledgedListener != null) {
this.acknowledgedListener.onMessageAcknowledged(account, msgId);
}
this.messageReceipts.remove(serverSequence);
}
} else if (nextTag.isStart("failed")) {
tagReader.readElement(nextTag);
@ -612,10 +636,14 @@ public class XmppConnection implements Runnable {
smVersion = 3;
EnablePacket enable = new EnablePacket(smVersion);
tagWriter.writeStanzaAsync(enable);
stanzasSent = 0;
messageReceipts.clear();
} else if (streamFeatures.hasChild("sm", "urn:xmpp:sm:2")) {
smVersion = 2;
EnablePacket enable = new EnablePacket(smVersion);
tagWriter.writeStanzaAsync(enable);
stanzasSent = 0;
messageReceipts.clear();
}
sendServiceDiscoveryInfo(account.getServer());
sendServiceDiscoveryItems(account.getServer());
@ -753,9 +781,15 @@ public class XmppConnection implements Runnable {
private synchronized void sendPacket(final AbstractStanza packet,
PacketReceived callback) {
// TODO dont increment stanza count if packet = request packet or ack;
if (packet.getName().equals("iq") || packet.getName().equals("message") || packet.getName().equals("presence")) {
++stanzasSent;
}
tagWriter.writeStanzaAsync(packet);
if (packet instanceof MessagePacket && packet.getId() != null && this.streamId != null) {
Log.d(LOGTAG,"request delivery report for stanza "+stanzasSent);
this.messageReceipts.put(stanzasSent, packet.getId());
tagWriter.writeStanzaAsync(new RequestPacket(this.smVersion));
}
if (callback != null) {
if (packet.getId() == null) {
packet.setId(nextRandomId());
@ -804,6 +838,10 @@ public class XmppConnection implements Runnable {
this.bindListener = listener;
}
public void setOnMessageAcknowledgeListener(OnMessageAcknowledged listener) {
this.acknowledgedListener = listener;
}
public void disconnect(boolean force) {
changeStatus(Account.STATUS_OFFLINE);
Log.d(LOGTAG, "disconnecting");