From fcb4ee04309911ecac1760dff9d764ae9b23528a Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Fri, 10 Feb 2023 16:16:27 +0100
Subject: [PATCH] Switch to active user in CallNotificationActivity

There are no known bugs that were caused by not setting the active user here, but this should be done.

See fb7ea25b for reference

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../activities/CallNotificationActivity.kt    | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt
index 3009febc5..6051a853c 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt
@@ -43,6 +43,7 @@ import com.nextcloud.talk.extensions.loadAvatar
 import com.nextcloud.talk.models.json.conversations.Conversation
 import com.nextcloud.talk.models.json.conversations.RoomOverall
 import com.nextcloud.talk.models.json.participants.Participant
+import com.nextcloud.talk.users.UserManager
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.NotificationUtils
 import com.nextcloud.talk.utils.ParticipantPermissions
@@ -73,6 +74,9 @@ class CallNotificationActivity : CallBaseActivity() {
     @Inject
     var cache: Cache? = null
 
+    @Inject
+    lateinit var userManager: UserManager
+
     private val disposablesList: MutableList<Disposable> = ArrayList()
     private var originalBundle: Bundle? = null
     private var roomToken: String? = null
@@ -98,13 +102,16 @@ class CallNotificationActivity : CallBaseActivity() {
         userBeingCalled = extras.getParcelable(KEY_USER_ENTITY)
         originalBundle = extras
         credentials = ApiUtils.getCredentials(userBeingCalled!!.username, userBeingCalled!!.token)
-        setCallDescriptionText()
-        if (currentConversation == null) {
-            handleFromNotification()
-        } else {
-            setUpAfterConversationIsKnown()
+
+        if (userManager.setUserAsActive(userBeingCalled!!).blockingGet()) {
+            setCallDescriptionText()
+            if (currentConversation == null) {
+                handleFromNotification()
+            } else {
+                setUpAfterConversationIsKnown()
+            }
+            initClickListeners()
         }
-        initClickListeners()
     }
 
     override fun onStart() {