Skip to content

fix: navigate back to primary task when leaving permanent call room #6235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mahibi merged 1 commit into from
May 28, 2026
Merged

fix: navigate back to primary task when leaving permanent call room #6235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 52 additions & 3 deletions app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ package com.nextcloud.talk.activities

import android.Manifest
import android.annotation.SuppressLint
import android.app.ActivityManager
import android.app.PendingIntent
import android.app.RemoteAction
import android.content.BroadcastReceiver
Expand Down Expand Up @@ -78,6 +79,7 @@ import com.nextcloud.talk.camera.BackgroundBlurFrameProcessor
import com.nextcloud.talk.camera.BlurBackgroundViewModel
import com.nextcloud.talk.camera.BlurBackgroundViewModel.BackgroundBlurOn
import com.nextcloud.talk.chat.ChatActivity
import com.nextcloud.talk.callnotification.CallNotificationActivity
import com.nextcloud.talk.conversationlist.ConversationsListActivity
import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.databinding.CallActivityBinding
Expand Down Expand Up @@ -2049,9 +2051,8 @@ class CallActivity : CallBaseActivity() {
}

if (conversationModel?.checkIfVoiceRoom() == true) {
val intent = Intent(context, ConversationsListActivity::class.java)
startActivity(intent)
finish()
openConversationListInPrimaryTask()
finishAndRemoveTask()
} else if (switchToRoomToken.isNotEmpty()) {
val intent = Intent(context, ChatActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
Expand Down Expand Up @@ -2083,6 +2084,54 @@ class CallActivity : CallBaseActivity() {
})
}

private fun openConversationListInPrimaryTask() {
val activityManager = getSystemService(Context.ACTIVITY_SERVICE) as? ActivityManager
val appTasks = activityManager
?.appTasks
?.filter { appTask -> appTask.taskInfo?.baseActivity?.packageName == packageName }
.orEmpty()

val primaryTask = appTasks.firstOrNull { appTask ->
val taskInfo = appTask.taskInfo
val baseActivityName = taskInfo?.baseActivity?.className
taskInfo != null &&
taskInfo.taskId != taskId &&
baseActivityName == MainActivity::class.java.name
} ?: appTasks.firstOrNull { appTask ->
val taskInfo = appTask.taskInfo
val baseActivityName = taskInfo?.baseActivity?.className
taskInfo != null &&
taskInfo.taskId != taskId &&
baseActivityName != CallActivity::class.java.name &&
baseActivityName != CallNotificationActivity::class.java.name
}

if (primaryTask != null) {
val intent = Intent(context, ConversationsListActivity::class.java).apply {
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
}
primaryTask.startActivity(context, intent, null)
primaryTask.moveToFront()
val primaryTaskId = primaryTask.taskInfo?.taskId
appTasks
.filter { appTask ->
val taskInfo = appTask.taskInfo
val baseActivityName = taskInfo?.baseActivity?.className
val isCallTask = baseActivityName == CallActivity::class.java.name ||
baseActivityName == CallNotificationActivity::class.java.name
taskInfo != null && !isCallTask && taskInfo.taskId != primaryTaskId && taskInfo.taskId != taskId
}
.forEach { it.finishAndRemoveTask() }
} else {
val mainIntent = Intent(context, MainActivity::class.java).apply {
action = Intent.ACTION_MAIN
addCategory(Intent.CATEGORY_LAUNCHER)
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
}
startActivity(mainIntent)
}
}

private fun startVideoCapture(isPortrait: Boolean) {
val (width, height) = if (isPortrait) {
WIDTH_4_TO_3_RATIO to HEIGHT_4_TO_3_RATIO
Expand Down
Loading