소스 검색

migrate poll view model from requery to room

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 2 년 전
부모
커밋
7ea37b9ee3
1개의 변경된 파일7개의 추가작업 그리고 3개의 파일을 삭제
  1. 7 3
      app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollMainViewModel.kt

+ 7 - 3
app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollMainViewModel.kt

@@ -27,7 +27,7 @@ import androidx.lifecycle.ViewModel
 import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.polls.model.Poll
 import com.nextcloud.talk.polls.repositories.PollRepository
-import com.nextcloud.talk.utils.database.user.UserUtils
+import com.nextcloud.talk.users.UserManager
 import io.reactivex.Observer
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
@@ -37,7 +37,7 @@ import javax.inject.Inject
 class PollMainViewModel @Inject constructor(private val repository: PollRepository) : ViewModel() {
 
     @Inject
-    lateinit var userUtils: UserUtils
+    lateinit var userManager: UserManager
 
     lateinit var user: User
     lateinit var roomToken: String
@@ -175,7 +175,11 @@ class PollMainViewModel @Inject constructor(private val repository: PollReposito
     }
 
     private fun isPollCreatedByCurrentUser(poll: Poll): Boolean {
-        return userUtils.currentUser?.userId == poll.actorId
+        if (userManager.currentUser.isEmpty.blockingGet()) {
+            return false
+        } else {
+            return userManager.currentUser.blockingGet().userId == poll.actorId
+        }
     }
 
     fun dismissDialog() {