Merge pull request #17355 from Hoossayn/issue/17010_Detekt_Resolve_Suppress_All_Baseline_Warnings_long_method_media_picker

Detekt - Resolve/Suppress All Baseline Warnings - Long methods warnings_ MediaPickerActivity

Author: ParaskP7

WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt

@@ -173,7 +173,7 @@ class MediaPickerActivity : LocaleAwareActivity(), MediaPickerListener {
         return super.onOptionsItemSelected(item)
     }
 
-    @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION", "LongMethod", "NestedBlockDepth")
+    @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
     override fun onActivityResult(
         requestCode: Int,
         resultCode: Int,
@@ -191,55 +191,54 @@ class MediaPickerActivity : LocaleAwareActivity(), MediaPickerListener {
                     return
                 }
             }
-            TAKE_PHOTO -> {
-                try {
-                    val intent = Intent()
-                    mediaCapturePath!!.let {
-                        WPMediaUtils.scanMediaFile(this, it)
-                        val f = File(it)
-                        val capturedImageUri = listOf(Uri.fromFile(f))
-                        if (mediaPickerSetup.queueResults) {
-                            intent.putQueuedUris(capturedImageUri)
-                        } else {
-                            intent.putUris(capturedImageUri)
-                        }
-                        intent.putExtra(
-                                EXTRA_MEDIA_SOURCE,
-                                ANDROID_CAMERA.name
-                        )
-                    }
-                    intent
-                } catch (e: RuntimeException) {
-                    AppLog.e(MEDIA, e)
-                    null
-                }
-            }
-            IMAGE_EDITOR_EDIT_IMAGE -> {
-                data?.let {
-                    val intent = Intent()
-                    val uris = WPMediaUtils.retrieveImageEditorResult(data)
-                    if (mediaPickerSetup.queueResults) {
-                        intent.putQueuedUris(uris)
-                    } else {
-                        intent.putUris(uris)
-                    }
-                    intent.putExtra(
-                            EXTRA_MEDIA_SOURCE,
-                            APP_PICKER.name
-                    )
-                    intent
-                }
-            }
-            else -> {
-                data
-            }
+            TAKE_PHOTO -> takeAPhoto()
+            IMAGE_EDITOR_EDIT_IMAGE -> data?.let { editImageIntent(it) }
+            else -> data
         }
+
         intent?.let {
             setResult(Activity.RESULT_OK, intent)
             finish()
         }
     }
 
+    private fun editImageIntent(data: Intent?): Intent {
+        val intent = Intent()
+        val uris = WPMediaUtils.retrieveImageEditorResult(data)
+        if (mediaPickerSetup.queueResults) {
+            intent.putQueuedUris(uris)
+        } else {
+            intent.putUris(uris)
+        }
+        intent.putExtra(
+                EXTRA_MEDIA_SOURCE,
+                APP_PICKER.name
+        )
+        return intent
+    }
+
+    private fun takeAPhoto() = try {
+        val intent = Intent()
+        mediaCapturePath!!.let {
+            WPMediaUtils.scanMediaFile(this, it)
+            val f = File(it)
+            val capturedImageUri = listOf(Uri.fromFile(f))
+            if (mediaPickerSetup.queueResults) {
+                intent.putQueuedUris(capturedImageUri)
+            } else {
+                intent.putUris(capturedImageUri)
+            }
+            intent.putExtra(
+                    EXTRA_MEDIA_SOURCE,
+                    ANDROID_CAMERA.name
+            )
+        }
+        intent
+    } catch (e: RuntimeException) {
+        AppLog.e(MEDIA, e)
+        null
+    }
+
     private fun launchChooserWithContext(openSystemPicker: OpenSystemPicker, uiHelpers: UiHelpers) {
         WPMediaUtils.launchChooserWithContext(this, openSystemPicker, uiHelpers, MEDIA_LIBRARY)
     }