From 0b8dcea0b693fb693d963b33866f546cf2b85864 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 12 Oct 2024 00:05:57 +0200 Subject: [PATCH] add TODOs for camera permission (cherry picked from commit fb7f0ceef26022656f600dc96f1a343a04173760) --- .../java/eu/siacs/conversations/ui/ContactDetailsActivity.java | 1 + .../java/eu/siacs/conversations/ui/EditAccountActivity.java | 1 + .../eu/siacs/conversations/ui/StartConversationActivity.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java index ccc79471f..3a0e81179 100644 --- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -290,6 +290,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + // TODO check for Camera / Scan permission super.onRequestPermissionsResult(requestCode, permissions, grantResults); if (grantResults.length > 0) if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index 81ff41f59..361734171 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -586,6 +586,7 @@ public class EditAccountActivity extends OmemoActivity @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { + // TODO check for Camera / Scan permission super.onActivityResult(requestCode, resultCode, data); if (requestCode == REQUEST_BATTERY_OP || requestCode == REQUEST_DATA_SAVER) { updateAccountInformation(mAccount == null); diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index 8affbba2a..b0eff0164 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -1171,7 +1171,7 @@ public class StartConversationActivity extends XmppActivity super.onRequestPermissionsResult(requestCode, permissions, grantResults); if (grantResults.length > 0) if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { - ScanActivity.onRequestPermissionResult(this, requestCode, grantResults); + UriHandlerActivity.onRequestPermissionResult(this, requestCode, grantResults); if (requestCode == REQUEST_SYNC_CONTACTS && xmppConnectionServiceBound) { if (QuickConversationsService.isQuicksy()) { setRefreshing(true);