Fixed adding photos on some Android versions/variants

5 years ago · ee62bce462
parent a80c3a953f
commit ee62bce462
1 changed files with 7 additions and 2 deletions
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@ -1589,13 +1589,18 @@ public class FragmentCompose extends FragmentBase {
                        onAddImage(data.getBundleExtra("args").getBoolean("photo"));
                    break;
                case REQUEST_IMAGE_FILE:
-                case REQUEST_TAKE_PHOTO:
                    if (resultCode == RESULT_OK && data != null) {
-                        Uri uri = (requestCode == REQUEST_TAKE_PHOTO ? photoURI : data.getData());
+                        Uri uri = data.getData();
                        if (uri != null)
                            onAddImageFile(uri);
                    }
                    break;
+                case REQUEST_TAKE_PHOTO:
+                    if (resultCode == RESULT_OK) {
+                        if (photoURI != null)
+                            onAddImageFile(photoURI);
+                    }
+                    break;
                case REQUEST_ATTACHMENT:
                case REQUEST_RECORD_AUDIO:
                    if (resultCode == RESULT_OK && data != null)