gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-21 20:49:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix to stop notification if user joined on other device

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2021-11-11 15:37:39 +01:00
parent 5bb8de673e
commit b652b1136e
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt
View File

@ -63,7 +63,6 @@ import com.nextcloud.talk.utils.bundle.BundleKeys
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_FROM_NOTIFICATION_START_CALL import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_FROM_NOTIFICATION_START_CALL
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_USER_ENTITY import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_USER_ENTITY
import com.nextcloud.talk.utils.preferences.AppPreferences import com.nextcloud.talk.utils.preferences.AppPreferences
import com.nextcloud.talk.utils.singletons.ApplicationWideCurrentRoomHolder
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.Observer import io.reactivex.Observer
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
@ -341,7 +340,8 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() {
hasParticipantsInCall = participantList.isNotEmpty() hasParticipantsInCall = participantList.isNotEmpty()
if (hasParticipantsInCall) { if (hasParticipantsInCall) {
for (participant in participantList) { for (participant in participantList) {
if (participant.userId == signatureVerification.userEntity.userId) { if (participant.actorId == signatureVerification.userEntity.userId &&
participant.actorType == Participant.ActorType.USERS) {
inCallOnDifferentDevice = true inCallOnDifferentDevice = true
break break
} }