From d03602cb6dbf9b306048d4dfb0a444feba7f71db Mon Sep 17 00:00:00 2001
From: Gibran Chevalley <gibran.chevalley@infomaniak.com>
Date: Wed, 28 Feb 2024 09:17:35 +0100
Subject: [PATCH] Add missing no_avatar_default to api calls that return users

---
 .../java/com/infomaniak/drive/data/api/ApiRepository.kt     | 6 +++++-
 .../main/java/com/infomaniak/drive/data/api/ApiRoutes.kt    | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/drive/data/api/ApiRepository.kt b/app/src/main/java/com/infomaniak/drive/data/api/ApiRepository.kt
index d5d25cc9ea..ac5a3c11a2 100644
--- a/app/src/main/java/com/infomaniak/drive/data/api/ApiRepository.kt
+++ b/app/src/main/java/com/infomaniak/drive/data/api/ApiRepository.kt
@@ -108,7 +108,11 @@ object ApiRepository : ApiRepositoryCore() {
         forFileList: Boolean,
         okHttpClient: OkHttpClient = HttpClient.okHttpClientLongTimeout,
     ): ApiResponse<ArrayList<FileActivity>> {
-        val queries = if (forFileList) "&depth=children&from_date=${file.responseAt}&$activitiesWithExtraQuery" else "&with=user"
+        val queries = if (forFileList) {
+            "&depth=children&from_date=${file.responseAt}&$activitiesWithExtraQuery"
+        } else {
+            "&no_avatar_default=1&with=user"
+        }
         val url = "${ApiRoutes.getFileActivities(file)}?${pagination(page)}$queries$ACTIONS" +
                 if (forFileList) "" else ADDITIONAL_ACTIONS
 
diff --git a/app/src/main/java/com/infomaniak/drive/data/api/ApiRoutes.kt b/app/src/main/java/com/infomaniak/drive/data/api/ApiRoutes.kt
index 3fb5c23cd2..85ce5644f9 100644
--- a/app/src/main/java/com/infomaniak/drive/data/api/ApiRoutes.kt
+++ b/app/src/main/java/com/infomaniak/drive/data/api/ApiRoutes.kt
@@ -61,7 +61,7 @@ object ApiRoutes {
 
     fun fileInvitationAccess(file: File, invitationId: Int) = "${driveURL(file.driveId)}/files/invitations/$invitationId"
 
-    fun getFileShare(file: File) = "${accessUrl(file)}?with=user"
+    fun getFileShare(file: File) = "${accessUrl(file)}?no_avatar_default=1&with=user"
 
     fun checkFileShare(file: File) = "${accessUrl(file)}/check"
 
@@ -112,7 +112,7 @@ object ApiRoutes {
 
     /** Comment */
     //region Comment
-    private const val withComments = "with=user,likes,responses,responses.user,responses.likes"
+    private const val withComments = "no_avatar_default=1&with=user,likes,responses,responses.user,responses.likes"
 
     fun fileComments(file: File) = "${fileURL(file)}/comments?$withComments"