From a24069ce3d9fd4e142111804bd4a8f73f35723a1 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 17 Sep 2025 19:27:45 +0200 Subject: [PATCH] ask for required permissions in incoming call --- .../videochat/VideochatActivity.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/videochat/VideochatActivity.java b/src/main/java/org/thoughtcrime/securesms/videochat/VideochatActivity.java index 58814052b..572ab27e0 100644 --- a/src/main/java/org/thoughtcrime/securesms/videochat/VideochatActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/videochat/VideochatActivity.java @@ -1,5 +1,6 @@ package org.thoughtcrime.securesms.videochat; +import android.Manifest; import android.annotation.SuppressLint; import android.content.Context; import android.os.Bundle; @@ -18,9 +19,11 @@ import com.b44t.messenger.DcChat; import com.b44t.messenger.DcContext; import com.b44t.messenger.DcEvent; +import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.WebViewActivity; import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; +import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.AvatarUtil; import org.thoughtcrime.securesms.util.Util; @@ -79,8 +82,21 @@ public class VideochatActivity extends WebViewActivity implements DcEventCenter. Util.runOnMain(() -> Objects.requireNonNull(getSupportActionBar()).setTitle(chat.getName())); }); - String url = "file:///android_asset/calls/index.html"; - webView.loadUrl(url + hash); + Permissions.with(this) + .request(Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO) + .ifNecessary() + .withPermanentDenialDialog(getString(R.string.perm_explain_access_to_camera_denied)) + .onAllGranted(() -> { + String url = "file:///android_asset/calls/index.html"; + webView.loadUrl(url + hash); + }).onAnyDenied(this::finish) + .execute(); + } + + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults); } @Override