From bb7e82fbcbd8c10d0d0128d736c41cec0f79e7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Brey?= <alvaro.brey@nextcloud.com>
Date: Tue, 14 Jun 2022 15:51:04 +0200
Subject: [PATCH] Use custom permission for unfiltered broadcast receiver in
 CallActivity
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
---
 app/build.gradle                                            | 4 ++++
 app/src/main/AndroidManifest.xml                            | 5 +++++
 .../java/com/nextcloud/talk/activities/CallActivity.java    | 6 +++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b271d0f16..46dc272a8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,6 +83,10 @@ android {
         testInstrumentationRunnerArgument "TEST_SERVER_URL", "${NC_TEST_SERVER_BASEURL}"
         testInstrumentationRunnerArgument "TEST_SERVER_USERNAME", "${NC_TEST_SERVER_USERNAME}"
         testInstrumentationRunnerArgument "TEST_SERVER_PASSWORD", "${NC_TEST_SERVER_PASSWORD}"
+
+        def localBroadcastPermission = "com.nextcloud.talk.permission.PRIVATE_BROADCAST"
+        manifestPlaceholders.broadcastPermission = localBroadcastPermission
+        buildConfigField "String", "PERMISSION_LOCAL_BROADCAST", "\"${localBroadcastPermission}\""
     }
 
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afb39eef3..0972f54af 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -79,6 +79,11 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
+    <permission
+        android:name="${broadcastPermission}"
+        android:protectionLevel="signature" />
+    <uses-permission android:name="${broadcastPermission}"/>
+
     <application
         android:name=".application.NextcloudTalkApplication"
         android:allowBackup="true"
diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 1b78b4714..bc3b53a80 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -52,6 +52,7 @@ import android.widget.RelativeLayout;
 import android.widget.Toast;
 
 import com.bluelinelabs.logansquare.LoganSquare;
+import com.nextcloud.talk.BuildConfig;
 import com.nextcloud.talk.R;
 import com.nextcloud.talk.adapters.ParticipantDisplayItem;
 import com.nextcloud.talk.adapters.ParticipantsAdapter;
@@ -2555,7 +2556,10 @@ public class CallActivity extends CallBaseActivity {
                         }
                     }
                 };
-            registerReceiver(mReceiver, new IntentFilter(MICROPHONE_PIP_INTENT_NAME));
+            registerReceiver(mReceiver,
+                             new IntentFilter(MICROPHONE_PIP_INTENT_NAME),
+                             BuildConfig.PERMISSION_LOCAL_BROADCAST,
+                             null);
 
             updateUiForPipMode();
         } else {