ask for contact permission before adding to contact to phone book. fixes #3808

src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java

@@ -1,16 +1,20 @@
 package eu.siacs.conversations.ui;
 
+import android.Manifest;
 import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.databinding.DataBindingUtil;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Intents;
+import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.text.Spannable;
@@ -57,15 +61,15 @@ import eu.siacs.conversations.utils.IrregularUnicodeDetector;
 import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.utils.XmppUri;
 import eu.siacs.conversations.xml.Namespace;
+import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.OnKeyStatusUpdated;
 import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
 import eu.siacs.conversations.xmpp.XmppConnection;
-import eu.siacs.conversations.xmpp.Jid;
 
 public class ContactDetailsActivity extends OmemoActivity implements OnAccountUpdate, OnRosterUpdate, OnUpdateBlocklist, OnKeyStatusUpdated, OnMediaLoaded {
     public static final String ACTION_VIEW_CONTACT = "view_contact";
+    private final int REQUEST_SYNC_CONTACTS = 0x28cf;
     ActivityContactDetailsBinding binding;
-
     private MediaAdapter mMediaAdapter;
 
     private Contact contact;
@@ -110,47 +114,41 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
     private boolean showInactiveOmemo = false;
     private String messageFingerprint;
 
-    private DialogInterface.OnClickListener addToPhonebook = new DialogInterface.OnClickListener() {
+    private void checkContactPermissionAndShowAddDialog() {
+        if (hasContactsPermission()) {
+            showAddToPhoneBookDialog();
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            requestPermissions(new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_SYNC_CONTACTS);
+        }
+    }
 
-        @Override
+    private boolean hasContactsPermission() {
-        public void onClick(DialogInterface dialog, int which) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
+            return checkSelfPermission(Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED;
+        } else {
+            return true;
+        }
+    }
+
+    private void showAddToPhoneBookDialog() {
+        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(getString(R.string.action_add_phone_book));
+        builder.setMessage(getString(R.string.add_phone_book_text, contact.getJid().toEscapedString()));
+        builder.setNegativeButton(getString(R.string.cancel), null);
+        builder.setPositiveButton(getString(R.string.add), (dialog, which) -> {
+            final Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
             intent.setType(Contacts.CONTENT_ITEM_TYPE);
             intent.putExtra(Intents.Insert.IM_HANDLE, contact.getJid().toEscapedString());
             intent.putExtra(Intents.Insert.IM_PROTOCOL, CommonDataKinds.Im.PROTOCOL_JABBER);
             intent.putExtra("finishActivityOnSaveCompleted", true);
             try {
-                ContactDetailsActivity.this.startActivityForResult(intent, 0);
+                startActivityForResult(intent, 0);
             } catch (ActivityNotFoundException e) {
                 Toast.makeText(ContactDetailsActivity.this, R.string.no_application_found_to_view_contact, Toast.LENGTH_SHORT).show();
             }
-        }
+        });
-    };
+        builder.create().show();
-
+    }
-    private OnClickListener onBadgeClick = new OnClickListener() {
-
-        @Override
-        public void onClick(View v) {
-            Uri systemAccount = contact.getSystemAccount();
-            if (systemAccount == null) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(
-                        ContactDetailsActivity.this);
-                builder.setTitle(getString(R.string.action_add_phone_book));
-                builder.setMessage(getString(R.string.add_phone_book_text, contact.getJid().toEscapedString()));
-                builder.setNegativeButton(getString(R.string.cancel), null);
-                builder.setPositiveButton(getString(R.string.add), addToPhonebook);
-                builder.create().show();
-            } else {
-                Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setData(systemAccount);
-                try {
-                    startActivity(intent);
-                } catch (ActivityNotFoundException e) {
-                    Toast.makeText(ContactDetailsActivity.this, R.string.no_application_found_to_view_contact, Toast.LENGTH_SHORT).show();
-                }
-            }
-        }
-    };
 
     @Override
     public void onRosterUpdate() {
@@ -233,6 +231,18 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
         mMediaAdapter.setAttachments(Collections.emptyList());
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+        if (grantResults.length > 0)
+            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                if (requestCode == REQUEST_SYNC_CONTACTS && xmppConnectionServiceBound) {
+                    showAddToPhoneBookDialog();
+                    xmppConnectionService.loadPhoneContacts();
+                    xmppConnectionService.startContactObserver();
+                }
+            }
+    }
+
     @Override
     public boolean onOptionsItemSelected(final MenuItem menuItem) {
         if (MenuDoubleTabUtil.shouldIgnoreTap()) {
@@ -417,7 +427,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
         }
         binding.detailsAccount.setText(getString(R.string.using_account, account));
         AvatarWorkerTask.loadAvatar(contact, binding.detailsContactBadge, R.dimen.avatar_on_details_screen_size);
-        binding.detailsContactBadge.setOnClickListener(this.onBadgeClick);
+        binding.detailsContactBadge.setOnClickListener(this::onBadgeClick);
 
         binding.detailsContactKeys.removeAllViews();
         boolean hasKeys = false;
@@ -496,6 +506,21 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
         }
     }
 
+    private void onBadgeClick(View view) {
+        final Uri systemAccount = contact.getSystemAccount();
+        if (systemAccount == null) {
+            checkContactPermissionAndShowAddDialog();
+        } else {
+            final Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(systemAccount);
+            try {
+                startActivity(intent);
+            } catch (final ActivityNotFoundException e) {
+                Toast.makeText(this, R.string.no_application_found_to_view_contact, Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
     public void onBackendConnected() {
         if (accountJid != null && contactJid != null) {
             Account account = xmppConnectionService.findAccountByJid(accountJid);