gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-09 23:53:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to active user in CallNotificationActivity

Browse Source 
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>
This commit is contained in:
Marcel Hibbe 2023-02-10 16:16:27 +01:00
parent fb7ea25b9d
commit fcb4ee0430
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt
View File

@ -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.Conversation
import com.nextcloud.talk.models.json.conversations.RoomOverall import com.nextcloud.talk.models.json.conversations.RoomOverall
import com.nextcloud.talk.models.json.participants.Participant 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.ApiUtils
import com.nextcloud.talk.utils.NotificationUtils import com.nextcloud.talk.utils.NotificationUtils
import com.nextcloud.talk.utils.ParticipantPermissions import com.nextcloud.talk.utils.ParticipantPermissions
@ -73,6 +74,9 @@ class CallNotificationActivity : CallBaseActivity() {
@Inject @Inject
var cache: Cache? = null var cache: Cache? = null
@Inject
lateinit var userManager: UserManager
private val disposablesList: MutableList<Disposable> = ArrayList() private val disposablesList: MutableList<Disposable> = ArrayList()
private var originalBundle: Bundle? = null private var originalBundle: Bundle? = null
private var roomToken: String? = null private var roomToken: String? = null
@ -98,13 +102,16 @@ class CallNotificationActivity : CallBaseActivity() {
userBeingCalled = extras.getParcelable(KEY_USER_ENTITY) userBeingCalled = extras.getParcelable(KEY_USER_ENTITY)
originalBundle = extras originalBundle = extras
credentials = ApiUtils.getCredentials(userBeingCalled!!.username, userBeingCalled!!.token) credentials = ApiUtils.getCredentials(userBeingCalled!!.username, userBeingCalled!!.token)
setCallDescriptionText()
if (currentConversation == null) { if (userManager.setUserAsActive(userBeingCalled!!).blockingGet()) {
handleFromNotification() setCallDescriptionText()
} else { if (currentConversation == null) {
setUpAfterConversationIsKnown() handleFromNotification()
} else {
setUpAfterConversationIsKnown()
}
initClickListeners()
} }
initClickListeners()
} }
override fun onStart() { override fun onStart() {