From ccbb4d74b84c13887b52a2efaec6ea59c2fe1fb3 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 26 Oct 2017 19:29:45 +0200 Subject: [PATCH] Set user agent on glide requests Signed-off-by: Mario Danic --- .../main/java/com/nextcloud/talk/adapters/items/RoomItem.java | 3 +++ .../main/java/com/nextcloud/talk/adapters/items/UserItem.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/RoomItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/RoomItem.java index 37fa73aa4..994802973 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/RoomItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/RoomItem.java @@ -28,6 +28,7 @@ import android.widget.TextView; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.model.GlideUrl; import com.bumptech.glide.load.model.LazyHeaders; +import com.bumptech.glide.load.resource.bitmap.BitmapTransitionOptions; import com.nextcloud.talk.R; import com.nextcloud.talk.api.helpers.api.ApiHelper; import com.nextcloud.talk.api.models.json.rooms.Room; @@ -116,10 +117,12 @@ public class RoomItem extends AbstractFlexibleItem GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(), room.getName()), new LazyHeaders.Builder() .setHeader("Accept", "*/*") + .setHeader("User-Agent", ApiHelper.getUserAgent()) .build()); GlideApp.with(NextcloudTalkApplication.getSharedApplication().getApplicationContext()) .asBitmap() + .transition(BitmapTransitionOptions.withCrossFade()) .skipMemoryCache(true) .diskCacheStrategy(DiskCacheStrategy.NONE) .load(glideUrl) 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 6b5e54f00..2b6223f8a 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 @@ -102,7 +102,7 @@ public class UserItem extends AbstractFlexibleItem GlideUrl glideUrl = new GlideUrl(ApiHelper.getUrlForAvatarWithName(userEntity.getBaseUrl(), user.getUserId()), new LazyHeaders.Builder() .setHeader("Accept", "*/*") - .setHeader("Cache-Control", "max-age=0") + .setHeader("User-Agent", ApiHelper.getUserAgent()) .build()); GlideApp.with(NextcloudTalkApplication.getSharedApplication().getApplicationContext())