set fixed avatar sizes for requests

mahibi · mahibi · commit b8c3f2b7bc66 · 2022-03-02T13:34:27.000+01:00
necessary because of nextcloud/server#31010 known issue: avatars in chat messages are too big atm Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -2188,13 +2188,13 @@ private void setupVideoStreamForLayout(@Nullable MediaStream mediaStream,
 
         String urlForAvatar;
         if (!TextUtils.isEmpty(userId)) {
-            urlForAvatar = ApiUtils.getUrlForAvatarWithName(baseUrl,
-                                                            userId,
-                                                            R.dimen.avatar_size_big);
+            urlForAvatar = ApiUtils.getUrlForAvatar(baseUrl,
+                                                    userId,
+                                                    true);
         } else {
-            urlForAvatar = ApiUtils.getUrlForAvatarWithNameForGuests(baseUrl,
-                                                                     nick,
-                                                                     R.dimen.avatar_size_big);
+            urlForAvatar = ApiUtils.getUrlForGuestAvatar(baseUrl,
+                                                         nick,
+                                                         true);
         }
 
         ParticipantDisplayItem participantDisplayItem = new ParticipantDisplayItem(userId,
diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
@@ -330,9 +330,9 @@ private void setUpAfterConversationIsKnown() {
     private void setAvatarForOneToOneCall() {
         ImageRequest imageRequest =
             DisplayUtils.getImageRequestForUrl(
-                ApiUtils.getUrlForAvatarWithName(userBeingCalled.getBaseUrl(),
-                                                 currentConversation.getName(),
-                                                 R.dimen.avatar_size_big), null);
+                ApiUtils.getUrlForAvatar(userBeingCalled.getBaseUrl(),
+                                         currentConversation.getName(),
+                                         true), null);
 
         ImagePipeline imagePipeline = Fresco.getImagePipeline();
         DataSource<CloseableReference<CloseableImage>> dataSource = imagePipeline.fetchDecodedImage(imageRequest, null);
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java
@@ -138,10 +138,10 @@ public void bindViewHolder(FlexibleAdapter adapter, UserItemViewHolder holder, i
                 .setAutoPlayAnimations(true)
                 .setImageRequest(
                     DisplayUtils.getImageRequestForUrl(
-                        ApiUtils.getUrlForAvatarWithName(
+                        ApiUtils.getUrlForAvatar(
                             userEntity.getBaseUrl(),
                             participant.getActorId(),
-                            R.dimen.small_item_height),
+                            true),
                         null))
                 .build();
             holder.binding.userIcon.setController(draweeController);
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.java
@@ -179,9 +179,9 @@ public void bindViewHolder(FlexibleAdapter adapter, ContactItemViewHolder holder
                 .setOldController(holder.binding.avatarDraweeView.getController())
                 .setAutoPlayAnimations(true)
                 .setImageRequest(DisplayUtils.getImageRequestForUrl(
-                    ApiUtils.getUrlForAvatarWithNameForGuests(userEntity.getBaseUrl(),
-                                                              displayName,
-                                                              R.dimen.avatar_size),
+                    ApiUtils.getUrlForGuestAvatar(userEntity.getBaseUrl(),
+                                                  displayName,
+                                                  false),
                     null))
                 .build();
             holder.binding.avatarDraweeView.setController(draweeController);
@@ -192,9 +192,9 @@ public void bindViewHolder(FlexibleAdapter adapter, ContactItemViewHolder holder
                 .setOldController(holder.binding.avatarDraweeView.getController())
                 .setAutoPlayAnimations(true)
                 .setImageRequest(DisplayUtils.getImageRequestForUrl(
-                    ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(),
-                                                     participant.getActorId(),
-                                                     R.dimen.avatar_size),
+                    ApiUtils.getUrlForAvatar(userEntity.getBaseUrl(),
+                                             participant.getActorId(),
+                                             false),
                     null))
                 .build();
             holder.binding.avatarDraweeView.setController(draweeController);
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
@@ -297,9 +297,9 @@ public void bindViewHolder(FlexibleAdapter<IFlexible> adapter,
                             .setOldController(holder.binding.dialogAvatar.getController())
                             .setAutoPlayAnimations(true)
                             .setImageRequest(DisplayUtils.getImageRequestForUrl(
-                                ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(),
-                                                                 conversation.getName(),
-                                                                 R.dimen.avatar_size),
+                                ApiUtils.getUrlForAvatar(userEntity.getBaseUrl(),
+                                                         conversation.getName(),
+                                                         false),
                                 userEntity))
                             .build();
                         holder.binding.dialogAvatar.setController(draweeController);
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java
@@ -157,15 +157,15 @@ public void bindViewHolder(FlexibleAdapter<IFlexible> adapter,
             }
         } else {
             String avatarId = objectId;
-            String avatarUrl = ApiUtils.getUrlForAvatarWithName(currentUser.getBaseUrl(),
-                                                                avatarId, R.dimen.avatar_size_big);
+            String avatarUrl = ApiUtils.getUrlForAvatar(currentUser.getBaseUrl(),
+                                                        avatarId, true);
 
             if (SOURCE_GUESTS.equals(source)) {
                 avatarId = displayName;
-                avatarUrl = ApiUtils.getUrlForAvatarWithNameForGuests(
+                avatarUrl = ApiUtils.getUrlForGuestAvatar(
                     currentUser.getBaseUrl(),
                     avatarId,
-                    R.dimen.avatar_size_big);
+                    false);
             }
 
             if (holder.binding.avatarDraweeView != null) {
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.java
@@ -168,8 +168,8 @@ public void bindViewHolder(FlexibleAdapter adapter, ParticipantItemViewHolder ho
                 .setOldController(holder.binding.avatarDraweeView.getController())
                 .setAutoPlayAnimations(true)
                 .setImageRequest(DisplayUtils.getImageRequestForUrl(
-                    ApiUtils.getUrlForAvatarWithNameForGuests(userEntity.getBaseUrl(),
-                                                              displayName, R.dimen.avatar_size), null))
+                    ApiUtils.getUrlForGuestAvatar(userEntity.getBaseUrl(),
+                                                  displayName, false), null))
                 .build();
             holder.binding.avatarDraweeView.setController(draweeController);
 
@@ -179,8 +179,8 @@ public void bindViewHolder(FlexibleAdapter adapter, ParticipantItemViewHolder ho
                 .setOldController(holder.binding.avatarDraweeView.getController())
                 .setAutoPlayAnimations(true)
                 .setImageRequest(DisplayUtils.getImageRequestForUrl(
-                    ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(),
-                                                     participant.getActorId(), R.dimen.avatar_size), null))
+                    ApiUtils.getUrlForAvatar(userEntity.getBaseUrl(),
+                                             participant.getActorId(), false), null))
                 .build();
             holder.binding.avatarDraweeView.setController(draweeController);
         }
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -192,6 +192,7 @@ import java.util.HashMap
 import java.util.Objects
 import java.util.concurrent.ExecutionException
 import javax.inject.Inject
+import kotlin.math.roundToInt
 
 @AutoInjector(NextcloudTalkApplication::class)
 class ChatController(args: Bundle) :
@@ -405,16 +406,11 @@ class ChatController(args: Bundle) :
 
     private fun loadAvatarForStatusBar() {
         if (inOneToOneCall() && activity != null && conversationVoiceCallMenuItem != null) {
-            val avatarSize = DisplayUtils.convertDpToPixel(
-                conversationVoiceCallMenuItem?.icon!!
-                    .intrinsicWidth.toFloat(),
-                activity
-            ).toInt()
 
             val imageRequest = DisplayUtils.getImageRequestForUrl(
-                ApiUtils.getUrlForAvatarWithNameAndPixels(
+                ApiUtils.getUrlForAvatar(
                     conversationUser?.baseUrl,
-                    currentConversation?.name, avatarSize / 2
+                    currentConversation?.name, true
                 ),
                 conversationUser!!
             )
@@ -426,7 +422,11 @@ class ChatController(args: Bundle) :
                 object : BaseBitmapDataSubscriber() {
                     override fun onNewResultImpl(bitmap: Bitmap?) {
                         if (actionBar != null && bitmap != null && resources != null) {
-                            val roundedBitmapDrawable = RoundedBitmapDrawableFactory.create(resources!!, bitmap)
+
+                            val avatarSize = (actionBar?.height!! / 1.5).roundToInt()
+                            val bitmapResized = Bitmap.createScaledBitmap(bitmap, avatarSize, avatarSize, false)
+
+                            val roundedBitmapDrawable = RoundedBitmapDrawableFactory.create(resources!!, bitmapResized)
                             roundedBitmapDrawable.isCircular = true
                             roundedBitmapDrawable.setAntiAlias(true)
                             actionBar?.setIcon(roundedBitmapDrawable)
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
@@ -722,9 +722,9 @@ class ConversationInfoController(args: Bundle) :
                     .setAutoPlayAnimations(true)
                     .setImageRequest(
                         DisplayUtils.getImageRequestForUrl(
-                            ApiUtils.getUrlForAvatarWithName(
+                            ApiUtils.getUrlForAvatar(
                                 conversationUser!!.baseUrl,
-                                conversation!!.name, R.dimen.avatar_size_big
+                                conversation!!.name, true
                             ),
                             conversationUser
                         )
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
@@ -256,16 +256,12 @@ protected void onViewBound(@NonNull View view) {
 
     private void loadUserAvatar(MaterialButton button) {
         if (getActivity() != null) {
-            int avatarSize;
-
-            if (getResources() != null) {
-                avatarSize = getResources().getDimensionPixelSize(R.dimen.avatar_size_app_bar);
-            } else {
-                avatarSize = (int) DisplayUtils.convertDpToPixel(30.0f, context);
-            }
-
-            ImageRequest imageRequest = DisplayUtils.getImageRequestForUrl(ApiUtils.getUrlForAvatarWithNameAndPixels(currentUser.getBaseUrl(),
-                                                                                                                     currentUser.getUserId(), avatarSize), currentUser);
+            ImageRequest imageRequest = DisplayUtils.getImageRequestForUrl(
+                ApiUtils.getUrlForAvatar(
+                    currentUser.getBaseUrl(),
+                    currentUser.getUserId(),
+                    false),
+                currentUser);
 
             ImagePipeline imagePipeline = Fresco.getImagePipeline();
             DataSource<CloseableReference<CloseableImage>> dataSource = imagePipeline.fetchDecodedImage(imageRequest, null);
diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
@@ -379,11 +379,13 @@ private void showNotification(Intent intent) {
             notificationBuilder.setOnlyAlertOnce(true);
 
             if (decryptedPushMessage.getNotificationUser().getType().equals("user") || decryptedPushMessage.getNotificationUser().getType().equals("guest")) {
-                String avatarUrl = ApiUtils.getUrlForAvatarWithName(signatureVerification.getUserEntity().getBaseUrl(), decryptedPushMessage.getNotificationUser().getId(), R.dimen.avatar_size);
+                String avatarUrl = ApiUtils.getUrlForAvatar(signatureVerification.getUserEntity().getBaseUrl(),
+                                                            decryptedPushMessage.getNotificationUser().getId(), false);
 
                 if (decryptedPushMessage.getNotificationUser().getType().equals("guest")) {
-                    avatarUrl = ApiUtils.getUrlForAvatarWithNameForGuests(signatureVerification.getUserEntity().getBaseUrl(),
-                            decryptedPushMessage.getNotificationUser().getName(), R.dimen.avatar_size);
+                    avatarUrl = ApiUtils.getUrlForGuestAvatar(signatureVerification.getUserEntity().getBaseUrl(),
+                                                              decryptedPushMessage.getNotificationUser().getName(),
+                                                              false);
                 }
 
                 ImageRequest imageRequest =
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
@@ -290,18 +290,18 @@ public String getName() {
             @Override
             public String getAvatar() {
                 if (getActorType().equals("users")) {
-                    return ApiUtils.getUrlForAvatarWithName(getActiveUser().getBaseUrl(), actorId, R.dimen.avatar_size);
+                    return ApiUtils.getUrlForAvatar(getActiveUser().getBaseUrl(), actorId, true);
                 } else if (getActorType().equals("bridged")) {
-                    return ApiUtils.getUrlForAvatarWithName(getActiveUser().getBaseUrl(), "bridge-bot",
-                                                            R.dimen.avatar_size);
+                    return ApiUtils.getUrlForAvatar(getActiveUser().getBaseUrl(), "bridge-bot",
+                                                    true);
                 } else {
                     String apiId =
                             NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_guest);
 
                     if (!TextUtils.isEmpty(getActorDisplayName())) {
                         apiId = getActorDisplayName();
                     }
-                    return ApiUtils.getUrlForAvatarWithNameForGuests(getActiveUser().getBaseUrl(), apiId, R.dimen.avatar_size);
+                    return ApiUtils.getUrlForGuestAvatar(getActiveUser().getBaseUrl(), apiId, true);
                 }
             }
         };
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
@@ -129,10 +129,10 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
                     .setOldController(binding.currentAccount.userIcon.getController())
                     .setAutoPlayAnimations(true)
                     .setImageRequest(DisplayUtils.getImageRequestForUrl(
-                        ApiUtils.getUrlForAvatarWithName(
+                        ApiUtils.getUrlForAvatar(
                             user.getBaseUrl(),
                             user.getUserId(),
-                            R.dimen.small_item_height),
+                            false),
                         null))
                     .build();
                 binding.currentAccount.userIcon.setController(draweeController);
diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java
@@ -44,6 +44,8 @@ public class ApiUtils {
     public static final int APIv2 = 2;
     public static final int APIv3 = 3;
     public static final int APIv4 = 4;
+    public static final int AVATAR_SIZE_BIG = 512;
+    public static final int AVATAR_SIZE_SMALL = 64;
     private static final String TAG = "ApiUtils";
     private static final String ocsApiVersion = "/ocs/v2.php";
     private static final String spreedApiVersion = "/apps/spreed/api/v1";
@@ -347,22 +349,13 @@ public static String getUrlPostfixForStatus() {
         return "/status.php";
     }
 
-    public static String getUrlForAvatarWithNameAndPixels(String baseUrl, String name, int avatarSize) {
+    public static String getUrlForAvatar(String baseUrl, String name, boolean requestBigSize) {
+        int avatarSize = requestBigSize ? AVATAR_SIZE_BIG : AVATAR_SIZE_SMALL;
         return baseUrl + "/index.php/avatar/" + Uri.encode(name) + "/" + avatarSize;
     }
 
-    public static String getUrlForAvatarWithName(String baseUrl, String name, @DimenRes int avatarSize) {
-        avatarSize = Math.round(NextcloudTalkApplication
-                .Companion.getSharedApplication().getResources().getDimension(avatarSize));
-
-        return baseUrl + "/index.php/avatar/" + Uri.encode(name) + "/" + avatarSize;
-    }
-
-    public static String getUrlForAvatarWithNameForGuests(String baseUrl, String name,
-                                                          @DimenRes int avatarSize) {
-        avatarSize = Math.round(NextcloudTalkApplication
-                .Companion.getSharedApplication().getResources().getDimension(avatarSize));
-
+    public static String getUrlForGuestAvatar(String baseUrl, String name, boolean requestBigSize) {
+        int avatarSize = requestBigSize ? AVATAR_SIZE_BIG : AVATAR_SIZE_SMALL;
         return baseUrl + "/index.php/avatar/guest/" + Uri.encode(name) + "/" + avatarSize;
     }
 
diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
@@ -318,11 +318,11 @@ public static Drawable getDrawableForMentionChipSpan(Context context, String id,
         chip.setBounds(0, 0, chip.getIntrinsicWidth(), chip.getIntrinsicHeight());
 
         if (!isCall) {
-            String url = ApiUtils.getUrlForAvatarWithName(conversationUser.getBaseUrl(), id, R.dimen.avatar_size_big);
+            String url = ApiUtils.getUrlForAvatar(conversationUser.getBaseUrl(), id, true);
             if ("guests".equals(type) || "guest".equals(type)) {
-                url = ApiUtils.getUrlForAvatarWithNameForGuests(
+                url = ApiUtils.getUrlForGuestAvatar(
                     conversationUser.getBaseUrl(),
-                    String.valueOf(label), R.dimen.avatar_size_big);
+                    String.valueOf(label), true);
             }
             ImageRequest imageRequest = getImageRequestForUrl(url, null);
             ImagePipeline imagePipeline = Fresco.getImagePipeline();
@@ -572,7 +572,7 @@ public static void loadAvatarImage(UserEntity user, SimpleDraweeView avatarImage
             avatarId = user.getUsername();
         }
 
-        String avatarString = ApiUtils.getUrlForAvatarWithName(user.getBaseUrl(), avatarId, R.dimen.avatar_size_big);
+        String avatarString = ApiUtils.getUrlForAvatar(user.getBaseUrl(), avatarId, true);
 
         // clear cache
         if (deleteCache) {
