use JPEG as file format for avatar and compress to <9400 chars and

create avatar in background thread

1 files changed, 15 insertions, 22 deletions

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 7b2231cc3..9adaad692 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -2997,28 +2997,21 @@ public class XmppConnectionService extends Service {
         }
     }
 
-    public void publishAvatar(Account account, Uri image, UiCallback<Avatar> callback) {
-        final Bitmap.CompressFormat format = Config.AVATAR_FORMAT;
-        final int size = Config.AVATAR_SIZE;
-        final Avatar avatar = getFileBackend().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 (!getFileBackend().save(avatar)) {
-                callback.error(R.string.error_saving_avatar, avatar);
-                return;
-            }
-            publishAvatar(account, avatar, callback);
-        } else {
-            callback.error(R.string.error_publish_avatar_converting, null);
-        }
+    public void publishAvatar(final Account account, final Uri image, final UiCallback<Avatar> callback) {
+        new Thread(() -> {
+            final Bitmap.CompressFormat format = Config.AVATAR_FORMAT;
+            final int size = Config.AVATAR_SIZE;
+            final Avatar avatar = getFileBackend().getPepAvatar(image, size, format);
+            if (avatar != null) {
+                if (!getFileBackend().save(avatar)) {
+                    callback.error(R.string.error_saving_avatar, avatar);
+                    return;
+                }
+                publishAvatar(account, avatar, callback);
+            } else {
+                callback.error(R.string.error_publish_avatar_converting, null);
+            }
+        }).start();
     }
 
     public void publishAvatar(Account account, final Avatar avatar, final UiCallback<Avatar> callback) {