refactor: Bitmap -> byteArray -> Bitmap 저장을, Bitmap -> ByteArray로 변경 (#46 (comment))

Author: Choe-Ji-Hwan

data/src/main/java/com/wakeup/data/database/entity/MomentPictureXRef.kt

@@ -27,5 +27,4 @@ import androidx.room.ForeignKey
 data class MomentPictureXRef(
     @ColumnInfo(name = "moment_id", index = true) val momentId: Long,
     @ColumnInfo(name = "picture_id", index = true) val pictureId: Long,
-)
-// PR 리뷰 남기고 -> 사진
+)

data/src/main/java/com/wakeup/data/util/InternalFileUtil.kt

@@ -11,9 +11,7 @@ import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.io.ByteArrayOutputStream
 import java.io.File
-import java.io.FileNotFoundException
 import java.io.FileOutputStream
-import java.io.IOException
 import java.security.DigestException
 import java.security.MessageDigest
 import javax.inject.Inject
@@ -27,23 +25,24 @@ class InternalFileUtil @Inject constructor(
         return withContext(dispatcher) {
             val pictureFiles = mutableListOf<String>()
             pictures.forEach { picture ->
-                println(picture)
                 val fileName = hashSHA256(encodeBase64(picture.bitmap))
                 val tempFile = File(context.filesDir, fileName)
 
-                try {
+                runCatching {
                     tempFile.createNewFile()
-                    val out = FileOutputStream(tempFile)
-                    val convertedBitmap =
-                        BitmapFactory.decodeByteArray(picture.bitmap, 0, picture.bitmap.size)
-                    convertedBitmap.compress(Bitmap.CompressFormat.PNG, 100, out)
-                    out.close()
-                } catch (e: FileNotFoundException) {
+                }.onFailure { e ->
                     Timber.e("MyTag", "FileNotFoundException : " + e.message)
-                } catch (e: IOException) {
-                    Timber.e("MyTag", "IOException : " + e.message)
+                }.onSuccess {
+                    runCatching {
+                        val out = FileOutputStream(tempFile)
+                        out.write(picture.bitmap)
+                        out.close()
+                    }.onFailure { e ->
+                        Timber.e("MyTag", "IOException : " + e.message)
+                    }.onSuccess {
+                        pictureFiles.add(fileName)
+                    }
                 }
-                pictureFiles.add(fileName)
             }
             pictureFiles.map { PictureEntity(fileName = it) }
         }
@@ -53,17 +52,18 @@ class InternalFileUtil @Inject constructor(
         return withContext(dispatcher) {
             val pictureBitmaps = mutableListOf<ByteArray>()
 
-            val files: Array<String> = context.fileList()
             pictures.forEach { pictureFileName ->
-                files.forEach { savedFileName ->
-                    Timber.d("MyTag", savedFileName)
-                    println(savedFileName)
-                    println(pictureFileName.fileName)
-                    if (savedFileName == pictureFileName.fileName) {
-                        val bitmapPicture =
-                            BitmapFactory.decodeFile("${context.filesDir}/${savedFileName}")
-                        val stream = ByteArrayOutputStream()
-                        bitmapPicture.compress(Bitmap.CompressFormat.PNG, 1, stream)
+                runCatching {
+                    BitmapFactory.decodeFile("${context.filesDir}/${pictureFileName.fileName}")
+                }.onFailure { e ->
+                    Timber.e("MyTag", "FileNotFoundException : " + e.message)
+                }.onSuccess { bitmapPicture ->
+                    runCatching {
+                        ByteArrayOutputStream()
+                    }.onFailure { e ->
+                        Timber.e("MyTag", "IOException : " + e.message)
+                    }.onSuccess { stream ->
+                        bitmapPicture.compress(Bitmap.CompressFormat.JPEG, 1, stream)
                         pictureBitmaps.add(stream.toByteArray())
                     }
                 }
@@ -82,22 +82,25 @@ class InternalFileUtil @Inject constructor(
             val md = MessageDigest.getInstance("SHA-256")
             md.update(msg.toByteArray())
             hash = md.digest()
-        } catch (e: CloneNotSupportedException){
+        } catch (e: CloneNotSupportedException) {
             throw DigestException("couldn't make digest of patial content")
         }
         return bytesToHex(hash)
     }
 
-    private val digits = "0123456789ABCDEF"
+    private fun bytesToHex(byteArray: ByteArray): String {
 
-    fun bytesToHex(byteArray: ByteArray): String {
         val hexChars = CharArray(byteArray.size * 2)
         for (i in byteArray.indices) {
             val v = byteArray[i].toInt() and 0xff
-            hexChars[i * 2] = digits[v shr 4]
-            hexChars[i * 2 + 1] = digits[v and 0xf]
+            hexChars[i * 2] = DIGITS[v shr 4]
+            hexChars[i * 2 + 1] = DIGITS[v and 0xf]
         }
         return String(hexChars)
     }
+
+    companion object {
+        private const val DIGITS = "0123456789ABCDEF"
+    }
 }
 

presentation/src/main/java/com/wakeup/presentation/mapper/PictureModelMapper.kt

@@ -8,8 +8,7 @@ import java.io.ByteArrayOutputStream
 
 fun PictureModel.toDomain(): Picture {
     val stream = ByteArrayOutputStream()
-    bitmap.compress(Bitmap.CompressFormat.PNG, 1, stream)
-    println(stream.toByteArray())
+    bitmap.compress(Bitmap.CompressFormat.JPEG, 1, stream)
     return Picture(stream.toByteArray())
 }