From 3f80a45997ad82dec9097a6556997a74f8a9ca01 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 17 Jun 2024 09:03:07 +0200
Subject: [PATCH] fix race condition when granting camera permission after
 request to switch to video

---
 .../eu/siacs/conversations/ui/RtpSessionActivity.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
index 1bb11c97391ece66e24a5d2bfc5683ba94dc8d34..1e68fae2e9017961fa0c203f76151a26ad85e99c 100644
--- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
@@ -314,10 +314,15 @@ public class RtpSessionActivity extends XmppActivity
 
     private void acceptContentAdd() {
         try {
-            requireRtpConnection()
-                    .acceptContentAdd(requireRtpConnection().getPendingContentAddition().summary);
+            final ContentAddition pendingContentAddition =
+                    requireRtpConnection().getPendingContentAddition();
+            if (pendingContentAddition == null) {
+                Log.d(Config.LOGTAG, "content offer was gone after granting permission");
+                return;
+            }
+            requireRtpConnection().acceptContentAdd(pendingContentAddition.summary);
         } catch (final IllegalStateException e) {
-            Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, Strings.nullToEmpty(e.getMessage()), Toast.LENGTH_SHORT).show();
         }
     }