diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
index ffa83b608a..d17ac9d223 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
@@ -196,32 +196,38 @@ class AttachmentsHelper(val context: Context, val callback: Callback) : Restorab
      */
     fun handleShareIntent(context: Context, intent: Intent): Boolean {
         val type = intent.resolveType(context) ?: return false
-        if (type.startsWith("image")) {
-            callback.onContentAttachmentsReady(
-                    MultiPicker.get(MultiPicker.IMAGE).getIncomingFiles(context, intent).map {
-                        it.toContentAttachmentData()
-                    }
-            )
-        } else if (type.startsWith("video")) {
-            callback.onContentAttachmentsReady(
-                    MultiPicker.get(MultiPicker.VIDEO).getIncomingFiles(context, intent).map {
-                        it.toContentAttachmentData()
-                    }
-            )
-        } else if (type.startsWith("audio")) {
-            callback.onContentAttachmentsReady(
-                    MultiPicker.get(MultiPicker.AUDIO).getIncomingFiles(context, intent).map {
-                        it.toContentAttachmentData()
-                    }
-            )
-        } else if (type.startsWith("application") || type.startsWith("file") || type.startsWith("text") || type.startsWith("*")) {
-            callback.onContentAttachmentsReady(
-                    MultiPicker.get(MultiPicker.FILE).getIncomingFiles(context, intent).map {
-                        it.toContentAttachmentData()
-                    }
-            )
-        } else {
-            return false
+        when {
+            type.startsWith("image") -> {
+                callback.onContentAttachmentsReady(
+                        MultiPicker.get(MultiPicker.IMAGE).getIncomingFiles(context, intent).map {
+                            it.toContentAttachmentData()
+                        }
+                )
+            }
+            type.startsWith("video") -> {
+                callback.onContentAttachmentsReady(
+                        MultiPicker.get(MultiPicker.VIDEO).getIncomingFiles(context, intent).map {
+                            it.toContentAttachmentData()
+                        }
+                )
+            }
+            type.startsWith("audio") -> {
+                callback.onContentAttachmentsReady(
+                        MultiPicker.get(MultiPicker.AUDIO).getIncomingFiles(context, intent).map {
+                            it.toContentAttachmentData()
+                        }
+                )
+            }
+            type.startsWith("application") || type.startsWith("file") || type.startsWith("text") || type.startsWith("*") -> {
+                callback.onContentAttachmentsReady(
+                        MultiPicker.get(MultiPicker.FILE).getIncomingFiles(context, intent).map {
+                            it.toContentAttachmentData()
+                        }
+                )
+            }
+            else -> {
+                return false
+            }
         }
         return true
     }