Update api calls to receive null avatars if the users have not set any

Infomaniak · Feb 28, 2024 · 6360ec2 · 6360ec2
1 parent 010dfd5
commit 6360ec2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
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
@@ -45,7 +45,7 @@ object ApiRoutes {
 
     /** V1 */
     //region V1
-    fun getAllDrivesData() = "${DRIVE_API_V1}init?with=drives,users,teams,ips,categories"
+    fun getAllDrivesData() = "${DRIVE_API_V1}init?no_avatar_default=1&with=drives,users,teams,ips,categories"
     //endregion
 
     /** Archive */
@@ -86,12 +86,12 @@ object ApiRoutes {
             "&actions[]=comment_create"
 
     fun getLastActivities(driveId: Int) =
-        "${filesURL(driveId)}/activities?$activitiesWithQuery,user&depth=unlimited&$activitiesActions"
+        "${filesURL(driveId)}/activities?$activitiesWithQuery,user&depth=unlimited&$activitiesActions&no_avatar_default=1"
 
-    fun getFileActivities(file: File) = "${fileURL(file)}/activities"
+    fun getFileActivities(file: File) = "${fileURL(file)}/activities?no_avatar_default=1"
 
     fun getFileActivities(driveId: Int, fileIds: String, fromDate: Long) =
-        "${filesURL(driveId)}/activities/batch?$activitiesWithQuery&file_ids=$fileIds&from_date=$fromDate" +
+        "${filesURL(driveId)}/activities/batch?no_avatar_default=1&$activitiesWithQuery&file_ids=$fileIds&from_date=$fromDate" +
                 "&actions[]=file_rename" +
                 "&actions[]=file_update"
 

diff --git a/app/src/main/java/com/infomaniak/drive/ui/login/LoginActivity.kt b/app/src/main/java/com/infomaniak/drive/ui/login/LoginActivity.kt
@@ -205,7 +205,10 @@ class LoginActivity : AppCompatActivity() {
                 return getErrorResponse(R.string.errorUserAlreadyPresent)
             } ?: run {
                 InfomaniakCore.bearerToken = apiToken.accessToken
-                val userProfileResponse = ApiRepository.getUserProfile(HttpClient.okHttpClientNoTokenInterceptor)
+                val userProfileResponse = ApiRepository.getUserProfile(
+                    HttpClient.okHttpClientNoTokenInterceptor,
+                    ignoreDefaultAvatar = true,
+                )
                 if (userProfileResponse.result == ApiResponseStatus.ERROR) {
                     return userProfileResponse
                 } else {

diff --git a/app/src/main/java/com/infomaniak/drive/utils/AccountUtils.kt b/app/src/main/java/com/infomaniak/drive/utils/AccountUtils.kt
@@ -110,7 +110,7 @@ object AccountUtils : CredentialManager() {
         okHttpClient: OkHttpClient = HttpClient.okHttpClient,
     ) = withContext(Dispatchers.IO) {
 
-        val (userResult, user) = with(ApiRepository.getUserProfile(okHttpClient)) {
+        val (userResult, user) = with(ApiRepository.getUserProfile(okHttpClient, ignoreDefaultAvatar = true)) {
             result to (data ?: return@withContext)
         }