Pārlūkot izejas kodu

Removed default avatar urls

Vadik Sirekanyan 7 gadi atpakaļ
vecāks
revīzija
0fdb24ed5b

+ 0 - 15
app/src/main/java/com/sirekanyan/knigopis/model/dto/User.kt

@@ -1,14 +1,5 @@
 package com.sirekanyan.knigopis.model.dto
 
-private val defaultAvatars = setOf(
-    "https://lh3.googleusercontent.com/-XdUIqdMkCWA/AAAAAAAAAAI/AAAAAAAAAAA/4252rscbv5M/photo.jpg?sz=100",
-    "https://lh6.googleusercontent.com/-cfU0I0DdeGE/AAAAAAAAAAI/AAAAAAAAANs/RoQmKyJjwLo/photo.jpg?sz=100",
-    "https://vk.com/images/camera_50.png",
-    "http://vk.com/images/camera_50.png",
-    "https://ulogin.ru/img/photo.png",
-    "http://avt-27.foto.mail.ru/mail/newmoon56/_avatar"
-)
-
 class User(
     val id: String,
     val nickname: String?,
@@ -17,13 +8,7 @@ class User(
     private val identity: String?,
     val booksCount: Int
 ) {
-
     val fixedProfile get() = "http://www.knigopis.com/#/user/books?u=$id"
-
     val name get() = nickname ?: id
-
-    val avatar get() = photo.takeUnless { it in defaultAvatars }
-
     val profiles get() = listOfNotNull(profile, identity)
-
 }

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/model/mappers.kt

@@ -38,7 +38,7 @@ fun Subscription.toUserModel() =
     UserModel(
         subUser.id,
         subUser.name,
-        subUser.avatar,
+        subUser.photo,
         subUser.booksCount.takeIf { it > 0 }?.toString(),
         newBooksCount.takeIf { it > 0 }?.let { count ->
             val str = "+$count"