- refactoring

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>

Author: rapterjet2004

.gitignore

@@ -86,5 +86,6 @@ freeline_project_description.json
 
 # python
 **/__pycache__/
+.vscode/
 
 /gradle/verification-keyring.gpg

.vscode/settings.json

@@ -94,6 +94,7 @@ import com.nextcloud.talk.models.json.signaling.settings.SignalingSettingsOveral
 import com.nextcloud.talk.raisehand.viewmodel.RaiseHandViewModel
 import com.nextcloud.talk.raisehand.viewmodel.RaiseHandViewModel.LoweredHandState
 import com.nextcloud.talk.raisehand.viewmodel.RaiseHandViewModel.RaisedHandState
+import com.nextcloud.talk.receivers.EndCallReceiver.Companion.END_CALL_FROM_NOTIFICATION
 import com.nextcloud.talk.services.CallForegroundService
 import com.nextcloud.talk.signaling.SignalingMessageReceiver
 import com.nextcloud.talk.signaling.SignalingMessageReceiver.CallParticipantMessageListener
@@ -185,7 +186,6 @@ import java.util.Objects
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
-import kotlin.String
 import kotlin.math.abs
 
 @AutoInjector(NextcloudTalkApplication::class)
@@ -267,6 +267,16 @@ class CallActivity : CallBaseActivity() {
     private val callParticipantMessageListeners: MutableMap<String?, CallParticipantMessageListener> = HashMap()
     private val selfPeerConnectionObserver: PeerConnectionObserver = CallActivitySelfPeerConnectionObserver()
 
+    private val endCallFromNotificationReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            if (intent.action == END_CALL_FROM_NOTIFICATION) {
+                isIntentionallyLeavingCall = true
+                powerManagerUtils?.updatePhoneState(PowerManagerUtils.PhoneState.IDLE)
+                hangup(shutDownView = true, endCallForAll = false)
+            }
+        }
+    }
+
     private val callParticipantListObserver: CallParticipantList.Observer = object : CallParticipantList.Observer {
         override fun onCallParticipantsChanged(
             joined: Collection<Participant>,
@@ -408,7 +418,7 @@ class CallActivity : CallBaseActivity() {
         sharedApplication!!.componentApplication.inject(this)
 
         // Register broadcast receiver for ending call from notification
-        val endCallFilter = IntentFilter("com.nextcloud.talk.END_CALL_FROM_NOTIFICATION")
+        val endCallFilter = IntentFilter(END_CALL_FROM_NOTIFICATION)
 
         // Use the proper utility function with ReceiverFlag for Android 14+ compatibility
         // This receiver is for internal app use only (notification actions), so it should NOT be exported
@@ -3223,18 +3233,4 @@ class CallActivity : CallBaseActivity() {
 
         private const val SESSION_ID_PREFFIX_END: Int = 4
     }
-    
-    // Broadcast receiver to handle end call from notification
-    private val endCallFromNotificationReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            if (intent.action == "com.nextcloud.talk.END_CALL_FROM_NOTIFICATION") {
-                Log.d(TAG, "Received end call from notification broadcast")
-                Log.d(TAG, "endCallFromNotificationReceiver: Setting isIntentionallyLeavingCall=true")
-                isIntentionallyLeavingCall = true
-                Log.d(TAG, "endCallFromNotificationReceiver: Releasing proximity sensor before hangup")
-                powerManagerUtils?.updatePhoneState(PowerManagerUtils.PhoneState.IDLE)
-                hangup(shutDownView = true, endCallForAll = false)
-            }
-        }
-    }
 }

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

@@ -10,27 +10,28 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.util.Log
-import com.nextcloud.talk.activities.CallActivity
 import com.nextcloud.talk.services.CallForegroundService
 
 class EndCallReceiver : BroadcastReceiver() {
     companion object {
-        private const val TAG = "EndCallReceiver"
+        private val TAG = EndCallReceiver::class.simpleName
+        const val END_CALL_ACTION = "com.nextcloud.talk.END_CALL"
+        const val END_CALL_FROM_NOTIFICATION = "com.nextcloud.talk.END_CALL_FROM_NOTIFICATION"
     }
 
     override fun onReceive(context: Context?, intent: Intent?) {
-        if (intent?.action == "com.nextcloud.talk.END_CALL") {
-            Log.d(TAG, "Received end call broadcast")
+        if (intent?.action == END_CALL_ACTION) {
+            Log.i(TAG, "Received end call broadcast")
 
             // Stop the foreground service
             context?.let {
                 CallForegroundService.stop(it)
 
                 // Send broadcast to CallActivity to end the call
-                val endCallIntent = Intent("com.nextcloud.talk.END_CALL_FROM_NOTIFICATION")
+                val endCallIntent = Intent(END_CALL_FROM_NOTIFICATION)
                 endCallIntent.setPackage(context.packageName)
                 context.sendBroadcast(endCallIntent)
             }
         }
     }
-}
+}

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

@@ -16,14 +16,14 @@ import android.content.pm.ServiceInfo
 import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
-import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
 import androidx.core.content.ContextCompat
 import com.nextcloud.talk.R
 import com.nextcloud.talk.activities.CallActivity
 import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.receivers.EndCallReceiver
+import com.nextcloud.talk.receivers.EndCallReceiver.Companion.END_CALL_ACTION
 import com.nextcloud.talk.utils.NotificationUtils
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_CALL_VOICE_ONLY
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_PARTICIPANT_PERMISSION_CAN_PUBLISH_VIDEO
@@ -62,25 +62,19 @@ class CallForegroundService : Service() {
             ?: getString(R.string.nc_call_ongoing_notification_default_title)
         val pendingIntent = createContentIntent(callExtras)
 
-        // Create action to return to call
         val returnToCallAction = NotificationCompat.Action.Builder(
             R.drawable.ic_call_white_24dp,
             getString(R.string.nc_call_ongoing_notification_return_action),
             pendingIntent
         ).build()
 
-        // Create action to end call
         val endCallPendingIntent = createEndCallIntent(callExtras)
 
-        // DIAGNOSTIC: Logging icon resource availability
-        Log.d("CallForegroundService", "Creating end call action - checking icon resources")
-        Log.d("CallForegroundService", "Using ic_baseline_close_24 instead of non-existent ic_close_white_24px")
-        
         val endCallAction = NotificationCompat.Action.Builder(
-            R.drawable.ic_baseline_close_24,  // DIAGNOSTIC: Fixed - using existing icon
+            R.drawable.ic_baseline_close_24,
             getString(R.string.nc_call_ongoing_notification_end_action),
             endCallPendingIntent
-        ).build()  // Already has parentheses, good!
+        ).build()
 
         return NotificationCompat.Builder(this, channelId)
             .setContentTitle(contentTitle)
@@ -115,16 +109,11 @@ class CallForegroundService : Service() {
     }
 
     private fun createEndCallIntent(callExtras: Bundle?): PendingIntent {
-        // DIAGNOSTIC: Logging intent creation
-        Log.d("CallForegroundService", "Creating EndCallIntent with EndCallReceiver class")
-        
         val intent = Intent(this, EndCallReceiver::class.java).apply {
-            action = "com.nextcloud.talk.END_CALL"
+            action = END_CALL_ACTION
             callExtras?.let { putExtras(Bundle(it)) }
         }
-        
-        Log.d("CallForegroundService", "EndCallIntent created successfully with action: ${intent.action}")
-        
+
         val flags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         return PendingIntent.getBroadcast(this, 1, intent, flags)
     }