Support nullable avatars in DriveUser

Infomaniak · Feb 28, 2024 · 2a84287 · 2a84287
1 parent 6360ec2
commit 2a84287
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/com/infomaniak/drive/data/models/DriveUser.kt b/app/src/main/java/com/infomaniak/drive/data/models/DriveUser.kt
@@ -33,7 +33,7 @@ open class DriveUser(
     var avatarUrl: String? = "",
     @SerializedName("display_name")
     var displayName: String = "",
-    var avatar: String = "",
+    private var avatar: String? = "",
     var email: String = "",
     @SerializedName("role")
     private var _role: String = "",
@@ -50,7 +50,7 @@ open class DriveUser(
         displayName = user.displayName ?: ""
     }
 
-    fun getUserAvatar() = avatar.ifBlank { avatarUrl.toString() }
+    fun getUserAvatar() = avatar?.ifBlank { avatarUrl.toString() } ?: avatarUrl.toString()
 
     fun getInitials(): String {
         displayName.split(" ").let { initials ->

diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/FileShareAddUserDialog.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/FileShareAddUserDialog.kt
@@ -164,7 +164,7 @@ class FileShareAddUserDialog : FullScreenBottomSheetDialog() {
                             background = getBackgroundColorBasedOnId(item.id)
                         )
                         val request = ImageRequest.Builder(this)
-                            .data(item.avatar)
+                            .data(item.getUserAvatar())
                             .transformations(CircleCropTransformation())
                             .fallback(fallback)
                             .error(fallback)