From 7cf6b019287b99bc182026ba15e20e6f77de8c00 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 22 Oct 2024 21:28:53 -0500
Subject: [PATCH] Fix asking for contact permission

---
 .../siacs/conversations/ui/StartConversationActivity.java  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index a88c6dd4e73b9466448bb853bf385f5959b3fb42..9dd1f2a5f3db65bf2673289f9d2d1331906e739d 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -500,7 +500,7 @@ public class StartConversationActivity extends XmppActivity
         super.onStart();
         mConferenceAdapter.refreshSettings();
         mContactsAdapter.refreshSettings();
-        if (pendingViewIntent.peek() == null) {
+        if (!createdByViewIntent) {
             if (askForContactsPermissions()) {
                 return;
             }
@@ -999,10 +999,7 @@ public class StartConversationActivity extends XmppActivity
             final String consent =
                     PreferenceManager.getDefaultSharedPreferences(getApplicationContext())
                             .getString(PREF_KEY_CONTACT_INTEGRATION_CONSENT, null);
-            final boolean requiresConsent =
-                    (QuickConversationsService.isQuicksy()
-                                    || QuickConversationsService.isPlayStoreFlavor())
-                            && !"agreed".equals(consent);
+            final boolean requiresConsent = !"agreed".equals(consent);
             if (requiresConsent && "declined".equals(consent)) {
                 Log.d(
                         Config.LOGTAG,