DRingService: fix hangup in conference

Change-Id: I66d31a886f735011ab8877de17d51a63aa551072

jami-android/app/src/main/java/cx/ring/fragments/CallFragment.kt

@@ -401,7 +401,7 @@ class CallFragment : BaseSupportFragment<CallPresenter, CallView>(), CallView,
 
 
     //todo: enable pip when only our video is displayed
-    override fun enterPipMode(callId: String, accountId: String) {
+    override fun enterPipMode(accountId: String, callId: String?) {
         val context = requireContext()
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N || !context.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE))
             return

jami-android/app/src/main/java/cx/ring/service/DRingService.kt

@@ -291,7 +291,7 @@ class DRingService : Service() {
                 mHardwareService.closeAudioState()
             }
             ACTION_CALL_END -> {
-                mCallService.hangUp(accountId, callId)
+                mCallService.hangUpAny(accountId, callId)
                 mHardwareService.closeAudioState()
             }
         }

jami-android/app/src/main/java/cx/ring/tv/call/TVCallFragment.kt

@@ -564,7 +564,7 @@ class TVCallFragment : BaseSupportFragment<CallPresenter, CallView>(), CallView
         presenter.requestPipMode()
     }
 
-    override fun enterPipMode(callId: String, accountId: String) {
+    override fun enterPipMode(accountId: String, callId: String?) {
         val context = requireContext()
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N || !context.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE))
             return

jami-android/libjamiclient/src/main/kotlin/net/jami/call/CallPresenter.kt

@@ -521,7 +521,7 @@ class CallPresenter @Inject constructor(
     fun requestPipMode() {
         val conference = mConference ?: return
         if (conference.isOnGoing && conference.hasVideo()) {
-            view?.enterPipMode(conference.id, conference.accountId)
+            view?.enterPipMode(conference.accountId, conference.firstCall?.daemonIdString)
         }
     }
 

jami-android/libjamiclient/src/main/kotlin/net/jami/call/CallView.kt

@@ -45,7 +45,7 @@ interface CallView {
     fun startAddParticipant(conferenceId: String)
     fun finish()
     fun onUserLeave()
-    fun enterPipMode(callId: String, accountId: String)
+    fun enterPipMode(accountId: String, callId: String?)
     fun prepareCall(acceptIncomingCall: Boolean)
     fun handleCallWakelock(isAudioOnly: Boolean)
     fun goToContact(accountId: String, contact: Contact)

jami-android/libjamiclient/src/main/kotlin/net/jami/services/CallService.kt

@@ -602,6 +602,7 @@ class CallService(
     }
 
     fun hangUpConference(accountId: String, confId: String) {
+        Log.i(TAG, "hangUpConference() running... $confId")
         mExecutor.execute { JamiService.hangUpConference(accountId, confId) }
     }
 
@@ -688,6 +689,16 @@ class CallService(
         }
     }
 
+    fun hangUpAny(accountId: String, callId: String) {
+        calls.filterValues { it.daemonIdString == callId }.firstNotNullOf {
+            val confId = it.value.confId
+            if(confId != null)
+                hangUpConference(accountId, confId)
+            else
+                hangUp(accountId, callId)
+        }
+    }
+
     companion object {
         private val TAG = CallService::class.simpleName!!
         const val MIME_TEXT_PLAIN = "text/plain"