#289 📎 Add more sources to upload attachments

Fix contact picker Signed-off-by: Stefan Niedermann <info@niedermann.it>
stefan-niedermann · Oct 29, 2020 · 704273e · 704273e
1 parent d773e16
commit 704273e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/...c/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java b/...c/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
@@ -210,7 +210,7 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
             case REQUEST_CODE_PICK_CONTACT: {
                 if (resultCode == RESULT_OK) {
                     try {
-                        uploadNewAttachment(VCardUtil.getVCardContentUri(requireContext()));
+                        uploadNewAttachment(VCardUtil.getVCardContentUri(requireContext(), Uri.parse(data.getDataString())));
                     } catch (Exception e) {
                         ExceptionDialogFragment.newInstance(e, viewModel.getAccount()).show(getChildFragmentManager(), ExceptionDialogFragment.class.getSimpleName());
                     }
@@ -220,10 +220,6 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
             case REQUEST_CODE_CAPTURE_IMAGE:
             case REQUEST_CODE_ADD_FILE: {
                 if (resultCode == RESULT_OK) {
-                    if (data == null) {
-                        ExceptionDialogFragment.newInstance(new UploadAttachmentFailedException("Intent data is null"), viewModel.getAccount()).show(getChildFragmentManager(), ExceptionDialogFragment.class.getSimpleName());
-                        return;
-                    }
                     try {
                         uploadNewAttachment(data.getData());
                     } catch (Exception e) {

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/util/VCardUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/util/VCardUtil.java
@@ -16,9 +16,9 @@ private VCardUtil() {
         // You shall not pass
     }
 
-    public static Uri getVCardContentUri(@NonNull Context context) throws NoSuchElementException {
+    public static Uri getVCardContentUri(@NonNull Context context, @NonNull Uri contactUri) throws NoSuchElementException {
         final ContentResolver cr = context.getContentResolver();
-        try (final Cursor cursor = cr.query(ContactsContract.Contacts.CONTENT_URI, null, null, null, null)) {
+        try (final Cursor cursor = cr.query(contactUri, null, null, null, null)) {
             if (cursor.moveToFirst()) {
                 final String lookupKey = cursor.getString(cursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY));
                 return Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_VCARD_URI, lookupKey);