gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-22 04:59:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2759 from nextcloud/bugfix/1756/fixActiveAccountAfterSwitchByNotification

Browse Source 
Bugfix/1756/fix active account after switch by notification
This commit is contained in:
Marcel Hibbe 2023-02-10 17:12:26 +01:00 committed by GitHub
commit 4747b9935f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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,6 +102,8 @@ 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)
if (userManager.setUserAsActive(userBeingCalled!!).blockingGet()) {
setCallDescriptionText() setCallDescriptionText()
if (currentConversation == null) { if (currentConversation == null) {
handleFromNotification() handleFromNotification()
@ -106,6 +112,7 @@ class CallNotificationActivity : CallBaseActivity() {
} }
initClickListeners() initClickListeners()
} }
}
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()

8
app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
View File

@ -338,6 +338,14 @@ class MainActivity : BaseActivity(), ActionBarProvider {
override fun onNewIntent(intent: Intent) { override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent) super.onNewIntent(intent)
Log.d(TAG, "onNewIntent Activity: " + System.identityHashCode(this).toString()) Log.d(TAG, "onNewIntent Activity: " + System.identityHashCode(this).toString())
val user = intent.getParcelableExtra<User>(KEY_USER_ENTITY)
if (user != null && userManager.setUserAsActive(user).blockingGet()) {
handleIntent(intent)
}
}
private fun handleIntent(intent: Intent) {
handleActionFromContact(intent) handleActionFromContact(intent)
if (intent.hasExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) { if (intent.hasExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) {
if (intent.getBooleanExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL, false)) { if (intent.getBooleanExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL, false)) {