Stop calls from ringing after answering.

Switched call notification to NotificationCompat.CallStyle.
This adds answer/decline buttons to the notification
so that users can answer incoming calls.

Adds caller avatar to notification.

Signed-off-by: Jens Zalzala <jens@shakingearthdigital.com>

Author: anakin78z

app/src/main/AndroidManifest.xml

@@ -293,6 +293,7 @@
 
         <receiver android:name=".receivers.DirectReplyReceiver" />
         <receiver android:name=".receivers.MarkAsReadReceiver" />
+        <receiver android:name=".receivers.CallNotificationActionReceiver" android:exported="false" />
         <receiver android:name=".receivers.DismissRecordingAvailableReceiver" />
         <receiver android:name=".receivers.ShareRecordingToChatReceiver" />
 

app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt

@@ -41,6 +41,7 @@ import android.view.OrientationEventListener
 import android.view.View
 import android.view.View.OnTouchListener
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.app.NotificationManagerCompat
 import androidx.annotation.DrawableRes
 import androidx.appcompat.app.AlertDialog
 import androidx.compose.material3.MaterialTheme
@@ -118,6 +119,7 @@ import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_CALL_WITHOUT_NOTIFICATION
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_CONVERSATION_NAME
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_CONVERSATION_PASSWORD
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_FROM_NOTIFICATION_START_CALL
+import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_NOTIFICATION_TIMESTAMP
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_IS_BREAKOUT_ROOM
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_IS_MODERATOR
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_MODIFIED_BASE_URL
@@ -553,6 +555,11 @@ class CallActivity : CallBaseActivity() {
 
         if (extras.containsKey(KEY_FROM_NOTIFICATION_START_CALL)) {
             isIncomingCallFromNotification = extras.getBoolean(KEY_FROM_NOTIFICATION_START_CALL)
+            val notificationId = extras.getInt(KEY_NOTIFICATION_TIMESTAMP, 0)
+            if (notificationId != 0) {
+                // cancel the notification to stop the call ringing
+                NotificationManagerCompat.from(this).cancel(notificationId)
+            }
         }
         if (extras.containsKey(KEY_IS_BREAKOUT_ROOM)) {
             isBreakoutRoom = extras.getBoolean(KEY_IS_BREAKOUT_ROOM)

app/src/main/java/com/nextcloud/talk/activities/CallBaseActivity.java

@@ -8,7 +8,6 @@
 
 import android.annotation.SuppressLint;
 import android.app.AppOpsManager;
-import android.app.KeyguardManager;
 import android.app.PictureInPictureParams;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -76,10 +75,7 @@ void dismissKeyguard() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
             setShowWhenLocked(true);
             setTurnScreenOn(true);
-            KeyguardManager keyguardManager = (KeyguardManager) getSystemService(KEYGUARD_SERVICE);
-            keyguardManager.requestDismissKeyguard(this, null);
         } else {
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
         }

app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt

@@ -45,6 +45,7 @@ import coil.request.ImageRequest
 import com.bluelinelabs.logansquare.LoganSquare
 import com.nextcloud.talk.BuildConfig
 import com.nextcloud.talk.R
+import com.nextcloud.talk.activities.CallActivity
 import com.nextcloud.talk.activities.MainActivity
 import com.nextcloud.talk.api.NcApi
 import com.nextcloud.talk.application.NextcloudTalkApplication
@@ -61,6 +62,7 @@ import com.nextcloud.talk.models.json.participants.Participant
 import com.nextcloud.talk.models.json.participants.ParticipantsOverall
 import com.nextcloud.talk.models.json.push.DecryptedPushMessage
 import com.nextcloud.talk.models.json.push.NotificationUser
+import com.nextcloud.talk.receivers.CallNotificationActionReceiver
 import com.nextcloud.talk.receivers.DirectReplyReceiver
 import com.nextcloud.talk.receivers.DismissRecordingAvailableReceiver
 import com.nextcloud.talk.receivers.MarkAsReadReceiver
@@ -95,7 +97,6 @@ import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_THREAD_ID
 import com.nextcloud.talk.utils.preferences.AppPreferences
 import io.reactivex.Observable
 import io.reactivex.Observer
-import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import okhttp3.JavaNetCookieJar
@@ -268,11 +269,66 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
                 }
             )
 
+            val pendingIntentFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            } else {
+                PendingIntent.FLAG_UPDATE_CURRENT
+            }
+
+            val answerVoiceBundle = Bundle(bundle).apply { putBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, true) }
+            val answerVoicePendingIntent = PendingIntent.getActivity(
+                applicationContext,
+                requestCode + ANSWER_VOICE_REQUEST_OFFSET,
+                Intent(applicationContext, CallActivity::class.java).apply {
+                    putExtras(answerVoiceBundle)
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                },
+                pendingIntentFlags
+            )
+
+            val answerVideoBundle = Bundle(bundle).apply { putBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, false) }
+            val answerVideoPendingIntent = PendingIntent.getActivity(
+                applicationContext,
+                requestCode + ANSWER_VIDEO_REQUEST_OFFSET,
+                Intent(applicationContext, CallActivity::class.java).apply {
+                    putExtras(answerVideoBundle)
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                },
+                pendingIntentFlags
+            )
+
+            val declinePendingIntent = PendingIntent.getBroadcast(
+                applicationContext,
+                requestCode + DECLINE_CALL_REQUEST_OFFSET,
+                Intent(applicationContext, CallNotificationActionReceiver::class.java).apply {
+                    action = CallNotificationActionReceiver.ACTION_DECLINE_CALL
+                    putExtra(KEY_NOTIFICATION_TIMESTAMP, pushMessage.timestamp.toInt())
+                },
+                pendingIntentFlags
+            )
+
             val soundUri = getCallRingtoneUri(applicationContext, appPreferences)
             val notificationChannelId = NotificationUtils.NotificationChannels.NOTIFICATION_CHANNEL_CALLS_V4.name
             val uri = signatureVerification.user!!.baseUrl!!.toUri()
             val baseUrl = uri.host
 
+            val callerPersonBuilder = Person.Builder()
+                .setName(conversation.displayName)
+                .setImportant(true)
+            if (conversation.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) {
+                val avatarUrl = ApiUtils.getUrlForAvatar(
+                    signatureVerification.user!!.baseUrl!!,
+                    conversation.name,
+                    false,
+                    darkMode = DisplayUtils.isDarkModeOn(applicationContext)
+                )
+                loadAvatarSync(avatarUrl, applicationContext)?.let { callerPersonBuilder.setIcon(it) }
+            }
+            val callerPerson = callerPersonBuilder.build()
+
+            val isVideoCall = (conversation.callFlag and Participant.InCallFlags.WITH_VIDEO) > 0
+            val primaryAnswerIntent = if (isVideoCall) answerVideoPendingIntent else answerVoicePendingIntent
+
             val notification =
                 NotificationCompat.Builder(applicationContext, notificationChannelId)
                     .setPriority(NotificationCompat.PRIORITY_HIGH)
@@ -289,6 +345,11 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
                     .setContentIntent(fullScreenPendingIntent)
                     .setFullScreenIntent(fullScreenPendingIntent, true)
                     .setSound(soundUri)
+                    .setStyle(
+                        NotificationCompat.CallStyle
+                            .forIncomingCall(callerPerson, declinePendingIntent, primaryAnswerIntent)
+                            .setIsVideo(isVideoCall)
+                    )
                     .build()
             notification.flags = notification.flags or Notification.FLAG_INSISTENT
 
@@ -299,7 +360,7 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
 
         chatNetworkDataSource?.getRoom(userBeingCalled, roomToken = pushMessage.id!!)
             ?.subscribeOn(Schedulers.io())
-            ?.observeOn(AndroidSchedulers.mainThread())
+            ?.observeOn(Schedulers.io())
             ?.subscribe(object : Observer<ConversationModel> {
                 override fun onSubscribe(d: Disposable) {
                     // unused atm
@@ -1107,5 +1168,8 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
         private const val TIMER_COUNT = 12
         private const val TIMER_DELAY: Long = 5
         private const val LINEBREAK: String = "\n"
+        private const val ANSWER_VOICE_REQUEST_OFFSET = 1
+        private const val ANSWER_VIDEO_REQUEST_OFFSET = 2
+        private const val DECLINE_CALL_REQUEST_OFFSET = 3
     }
 }

app/src/main/java/com/nextcloud/talk/receivers/CallNotificationActionReceiver.kt

@@ -0,0 +1,28 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ *
+ * SPDX-FileCopyrightText: 2026 Jens Zalzala <jens@shakingearthdigital.com>
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+package com.nextcloud.talk.receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import androidx.core.app.NotificationManagerCompat
+import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_NOTIFICATION_TIMESTAMP
+
+class CallNotificationActionReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        val notificationId = intent.getIntExtra(KEY_NOTIFICATION_TIMESTAMP, 0)
+        NotificationManagerCompat.from(context).cancel(notificationId)
+    }
+
+    companion object {
+        const val ACTION_DECLINE_CALL = "com.nextcloud.talk.ACTION_DECLINE_CALL"
+    }
+}