diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a294c6841ff4..c77b52ccf66f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ### 🛠 Breaking changes +- The base64 output will no longer contain newline and special character (`\n`, `\r`) on Android. ([#7841](https://github.com/expo/expo/pull/7841) by [@jarvisluong](https://github.com/jarvisluong)) + ### 🎉 New features ### 🐛 Bug fixes diff --git a/android/src/main/java/expo/modules/camera/tasks/ResolveTakenPictureAsyncTask.java b/android/src/main/java/expo/modules/camera/tasks/ResolveTakenPictureAsyncTask.java index bc447b0416f69..284c7848620e2 100644 --- a/android/src/main/java/expo/modules/camera/tasks/ResolveTakenPictureAsyncTask.java +++ b/android/src/main/java/expo/modules/camera/tasks/ResolveTakenPictureAsyncTask.java @@ -135,7 +135,7 @@ protected Bundle doInBackground(Void... voids) { // Write base64-encoded image to the response if requested if (isOptionEnabled(BASE64_KEY)) { - response.putString(BASE64_KEY, Base64.encodeToString(imageStream.toByteArray(), Base64.DEFAULT)); + response.putString(BASE64_KEY, Base64.encodeToString(imageStream.toByteArray(), Base64.NO_WRAP)); } // Cleanup @@ -197,7 +197,7 @@ private Bundle handleSkipProcessing() { // handle base64 if (isOptionEnabled(BASE64_KEY)) { - response.putString(BASE64_KEY, Base64.encodeToString(mImageData, Base64.DEFAULT)); + response.putString(BASE64_KEY, Base64.encodeToString(mImageData, Base64.NO_WRAP)); } return response;