Debug

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -1424,7 +1424,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       case AttachmentTypeSelector.ADD_SOUND:
         AttachmentManager.selectAudio(this, PICK_AUDIO); break;
       case AttachmentTypeSelector.ADD_CONTACT_INFO:
-        AttachmentManager.selectContactInfo(this, PICK_CONTACT); break;
+        break;
       case AttachmentTypeSelector.ADD_LOCATION:
         break;
       case AttachmentTypeSelector.TAKE_PHOTO:

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -717,7 +717,6 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
         super.onActivityResult(requestCode, resultCode, intent)
-        intent ?: return
         val mediaPreppedListener = object : ListenableFuture.Listener<Boolean> {
 
             override fun onSuccess(result: Boolean?) {
@@ -730,7 +729,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         }
         when (requestCode) {
             PICK_DOCUMENT -> {
-                val uri = intent.data ?: return
+                val uri = intent?.data ?: return
                 prepMediaForSending(uri, AttachmentManager.MediaType.DOCUMENT).addListener(mediaPreppedListener)
             }
             TAKE_PHOTO -> {
@@ -738,6 +737,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                 prepMediaForSending(uri, AttachmentManager.MediaType.IMAGE).addListener(mediaPreppedListener)
             }
             PICK_GIF -> {
+                intent ?: return
                 val uri = intent.data ?: return
                 val type = AttachmentManager.MediaType.GIF
                 val width = intent.getIntExtra(GiphyActivity.EXTRA_WIDTH, 0)
@@ -745,6 +745,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                 prepMediaForSending(uri, type, width, height).addListener(mediaPreppedListener)
             }
             PICK_FROM_LIBRARY -> {
+                intent ?: return
                 val body = intent.getStringExtra(MediaSendActivity.EXTRA_MESSAGE)
                 val media = intent.getParcelableArrayListExtra<Media>(MediaSendActivity.EXTRA_MEDIA) ?: return
                 val slideDeck = SlideDeck()

app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java

@@ -256,27 +256,16 @@ public class AttachmentManager {
 
   public static void selectGallery(Activity activity, int requestCode, @NonNull Recipient recipient, @NonNull String body) {
     Permissions.with(activity)
-               .request(Manifest.permission.READ_EXTERNAL_STORAGE)
+        .request(Manifest.permission.READ_EXTERNAL_STORAGE)
-               .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio))
+        .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio))
-               .onAllGranted(() -> activity.startActivityForResult(MediaSendActivity.buildGalleryIntent(activity, recipient, body), requestCode))
+        .onAllGranted(() -> activity.startActivityForResult(MediaSendActivity.buildGalleryIntent(activity, recipient, body), requestCode))
-               .execute();
+        .execute();
   }
 
   public static void selectAudio(Activity activity, int requestCode) {
     selectMediaType(activity, "audio/*", null, requestCode);
   }
 
-  public static void selectContactInfo(Activity activity, int requestCode) {
-    Permissions.with(activity)
-               .request(Manifest.permission.WRITE_CONTACTS)
-               .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information))
-               .onAllGranted(() -> {
-                 Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.Contacts.CONTENT_URI);
-                 activity.startActivityForResult(intent, requestCode);
-               })
-               .execute();
-  }
-
   public static void selectGif(Activity activity, int requestCode) {
     Intent intent = new Intent(activity, GiphyActivity.class);
     intent.putExtra(GiphyActivity.EXTRA_IS_MMS, false);
@@ -293,28 +282,25 @@ public class AttachmentManager {
 
   public void capturePhoto(Activity activity, int requestCode) {
     Permissions.with(activity)
-            .request(Manifest.permission.CAMERA)
+        .request(Manifest.permission.CAMERA)
-            .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_camera_permission_in_order_to_take_photos_but_it_has_been_permanently_denied))
+        .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_camera_permission_in_order_to_take_photos_but_it_has_been_permanently_denied))
-            .onAllGranted(() -> {
+        .onAllGranted(() -> {
-              try {
+          try {
-                File captureFile = File.createTempFile(
+            File captureFile = File.createTempFile("conversation-capture", ".jpg", ExternalStorageUtil.getImageDir(activity));
-                        "conversation-capture",
+            Uri captureUri = FileProviderUtil.getUriFor(context, captureFile);
-                        ".jpg",
+            Intent captureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-                        ExternalStorageUtil.getImageDir(activity));
+            captureIntent.putExtra(EXTRA_OUTPUT, captureUri);
-                Uri captureUri = FileProviderUtil.getUriFor(context, captureFile);
+            captureIntent.setFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
-                Intent captureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+            if (captureIntent.resolveActivity(activity.getPackageManager()) != null) {
-                captureIntent.putExtra(EXTRA_OUTPUT, captureUri);
+              Log.d(TAG, "captureUri path is " + captureUri.getPath());
-                captureIntent.setFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+              this.captureUri = captureUri;
-                if (captureIntent.resolveActivity(activity.getPackageManager()) != null) {
+              activity.startActivityForResult(captureIntent, requestCode);
-                  Log.d(TAG, "captureUri path is " + captureUri.getPath());
+            }
-                  this.captureUri = captureUri;
+          } catch (IOException | NoExternalStorageException e) {
-                  activity.startActivityForResult(captureIntent, requestCode);
+            throw new RuntimeException("Error creating image capture intent.", e);
-                }
+          }
-              } catch (IOException | NoExternalStorageException e) {
+        })
-                throw new RuntimeException("Error creating image capture intent.", e);
+        .execute();
-              }
-            })
-            .execute();
   }
 
   private static void selectMediaType(Activity activity, @NonNull String type, @Nullable String[] extraMimeType, int requestCode) {
@@ -392,6 +378,5 @@ public class AttachmentManager {
 
       return DOCUMENT;
     }
-
   }
 }