Fix asking for contact permission

Stephen Paul Weber created

Change summary

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

Detailed changes

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,