From f5cbb2e674469ecbef05ca170a8a476b3426ae35 Mon Sep 17 00:00:00 2001
From: hoossayn <abdulhakeemhusseni@gmail.com>
Date: Wed, 19 Oct 2022 14:56:58 +0100
Subject: [PATCH 1/2] Refactor: Extract take a photo method for media picker
 activity

---
 .../ui/mediapicker/MediaPickerActivity.kt     | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt
index 23c892c08ddb..5abf490d45a4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt
@@ -191,29 +191,8 @@ 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
-                }
-            }
+            TAKE_PHOTO -> takeAPhoto()
+
             IMAGE_EDITOR_EDIT_IMAGE -> {
                 data?.let {
                     val intent = Intent()
@@ -240,6 +219,28 @@ class MediaPickerActivity : LocaleAwareActivity(), MediaPickerListener {
         }
     }
 
+    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)
     }

From 8594712f9710898997127be06ed249acfb4fb645 Mon Sep 17 00:00:00 2001
From: hoossayn <abdulhakeemhusseni@gmail.com>
Date: Wed, 19 Oct 2022 15:04:16 +0100
Subject: [PATCH 2/2] Refactor: Extract edit image intent method for media
 picker activity

---
 .../ui/mediapicker/MediaPickerActivity.kt     | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt
index 5abf490d45a4..ee6463db68b8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt
+++ b/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,
@@ -192,33 +192,31 @@ class MediaPickerActivity : LocaleAwareActivity(), MediaPickerListener {
                 }
             }
             TAKE_PHOTO -> takeAPhoto()
-
-            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
-            }
+            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 {