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 2439940de..aebaabe24 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt @@ -113,6 +113,7 @@ import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.DisplayUtils import com.nextcloud.talk.utils.NotificationUtils.cancelExistingNotificationsForRoom import com.nextcloud.talk.utils.NotificationUtils.getCallRingtoneUri +import com.nextcloud.talk.utils.ReceiverFlag import com.nextcloud.talk.utils.VibrationUtils.vibrateShort import com.nextcloud.talk.utils.animations.PulseAnimation import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_CALL_VOICE_ONLY @@ -136,6 +137,7 @@ import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew.isCallRecordin import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil import com.nextcloud.talk.utils.power.PowerManagerUtils +import com.nextcloud.talk.utils.registerPermissionHandlerBroadcastReceiver import com.nextcloud.talk.utils.singletons.ApplicationWideCurrentRoomHolder import com.nextcloud.talk.viewmodels.CallRecordingViewModel import com.nextcloud.talk.viewmodels.CallRecordingViewModel.RecordingConfirmStopState @@ -3015,11 +3017,12 @@ class CallActivity : CallBaseActivity() { } } } - registerReceiver( + registerPermissionHandlerBroadcastReceiver( mReceiver, IntentFilter(MICROPHONE_PIP_INTENT_NAME), permissionUtil!!.privateBroadcastPermission, - null + null, + ReceiverFlag.NotExported ) updateUiForPipMode() } else { diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcAudioManager.java b/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcAudioManager.java index a3cf70773..69c2ef71c 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcAudioManager.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcAudioManager.java @@ -44,6 +44,8 @@ import android.media.AudioManager; import android.util.Log; import com.nextcloud.talk.events.ProximitySensorEvent; +import com.nextcloud.talk.utils.ContextExtensionsKt; +import com.nextcloud.talk.utils.ReceiverFlag; import com.nextcloud.talk.utils.power.PowerManagerUtils; import org.greenrobot.eventbus.EventBus; @@ -339,7 +341,7 @@ public class WebRtcAudioManager { * Helper method for receiver registration. */ private void registerReceiver(BroadcastReceiver receiver, IntentFilter filter) { - magicContext.registerReceiver(receiver, filter); + ContextExtensionsKt.registerBroadcastReceiver(magicContext, receiver, filter, ReceiverFlag.NotExported); } /** diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcBluetoothManager.java b/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcBluetoothManager.java index ba530f1c3..4f0ddd9bf 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcBluetoothManager.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/WebRtcBluetoothManager.java @@ -51,6 +51,9 @@ import android.os.Looper; import android.os.Process; import android.util.Log; +import com.nextcloud.talk.utils.ContextExtensionsKt; +import com.nextcloud.talk.utils.ReceiverFlag; + import org.webrtc.ThreadUtils; import java.util.List; @@ -300,7 +303,11 @@ public class WebRtcBluetoothManager { } protected void registerReceiver(BroadcastReceiver receiver, IntentFilter filter) { - apprtcContext.registerReceiver(receiver, filter); + ContextExtensionsKt.registerBroadcastReceiver( + apprtcContext, + receiver, + filter, + ReceiverFlag.NotExported); } protected void unregisterReceiver(BroadcastReceiver receiver) {