From 15c2bcc8528e807811b243e1d99e1505ec28d9aa Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Thu, 11 Jan 2018 14:13:29 +0100
Subject: [PATCH] Improve avatars

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../talk/adapters/items/AdvancedUserItem.java      |  2 +-
 .../nextcloud/talk/adapters/items/CallItem.java    |  2 +-
 .../nextcloud/talk/adapters/items/UserItem.java    |  2 +-
 .../nextcloud/talk/api/helpers/api/ApiHelper.java  | 14 ++++++++++++--
 .../talk/controllers/SettingsController.java       |  2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)

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
index ac4e13361..8b8615f72 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java
@@ -122,7 +122,7 @@ public class AdvancedUserItem extends AbstractFlexibleItem<AdvancedUserItem.User
             layoutParams.removeRule(RelativeLayout.ALIGN_PARENT_START);
             holder.linearLayout.setLayoutParams(layoutParams);
             GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(),
-                    participant.getUserId()), new LazyHeaders.Builder()
+                    participant.getUserId(), false), new LazyHeaders.Builder()
                     .setHeader("Accept", "image/*")
                     .setHeader("User-Agent", ApiHelper.getUserAgent())
                     .build());
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java
index d2040bc9e..60875f388 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java
@@ -121,7 +121,7 @@ public class CallItem extends AbstractFlexibleItem<CallItem.RoomItemViewHolder>
 
                 if (!TextUtils.isEmpty(room.getName())) {
                     GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(),
-                            room.getName()), new LazyHeaders.Builder()
+                            room.getName(), false), new LazyHeaders.Builder()
                             .setHeader("Accept", "image/*")
                             .setHeader("User-Agent", ApiHelper.getUserAgent())
                             .build());
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
index 2edb14182..b705cef1b 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
@@ -103,7 +103,7 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
         }
 
         GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(),
-                participant.getUserId()), new LazyHeaders.Builder()
+                participant.getUserId(), false), new LazyHeaders.Builder()
                 .setHeader("Accept", "image/*")
                 .setHeader("User-Agent", ApiHelper.getUserAgent())
                 .build());
diff --git a/app/src/main/java/com/nextcloud/talk/api/helpers/api/ApiHelper.java b/app/src/main/java/com/nextcloud/talk/api/helpers/api/ApiHelper.java
index a616b6312..1d9174f0b 100644
--- a/app/src/main/java/com/nextcloud/talk/api/helpers/api/ApiHelper.java
+++ b/app/src/main/java/com/nextcloud/talk/api/helpers/api/ApiHelper.java
@@ -143,8 +143,18 @@ public class ApiHelper {
         return "/status.php";
     }
 
-    public static String getUrlForAvatarWithName(String baseUrl, String name) {
-        return baseUrl + "/index.php/avatar/" + Uri.encode(name) + "/128";
+    public static String getUrlForAvatarWithName(String baseUrl, String name, boolean isLargeAvatar) {
+        int avatarSize;
+
+        if (isLargeAvatar) {
+            avatarSize = Math.round(NextcloudTalkApplication
+                    .getSharedApplication().getResources().getDimension(R.dimen.avatar_size_big));
+        } else {
+            avatarSize = Math.round(NextcloudTalkApplication
+                    .getSharedApplication().getResources().getDimension(R.dimen.avatar_size));
+        }
+
+        return baseUrl + "/index.php/avatar/" + Uri.encode(name) + "/" + avatarSize;
     }
 
     public static String getCredentials(String username, String token) {
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
index ef9db73f2..3221d6206 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
@@ -419,7 +419,7 @@ public class SettingsController extends BaseController {
         }
 
         GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(),
-                avatarId), new LazyHeaders.Builder()
+                avatarId, true), new LazyHeaders.Builder()
                 .setHeader("Accept", "image/*")
                 .setHeader("User-Agent", ApiHelper.getUserAgent())
                 .build());