From e238c4c9e5ea86d0ec46ba0c049991de2d5cd5a6 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Wed, 14 Dec 2022 15:50:07 +0100 Subject: [PATCH] ensure that there is always a current user this should also fix the app to start after it always crashed on startup because of https://github.com/nextcloud/talk-android/issues/2531 Signed-off-by: Marcel Hibbe --- .../nextcloud/talk/controllers/ConversationsListController.kt | 2 +- app/src/main/java/com/nextcloud/talk/users/UserManager.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.kt index 350d21921..3674200d9 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.kt @@ -295,7 +295,7 @@ class ConversationsListController(bundle: Bundle) : } fetchRooms() } else { - Log.e(TAG, "currentUser was null in ConversationsListController.onAttach") + Log.e(TAG, "userManager.currentUser.blockingGet() returned null") Toast.makeText(context, R.string.nc_common_error_sorry, Toast.LENGTH_LONG).show() } } diff --git a/app/src/main/java/com/nextcloud/talk/users/UserManager.kt b/app/src/main/java/com/nextcloud/talk/users/UserManager.kt index 2fb2acd12..378cb8112 100644 --- a/app/src/main/java/com/nextcloud/talk/users/UserManager.kt +++ b/app/src/main/java/com/nextcloud/talk/users/UserManager.kt @@ -43,6 +43,7 @@ class UserManager internal constructor(private val userRepository: UsersReposito val currentUser: Maybe get() { return userRepository.getActiveUser() + .switchIfEmpty(getAnyUserAndSetAsActive()) } val currentUserObservable: Observable