From c2bc362cb331fd1a144ef68ccef677f2a4d4bf55 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 3 Dec 2018 04:22:24 +0100 Subject: [PATCH] remove unneeded permission for global search, tackles #24 --- .../thoughtcrime/securesms/ConversationListActivity.java | 9 ++------- .../thoughtcrime/securesms/search/SearchRepository.java | 3 --- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java index d3c9dac19..a9db043e0 100644 --- a/src/org/thoughtcrime/securesms/ConversationListActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java @@ -104,13 +104,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit private void initializeSearchListener() { searchAction.setOnClickListener(v -> { - Permissions.with(this) - .request(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS) - .ifNecessary() - .onAllGranted(() -> searchToolbar.display(searchAction.getX() + (searchAction.getWidth() / 2), - searchAction.getY() + (searchAction.getHeight() / 2))) - .withPermanentDenialDialog(getString(R.string.ConversationListActivity_signal_needs_contacts_permission_in_order_to_search_your_contacts_but_it_has_been_permanently_denied)) - .execute(); + searchToolbar.display(searchAction.getX() + (searchAction.getWidth() / 2), + searchAction.getY() + (searchAction.getHeight() / 2)); }); searchToolbar.setListener(new SearchToolbar.SearchListener() { diff --git a/src/org/thoughtcrime/securesms/search/SearchRepository.java b/src/org/thoughtcrime/securesms/search/SearchRepository.java index d837cdc4a..cdd10a044 100644 --- a/src/org/thoughtcrime/securesms/search/SearchRepository.java +++ b/src/org/thoughtcrime/securesms/search/SearchRepository.java @@ -90,9 +90,6 @@ class SearchRepository { } private CursorList queryContacts(String query) { - if (!Permissions.hasAny(context, Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS)) { - return CursorList.emptyList(); - } Cursor textSecureContacts = contactsDatabase.queryTextSecureContacts(query); Cursor systemContacts = contactsDatabase.querySystemContacts(query);