From 635ca33faeb945622b4d6afe32eaa47a0decbd26 Mon Sep 17 00:00:00 2001 From: Alexandre Jacinto Date: Thu, 19 Mar 2026 15:02:37 -0400 Subject: [PATCH 1/2] refactor: remove unnecessary code --- .../processor/IONCAMRMediaProcessor.kt | 76 ++++++------------- 1 file changed, 22 insertions(+), 54 deletions(-) diff --git a/src/main/kotlin/io/ionic/libs/ioncameralib/processor/IONCAMRMediaProcessor.kt b/src/main/kotlin/io/ionic/libs/ioncameralib/processor/IONCAMRMediaProcessor.kt index 3c35718..ba298a9 100644 --- a/src/main/kotlin/io/ionic/libs/ioncameralib/processor/IONCAMRMediaProcessor.kt +++ b/src/main/kotlin/io/ionic/libs/ioncameralib/processor/IONCAMRMediaProcessor.kt @@ -198,64 +198,32 @@ class IONCAMRMediaProcessor( onMediaResult: (IONCAMRMediaResult) -> Unit, onError: (IONCAMRError) -> Unit ) { - var bitmap: Bitmap? - if (camParameters.latestVersion) { - - val mediaResult = - sourcePath?.let { - val imageUri = fileHelper.getUriForFile( - activity, - authority, - File(sourcePath) - ) - if (imageUri == null) { - onError(IONCAMRError.TAKE_PHOTO_ERROR) - return - } - createImageMediaResult( - activity, - it, - imageUri, - camParameters.includeMetadata, - camParameters, - savedSuccessfully - ) - } - - if (mediaResult == null) { - onError(IONCAMRError.TAKE_PHOTO_ERROR) - return - } - onMediaResult(mediaResult) - } else { - //get bitmap - bitmap = sourcePath?.let { getScaledAndRotatedBitmap(activity, it, camParameters) } - if (bitmap == null) { - // Try to get the bitmap from intent. - if (intent != null) { - try { - // getExtras can throw different exceptions - val extras = intent.extras - if (extras != null) { - bitmap = extras["data"] as Bitmap? - } - } catch (e: Exception) { - // Don't let the exception bubble up, bitmap will be null (check below) - } + val mediaResult = + sourcePath?.let { + val imageUri = fileHelper.getUriForFile( + activity, + authority, + File(sourcePath) + ) + if (imageUri == null) { + onError(IONCAMRError.TAKE_PHOTO_ERROR) + return } + createImageMediaResult( + activity, + it, + imageUri, + camParameters.includeMetadata, + camParameters, + savedSuccessfully + ) } - //get base64 representation of bitmap - imageHelper.processPicture( - bitmap, camParameters.encodingType, camParameters.mQuality, - { - onImage(it) - }, - { - onError(it) - } - ) + if (mediaResult == null) { + onError(IONCAMRError.TAKE_PHOTO_ERROR) + return } + onMediaResult(mediaResult) } fun processEditedImage( From e333a191b0d7628bdb8f72e9b6570c19d1308153 Mon Sep 17 00:00:00 2001 From: Rui Mendes Date: Fri, 20 Mar 2026 12:18:11 +0000 Subject: [PATCH 2/2] added TODO --- .../ionic/libs/ioncameralib/processor/IONCAMRMediaProcessor.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/io/ionic/libs/ioncameralib/processor/IONCAMRMediaProcessor.kt b/src/main/kotlin/io/ionic/libs/ioncameralib/processor/IONCAMRMediaProcessor.kt index ba298a9..05f29b3 100644 --- a/src/main/kotlin/io/ionic/libs/ioncameralib/processor/IONCAMRMediaProcessor.kt +++ b/src/main/kotlin/io/ionic/libs/ioncameralib/processor/IONCAMRMediaProcessor.kt @@ -287,7 +287,7 @@ class IONCAMRMediaProcessor( videoPath, base64Thumbnail, metadata, - false //For Gallery keep this false + false //TODO For Gallery keep this false ) }