diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java index eda2dd992..b28eeb597 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java @@ -1348,7 +1348,7 @@ public class CallActivity extends AppCompatActivity { GlideApp.with(this) .asBitmap() .diskCacheStrategy(DiskCacheStrategy.NONE) - .load(ApiUtils.getUrlForAvatarWithName(baseUrl, participantMap.get(session).getUserId(), true)) + .load(ApiUtils.getUrlForAvatarWithName(baseUrl, participantMap.get(session).getUserId(), R.dimen.avatar_size_big)) .centerInside() .override(size, size) .apply(RequestOptions.bitmapTransform(new CircleCrop())) 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 15d7d5fbd..7ae6dcb20 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 @@ -123,7 +123,7 @@ public class AdvancedUserItem extends AbstractFlexibleItem if (!TextUtils.isEmpty(room.getName())) { GlideUrl glideUrl = new GlideUrl(ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(), - room.getName(), false), new LazyHeaders.Builder() + room.getName(), R.dimen.avatar_size), new LazyHeaders.Builder() .setHeader("Accept", "image/*") .setHeader("User-Agent", ApiUtils.getUserAgent()) .build()); 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 index eab6f6f96..58e55306e 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java @@ -99,7 +99,7 @@ public class MentionAutocompleteItem extends AbstractFlexibleItem } GlideUrl glideUrl = new GlideUrl(ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(), - participant.getUserId(), false), new LazyHeaders.Builder() + participant.getUserId(), R.dimen.avatar_size), new LazyHeaders.Builder() .setHeader("Accept", "image/*") .setHeader("User-Agent", ApiUtils.getUserAgent()) .build()); diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java index 85d0c0477..316e16545 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -269,7 +269,7 @@ public class CallNotificationController extends BaseController { avatarImageView.setVisibility(View.VISIBLE); GlideUrl glideUrl = new GlideUrl(ApiUtils.getUrlForAvatarWithName(userBeingCalled.getBaseUrl(), - currentRoom.getName(), true), new LazyHeaders.Builder() + currentRoom.getName(), R.dimen.avatar_size_very_big), new LazyHeaders.Builder() .setHeader("Accept", "image/*") .setHeader("User-Agent", ApiUtils.getUserAgent()) .build()); 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 f23a30e1e..67329b015 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java @@ -499,7 +499,7 @@ public class SettingsController extends BaseController { } GlideUrl glideUrl = new GlideUrl(ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(), - avatarId, true), new LazyHeaders.Builder() + avatarId, R.dimen.avatar_size_big), new LazyHeaders.Builder() .setHeader("Accept", "image/*") .setHeader("User-Agent", ApiUtils.getUserAgent()) .build()); 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 index c2101b9a8..ad5f0677d 100644 --- 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 @@ -21,6 +21,7 @@ package com.nextcloud.talk.models.json.chat; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; +import com.nextcloud.talk.R; import com.nextcloud.talk.utils.ApiUtils; import com.stfalcon.chatkit.commons.models.IMessage; import com.stfalcon.chatkit.commons.models.IUser; @@ -90,7 +91,7 @@ public class ChatMessage implements IMessage { @Override public String getAvatar() { - return ApiUtils.getUrlForAvatarWithName(getBaseUrl(), actorId, false); + return ApiUtils.getUrlForAvatarWithName(getBaseUrl(), actorId, R.dimen.avatar_size); } }; } diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java index e20d13222..017609bb6 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java @@ -20,6 +20,7 @@ package com.nextcloud.talk.utils; import android.net.Uri; +import android.support.annotation.DimenRes; import android.support.annotation.Nullable; import com.nextcloud.talk.BuildConfig; @@ -163,16 +164,9 @@ public class ApiUtils { return "/status.php"; } - 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 + public static String getUrlForAvatarWithName(String baseUrl, String name, @DimenRes int avatarSize) { + avatarSize = Math.round(NextcloudTalkApplication .getSharedApplication().getResources().getDimension(R.dimen.avatar_size)); - } return baseUrl + "/index.php/avatar/" + Uri.encode(name) + "/" + avatarSize; }