From c413fbb692d085ea0b3a8a553ebb7ff2fc5bf44d Mon Sep 17 00:00:00 2001
From: Gleidson Daniel Silva <gleidson10daniel@hotmail.com>
Date: Fri, 9 Sep 2022 15:15:08 -0300
Subject: [PATCH] Regression: Jitsi not leaving call properly (#4511)

---
 app/views/JitsiMeetView.tsx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/views/JitsiMeetView.tsx b/app/views/JitsiMeetView.tsx
index c2e8d2d9d..4603ff77f 100644
--- a/app/views/JitsiMeetView.tsx
+++ b/app/views/JitsiMeetView.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { StyleSheet } from 'react-native';
+import { BackHandler, StyleSheet } from 'react-native';
 import JitsiMeet, { JitsiMeetView as RNJitsiMeetView } from 'react-native-jitsi-meet';
 import BackgroundTimer from 'react-native-background-timer';
 import { connect } from 'react-redux';
@@ -69,6 +69,7 @@ class JitsiMeetView extends React.Component<IJitsiMeetViewProps, IJitsiMeetViewS
 				}
 			}, 1000);
 		}
+		BackHandler.addEventListener('hardwareBackPress', this.endCall);
 	}
 
 	componentWillUnmount() {
@@ -78,9 +79,17 @@ class JitsiMeetView extends React.Component<IJitsiMeetViewProps, IJitsiMeetViewS
 			this.jitsiTimeout = null;
 			BackgroundTimer.stopBackgroundTimer();
 		}
-		JitsiMeet.endCall();
+		BackHandler.removeEventListener('hardwareBackPress', this.endCall);
+		if (isIOS) {
+			JitsiMeet.endCall();
+		}
 	}
 
+	endCall = () => {
+		JitsiMeet.endCall();
+		return null;
+	};
+
 	onConferenceWillJoin = () => {
 		this.setState({ loading: false });
 	};