Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

1 files changed, 58 insertions, 0 deletions

diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index 1467f31e..33e7b8e4 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
@@ -19,6 +19,7 @@ import de.thedevstack.conversationsplus.utils.ImageUtil;
 import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
 import de.thedevstack.conversationsplus.utils.XmppSendUtil;
 
+import eu.siacs.conversations.R;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Bookmark;
@@ -303,6 +304,63 @@ public class AvatarService {
 		canvas.drawBitmap(bm, null, dst, null);
 	}
 
+	public void publishAvatar(final Account account,
+							  final Uri image,
+							  final UiCallback<Avatar> callback) {
+		final Bitmap.CompressFormat format = Config.AVATAR_FORMAT;
+		final int size = Config.AVATAR_SIZE;
+		final Avatar avatar = AvatarUtil.getPepAvatar(image, size, format);
+		if (avatar != null) {
+			avatar.height = size;
+			avatar.width = size;
+			if (format.equals(Bitmap.CompressFormat.WEBP)) {
+				avatar.type = "image/webp";
+			} else if (format.equals(Bitmap.CompressFormat.JPEG)) {
+				avatar.type = "image/jpeg";
+			} else if (format.equals(Bitmap.CompressFormat.PNG)) {
+				avatar.type = "image/png";
+			}
+			if (!AvatarUtil.save(avatar)) {
+				callback.error(R.string.error_saving_avatar, avatar);
+				return;
+			}
+			final IqPacket packet = IqGenerator.publishAvatar(avatar);
+			XmppSendUtil.sendIqPacket(account, packet, new OnIqPacketReceived() {
+
+				@Override
+				public void onIqPacketReceived(Account account, IqPacket result) {
+					if (result.getType() == IqPacket.TYPE.RESULT) {
+						final IqPacket packet = IqGenerator.publishAvatarMetadata(avatar);
+						XmppSendUtil.sendIqPacket(account, packet, new OnIqPacketReceived() {
+
+							@Override
+							public void onIqPacketReceived(Account account,
+														   IqPacket result) {
+								if (result.getType() == IqPacket.TYPE.RESULT) {
+									if (account.setAvatar(avatar.getFilename())) {
+										AvatarService.getInstance().clear(account);
+										DatabaseBackend.getInstance(ConversationsPlusApplication.getAppContext()).updateAccount(account);
+									}
+									callback.success(avatar);
+								} else {
+									callback.error(
+											R.string.error_publish_avatar_server_reject,
+											avatar);
+								}
+							}
+						});
+					} else {
+						callback.error(
+								R.string.error_publish_avatar_server_reject,
+								avatar);
+					}
+				}
+			});
+		} else {
+			callback.error(R.string.error_publish_avatar_converting, null);
+		}
+	}
+
     private static String generateFetchKey(Account account, final Avatar avatar) {
         return account.getJid().toBareJid()+"_"+avatar.owner+"_"+avatar.sha1sum;
     }