cogentleman/xmpp_client
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/development' into fix_typo

Browse Source
This commit is contained in:
Michael 2014-08-30 14:00:53 +02:00
commit 969cba5ee6
9 changed files with 364 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="eu.siacs.conversations"
android:versionCode="24"
android:versionName="0.6-alpha" >
android:versionCode="26"
android:versionName="0.7-alpha" >
<uses-sdk
android:minSdkVersion="14"

7
CHANGELOG.md
View File

@ -1,5 +1,12 @@
###Changelog
####Version 0.6
* Support for server side avatars
* save images in gallery
* show contact name and picture in non-anonymous conferences
* reworked account creation
* various bug fixes
####Version 0.5.2
* minor bug fixes

43
src/eu/siacs/conversations/generator/AbstractGenerator.java
View File

@ -12,40 +12,29 @@ public abstract class AbstractGenerator {
public final String[] FEATURES = { "urn:xmpp:jingle:1",
"urn:xmpp:jingle:apps:file-transfer:3",
"urn:xmpp:jingle:transports:s5b:1",
"urn:xmpp:jingle:transports:ibb:1",
"urn:xmpp:receipts",
"urn:xmpp:chat-markers:0",
"http://jabber.org/protocol/muc",
"jabber:x:conference",
"http://jabber.org/protocol/caps",
"urn:xmpp:jingle:transports:ibb:1", "urn:xmpp:receipts",
"urn:xmpp:chat-markers:0", "http://jabber.org/protocol/muc",
"jabber:x:conference", "http://jabber.org/protocol/caps",
"http://jabber.org/protocol/disco#info",
"urn:xmpp:avatar:metadata+notify"};
public final String IDENTITY_NAME = "Conversations 0.5";
"urn:xmpp:avatar:metadata+notify" };
public final String IDENTITY_NAME = "Conversations 0.6";
public final String IDENTITY_TYPE = "phone";
/*public final String[] FEATURES = { "http://jabber.org/protocol/muc","http://jabber.org/protocol/disco#info", "http://jabber.org/protocol/disco#items", "http://jabber.org/protocol/caps" };
public final String IDENTITY_NAME = "Exodus 0.9.1";
public final String IDENTITY_TYPE = "pc";*/
public String getCapHash() {
StringBuilder s = new StringBuilder();
s.append("client/"+IDENTITY_TYPE+"//"+IDENTITY_NAME+"<");
s.append("client/" + IDENTITY_TYPE + "//" + IDENTITY_NAME + "<");
MessageDigest md = null;
try {
md = MessageDigest.getInstance("SHA-1");
}
catch(NoSuchAlgorithmException e) {
return null;
}
List<String> features = Arrays.asList(FEATURES);
try {
md = MessageDigest.getInstance("SHA-1");
} catch (NoSuchAlgorithmException e) {
return null;
}
List<String> features = Arrays.asList(FEATURES);
Collections.sort(features);
for(String feature : features) {
s.append(feature+"<");
}
for (String feature : features) {
s.append(feature + "<");
}
byte[] sha1 = md.digest(s.toString().getBytes());
return new String(Base64.encode(sha1, Base64.DEFAULT)).trim();
return new String(Base64.encode(sha1, Base64.DEFAULT)).trim();
}
}

298
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;
@ -118,7 +119,7 @@ public class XmppConnectionService extends Service {
@Override
public void onContactStatusChanged(Contact contact, boolean online) {
Conversation conversation = find(getConversations(),contact);
Conversation conversation = find(getConversations(), contact);
if (conversation != null) {
conversation.endOtrIfNeeded();
if (online && (contact.getPresences().size() == 1)) {
@ -146,14 +147,16 @@ public class XmppConnectionService extends Service {
@Override
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) {
for (Conversation conversation : account.pendingConferenceLeaves) {
leaveMuc(conversation);
}
for(Conversation conversation : account.pendingConferenceJoins) {
for (Conversation conversation : account.pendingConferenceJoins) {
joinMuc(conversation);
}
mJingleConnectionManager.cancelInTransmission();
@ -164,27 +167,35 @@ public class XmppConnectionService extends Service {
sendUnsendMessages(conversations.get(i));
}
}
if (connection != null && connection.getFeatures().csi()) {
if (checkListeners()) {
Log.d(LOGTAG, account.getJid()
+ " sending csi//inactive");
connection.sendInactive();
} else {
Log.d(LOGTAG, account.getJid() + " sending csi//active");
connection.sendActive();
}
}
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);
} else if ((account.getStatus() != Account.STATUS_CONNECTING)
&& (account.getStatus() != Account.STATUS_NO_INTERNET)) {
XmppConnection connection = account.getXmppConnection();
if (connection!=null) {
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);
}
}
@ -209,19 +220,39 @@ public class XmppConnectionService extends Service {
private PowerManager pm;
private OnBindListener mOnBindListener = new OnBindListener() {
@Override
public void onBind(final Account account) {
account.getRoster().clearPresences();
account.clearPresences(); // self presences
account.pendingConferenceJoins.clear();
account.pendingConferenceLeaves.clear();
fetchRosterFromServer(account);
fetchBookmarks(account);
sendPresencePacket(account, mPresenceGenerator.sendPresence(account));
connectMultiModeConversations(account);
updateConversationUi();
@Override
public void onBind(final Account account) {
account.getRoster().clearPresences();
account.clearPresences(); // self presences
account.pendingConferenceJoins.clear();
account.pendingConferenceLeaves.clear();
fetchRosterFromServer(account);
fetchBookmarks(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()) {
@ -274,11 +305,11 @@ public class XmppConnectionService extends Service {
}
public Conversation find(Bookmark bookmark) {
return find(bookmark.getAccount(),bookmark.getJid());
return find(bookmark.getAccount(), bookmark.getJid());
}
public Conversation find(Account account, String jid) {
return find(getConversations(),account,jid);
return find(getConversations(), account, jid);
}
public class XmppConnectionBinder extends Binder {
@ -320,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);
@ -369,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());
@ -466,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;
}
@ -514,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);
@ -523,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;
}
@ -562,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) {
@ -632,7 +665,7 @@ public class XmppConnectionService extends Service {
}
}
if (packet != null) {
sendMessagePacket(account,packet);
sendMessagePacket(account, packet);
markMessage(message, Message.STATUS_SEND);
}
}
@ -672,18 +705,20 @@ 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");
if (storage!=null) {
for(Element item : storage.getChildren()) {
Element storage = query.findChild("storage",
"storage:bookmarks");
if (storage != null) {
for (Element item : storage.getChildren()) {
if (item.getName().equals("conference")) {
Bookmark bookmark = Bookmark.parse(item,account);
Bookmark bookmark = Bookmark.parse(item, account);
bookmarks.add(bookmark);
Conversation conversation = find(bookmark);
if (conversation!=null) {
if (conversation != null) {
conversation.setBookmark(bookmark);
} else {
if (bookmark.autojoin()) {
conversation = findOrCreateConversation(account, bookmark.getJid(), true);
conversation = findOrCreateConversation(
account, bookmark.getJid(), true);
conversation.setBookmark(bookmark);
joinMuc(conversation);
}
@ -702,10 +737,10 @@ public class XmppConnectionService extends Service {
IqPacket iqPacket = new IqPacket(IqPacket.TYPE_SET);
Element query = iqPacket.query("jabber:iq:private");
Element storage = query.addChild("storage", "storage:bookmarks");
for(Bookmark bookmark : account.getBookmarks()) {
for (Bookmark bookmark : account.getBookmarks()) {
storage.addChild(bookmark.toElement());
}
sendIqPacket(account, iqPacket,null);
sendIqPacket(account, iqPacket, null);
}
private void mergePhoneContactsWithRoster() {
@ -796,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))) {
@ -806,14 +842,13 @@ public class XmppConnectionService extends Service {
return null;
}
public Conversation findOrCreateConversation(Account account, String jid,
boolean muc) {
Conversation conversation = find(account, jid);
if (conversation != null) {
return conversation;
}
conversation = databaseBackend.findConversation(account,jid);
conversation = databaseBackend.findConversation(account, jid);
if (conversation != null) {
conversation.setStatus(Conversation.STATUS_AVAILABLE);
conversation.setAccount(account);
@ -850,7 +885,7 @@ public class XmppConnectionService extends Service {
public void archiveConversation(Conversation conversation) {
if (conversation.getMode() == Conversation.MODE_MULTI) {
Bookmark bookmark = conversation.getBookmark();
if (bookmark!=null && bookmark.autojoin()) {
if (bookmark != null && bookmark.autojoin()) {
bookmark.setAutojoin(false);
pushBookmarks(bookmark.getAccount());
}
@ -890,7 +925,7 @@ public class XmppConnectionService extends Service {
}
public void deleteAccount(Account account) {
for(Conversation conversation : conversations) {
for (Conversation conversation : conversations) {
if (conversation.getAccount() == account) {
if (conversation.getMode() == Conversation.MODE_MULTI) {
leaveMuc(conversation);
@ -911,6 +946,9 @@ public class XmppConnectionService extends Service {
public void setOnConversationListChangedListener(
OnConversationUpdate listener) {
if (checkListeners()) {
switchToForeground();
}
this.mOnConversationUpdate = listener;
this.convChangedListenerCount++;
}
@ -919,10 +957,16 @@ public class XmppConnectionService extends Service {
this.convChangedListenerCount--;
if (this.convChangedListenerCount == 0) {
this.mOnConversationUpdate = null;
if (checkListeners()) {
switchToBackground();
}
}
}
public void setOnAccountListChangedListener(OnAccountUpdate listener) {
if (checkListeners()) {
switchToForeground();
}
this.mOnAccountUpdate = listener;
this.accountChangedListenerCount++;
}
@ -931,15 +975,53 @@ public class XmppConnectionService extends Service {
this.accountChangedListenerCount--;
if (this.accountChangedListenerCount == 0) {
this.mOnAccountUpdate = null;
if (checkListeners()) {
switchToBackground();
}
}
}
public void setOnRosterUpdateListener(OnRosterUpdate listener) {
if (checkListeners()) {
switchToForeground();
}
this.mOnRosterUpdate = listener;
}
public void removeOnRosterUpdateListener() {
this.mOnRosterUpdate = null;
if (checkListeners()) {
switchToBackground();
}
}
private boolean checkListeners() {
return (this.mOnAccountUpdate == null
&& this.mOnConversationUpdate == null && this.mOnRosterUpdate == null);
}
private void switchToForeground() {
for (Account account : getAccounts()) {
if (account.getStatus() == Account.STATUS_ONLINE) {
XmppConnection connection = account.getXmppConnection();
if (connection != null && connection.getFeatures().csi()) {
connection.sendActive();
Log.d(LOGTAG, account.getJid() + " sending csi//active");
}
}
}
}
private void switchToBackground() {
for (Account account : getAccounts()) {
if (account.getStatus() == Account.STATUS_ONLINE) {
XmppConnection connection = account.getXmppConnection();
if (connection != null && connection.getFeatures().csi()) {
connection.sendInactive();
Log.d(LOGTAG, account.getJid() + " sending csi//inactive");
}
}
}
}
public void connectMultiModeConversations(Account account) {
@ -958,12 +1040,13 @@ 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();
String joinJid = conversation.getMucOptions().getJoinJid();
packet.setAttribute("to",conversation.getMucOptions().getJoinJid());
packet.setAttribute("to", conversation.getMucOptions().getJoinJid());
Element x = new Element("x");
x.setAttribute("xmlns", "http://jabber.org/protocol/muc");
String sig = account.getPgpSignature();
@ -975,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));
}
@ -1011,10 +1094,11 @@ 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) {
if (bookmark != null) {
bookmark.setNick(nick);
pushBookmarks(bookmark.getAccount());
}
@ -1023,7 +1107,7 @@ public class XmppConnectionService extends Service {
});
options.flagAboutToRename();
PresencePacket packet = new PresencePacket();
packet.setAttribute("to",options.getJoinJid());
packet.setAttribute("to", options.getJoinJid());
packet.setAttribute("from", conversation.getAccount().getFullJid());
String sig = account.getPgpSignature();
@ -1031,13 +1115,13 @@ public class XmppConnectionService extends Service {
packet.addChild("status").setContent("online");
packet.addChild("x", "jabber:x:signed").setContent(sig);
}
sendPresencePacket(account,packet);
sendPresencePacket(account, packet);
} else {
conversation.setContactJid(options.getJoinJid());
databaseBackend.updateConversation(conversation);
if (conversation.getAccount().getStatus() == Account.STATUS_ONLINE) {
Bookmark bookmark = conversation.getBookmark();
if (bookmark!=null) {
if (bookmark != null) {
bookmark.setNick(nick);
pushBookmarks(bookmark.getAccount());
}
@ -1055,10 +1139,11 @@ public class XmppConnectionService extends Service {
packet.setAttribute("to", conversation.getMucOptions().getJoinJid());
packet.setAttribute("from", conversation.getAccount().getFullJid());
packet.setAttribute("type", "unavailable");
sendPresencePacket(conversation.getAccount(),packet);
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);
}
@ -1133,7 +1218,7 @@ public class XmppConnectionService extends Service {
if (outPacket != null) {
msg.setStatus(Message.STATUS_SEND);
databaseBackend.updateMessage(msg);
sendMessagePacket(account,outPacket);
sendMessagePacket(account, outPacket);
}
} else if (msg.getType() == Message.TYPE_IMAGE) {
mJingleConnectionManager.createNewConnection(msg);
@ -1160,7 +1245,7 @@ public class XmppConnectionService extends Service {
packet.setBody(otrSession
.transformSending(CryptoHelper.FILETRANSFER
+ CryptoHelper.bytesToHex(symmetricKey)));
sendMessagePacket(account,packet);
sendMessagePacket(account, packet);
conversation.setSymmetricKey(symmetricKey);
return true;
} catch (OtrException e) {
@ -1176,26 +1261,30 @@ 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);
if (avatar!=null) {
final Avatar avatar = getFileBackend()
.getPepAvatar(image, size, format);
if (avatar != null) {
avatar.height = size;
avatar.width = size;
if (format.equals(Bitmap.CompressFormat.WEBP)) {
@ -1215,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);
}
}
});
@ -1244,50 +1339,55 @@ 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() {
@Override
public void onIqPacketReceived(Account account, IqPacket result) {
avatar.image = mIqParser.avatarData(result);
if (avatar.image!=null) {
if (avatar.image != null) {
if (getFileBackend().save(avatar)) {
if (account.getJid().equals(avatar.owner)) {
if (account.setAvatar(avatar.getFilename())) {
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) {
if (callback != null) {
callback.success(avatar);
}
return;
}
}
if (callback!=null) {
if (callback != null) {
callback.error(0, null);
}
}
});
}
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");
if (pubsub!=null) {
Element pubsub = packet.findChild("pubsub",
"http://jabber.org/protocol/pubsub");
if (pubsub != null) {
Element items = pubsub.findChild("items");
if (items!=null) {
if (items != null) {
Avatar avatar = Avatar.parseMetadata(items);
if (avatar!=null) {
if (avatar != null) {
avatar.owner = account.getJid();
if (fileBackend.isAvatarCached(avatar)) {
if (account.setAvatar(avatar.getFilename())) {
@ -1295,7 +1395,7 @@ public class XmppConnectionService extends Service {
}
callback.success(avatar);
} else {
fetchAvatar(account, avatar,callback);
fetchAvatar(account, avatar, callback);
}
return;
}
@ -1347,7 +1447,19 @@ public class XmppConnectionService extends Service {
public void invite(Conversation conversation, String contact) {
MessagePacket packet = mMessageGenerator.invite(conversation, contact);
sendMessagePacket(conversation.getAccount(),packet);
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,
@ -1438,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));
}
}
@ -1467,7 +1580,7 @@ public class XmppConnectionService extends Service {
if (account.getStatus() == Account.STATUS_ONLINE) {
MessagePacket error = this.mMessageGenerator
.generateNotAcceptable(packet);
sendMessagePacket(account,error);
sendMessagePacket(account, error);
}
}
@ -1521,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);
}
@ -1534,7 +1648,7 @@ public class XmppConnectionService extends Service {
}
public IqGenerator getIqGenerator() {
return this.mIqGenerator ;
return this.mIqGenerator;
}
public JingleConnectionManager getJingleConnectionManager() {

4
src/eu/siacs/conversations/xml/XmlReader.java
View File

@ -90,6 +90,10 @@ public class XmlReader {
throw new IOException("xml parser mishandled ArrayIndexOufOfBounds", e);
} catch (StringIndexOutOfBoundsException e) {
throw new IOException("xml parser mishandled StringIndexOufOfBounds", e);
} catch (NullPointerException e) {
throw new IOException("xml parser mishandled NullPointerException", e);
} catch (IndexOutOfBoundsException e) {
throw new IOException("xml parser mishandled IndexOutOfBound", e);
}
return null;
}

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);
}

72
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;
@ -47,6 +48,8 @@ import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
import eu.siacs.conversations.xmpp.stanzas.IqPacket;
import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
import eu.siacs.conversations.xmpp.stanzas.csi.ActivePacket;
import eu.siacs.conversations.xmpp.stanzas.csi.InactivePacket;
import eu.siacs.conversations.xmpp.stanzas.streammgmt.AckPacket;
import eu.siacs.conversations.xmpp.stanzas.streammgmt.EnablePacket;
import eu.siacs.conversations.xmpp.stanzas.streammgmt.RequestPacket;
@ -74,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;
@ -98,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) {
@ -248,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");
@ -264,9 +268,27 @@ public class XmppConnection implements Runnable {
tagWriter.writeStanzaAsync(r);
} else if (nextTag.isStart("resumed")) {
lastPaketReceived = SystemClock.elapsedRealtime();
Log.d(LOGTAG, account.getJid() + ": session resumed");
tagReader.readElement(nextTag);
sendPing();
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");
}
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);
@ -276,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);
@ -610,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());
@ -751,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;
++stanzasSent;
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());
@ -802,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");
@ -900,6 +940,14 @@ public class XmppConnection implements Runnable {
}
}
public boolean csi() {
if (connection.streamFeatures == null) {
return false;
} else {
return connection.streamFeatures.hasChild("csi","urn:xmpp:csi:0");
}
}
public boolean pubsub() {
return hasDiscoFeature(account.getServer(), "http://jabber.org/protocol/pubsub#publish");
}
@ -942,4 +990,12 @@ public class XmppConnection implements Runnable {
public long getLastPacketReceived() {
return this.lastPaketReceived;
}
public void sendActive() {
this.sendPacket(new ActivePacket(), null);
}
public void sendInactive() {
this.sendPacket(new InactivePacket(), null);
}
}

10
src/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java Normal file
View File

@ -0,0 +1,10 @@
package eu.siacs.conversations.xmpp.stanzas.csi;
import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
public class ActivePacket extends AbstractStanza {
public ActivePacket() {
super("active");
setAttribute("xmlns", "urn:xmpp:csi:0");
}
}

10
src/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java Normal file
View File

@ -0,0 +1,10 @@
package eu.siacs.conversations.xmpp.stanzas.csi;
import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
public class InactivePacket extends AbstractStanza {
public InactivePacket() {
super("inactive");
setAttribute("xmlns", "urn:xmpp:csi:0");
}
}