From 0920029183917f74b11616dff5028d451da9eff1 Mon Sep 17 00:00:00 2001
From: sowjanyakch <sowjanya.kch@gmail.com>
Date: Fri, 8 Nov 2024 15:33:27 +0100
Subject: [PATCH] show popup for leaving call in 1:1

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
---
 .../nextcloud/talk/activities/CallActivity.kt | 29 ++++++++++++++-----
 app/src/main/res/layout/call_activity.xml     |  4 +--
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
index 023b41255..92e8cae57 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
@@ -671,16 +671,16 @@ class CallActivity : CallBaseActivity() {
 
         if (isOneToOneConversation) {
             binding!!.hangupButton.setOnLongClickListener {
-                hangup(true, false)
+                showLeavePopupMenu()
                 true
             }
             binding!!.hangupButton.setOnClickListener {
-                showPopupMenu()
+                hangup(true, true)
             }
         } else {
             if (isModerator) {
                 binding!!.hangupButton.setOnLongClickListener {
-                    showPopupMenu()
+                    showEndCallPopupMenu()
                     true
                 }
             }
@@ -689,11 +689,19 @@ class CallActivity : CallBaseActivity() {
             }
         }
 
-        binding!!.popupMenu.setOnClickListener {
-            hangup(true, true)
-            binding!!.popupMenu.visibility = View.GONE
+        if(!isOneToOneConversation){
+            binding!!.popupMenu.setOnClickListener {
+                hangup(true, true)
+                binding!!.popupMenu.visibility = View.GONE
+            }
+        }else{
+            binding!!.popupMenu.setOnClickListener {
+                hangup(true,false)
+                binding!!.popupMenu.visibility =View.GONE
+            }
         }
 
+
         binding!!.switchSelfVideoButton.setOnClickListener { switchCamera() }
         binding!!.gridview.onItemClickListener =
             AdapterView.OnItemClickListener { _: AdapterView<*>?, _: View?, _: Int, _: Long ->
@@ -729,8 +737,15 @@ class CallActivity : CallBaseActivity() {
         binding!!.lowerHandButton.setOnClickListener { l: View? -> raiseHandViewModel!!.lowerHand() }
     }
 
-    private fun showPopupMenu() {
+    private fun showEndCallPopupMenu() {
         binding!!.popupMenu.visibility = View.VISIBLE
+        binding!!.popupMenu.text = context.getString(R.string.end_call_for_everyone)
+    }
+
+    private fun showLeavePopupMenu(){
+        binding!!.popupMenu.visibility = View.VISIBLE
+        binding!!.popupMenu.text = context.getString(R.string.leave_call)
+
     }
 
     private fun createCameraEnumerator() {
diff --git a/app/src/main/res/layout/call_activity.xml b/app/src/main/res/layout/call_activity.xml
index 06244c06e..38e0f6e51 100644
--- a/app/src/main/res/layout/call_activity.xml
+++ b/app/src/main/res/layout/call_activity.xml
@@ -199,7 +199,6 @@
                     android:id="@+id/popup_menu"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/end_call_for_everyone"
                     android:layout_marginEnd="8dp"
                     android:visibility="gone"
                     tools:visibility="visible"
@@ -208,7 +207,8 @@
                     app:icon="@drawable/ic_call_end_white_24px"
                     app:iconTint="@android:color/holo_red_light"
                     app:iconGravity="textEnd"
-                    app:iconPadding="16dp" />
+                    app:iconPadding="16dp"
+                    tools:text="@string/end_call_for_everyone"/>
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/lower_hand_button"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 74dc482d9..3a7c09f71 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -311,6 +311,7 @@ How to translate with transifex:
     <string name="restrict_join_other_room_while_call">It\'s not possible to join other rooms while being in a call</string>
     <string name="call_running_since_one_hour">The call has been running for one hour.</string>
     <string name="end_call_for_everyone">End call for everyone</string>
+    <string name="leave_call">Leave call</string>
 
     <!-- Picture in Picture -->
     <string name="nc_pip_microphone_mute">Mute microphone</string>