devol
/
smalltalk-matrix
mirror of https://github.com/ouchadam/small-talk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add support for unencrypted images

This commit is contained in:
Adam Brown 2022-04-25 11:25:11 +01:00
parent e1411ed115
commit 05a41c7ddf
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
features/messenger/src/main/kotlin/app/dapk/st/messenger/DecryptingFetcher.kt
View File

@ -11,6 +11,7 @@ import coil.fetch.SourceResult
import coil.size.Size
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.Response
import okio.Buffer
import java.security.MessageDigest
import javax.crypto.Cipher
@ -28,9 +29,15 @@ class DecryptingFetcher : Fetcher<RoomEvent.Image> {
override suspend fun fetch(pool: BitmapPool, data: RoomEvent.Image, size: Size, options: Options): FetchResult {
val response = http.newCall(Request.Builder().url(data.imageMeta.url).build()).execute()
val outputStream = Buffer()
val outputStream = when {
data.imageMeta.keys != null -> handleEncrypted(response, data.imageMeta.keys!!)
else -> response.body()?.source() ?: throw IllegalArgumentException("No bitmap response found")
}
val keys = data.imageMeta.keys!!
return SourceResult(outputStream, null, DataSource.NETWORK)
}
private fun handleEncrypted(response: Response, keys: RoomEvent.Image.ImageMeta.Keys): Buffer {
val key = Base64.decode(keys.k.replace('-', '+').replace('_', '/'), Base64.DEFAULT)
val initVectorBytes = Base64.decode(keys.iv, Base64.DEFAULT)
@ -45,6 +52,7 @@ class DecryptingFetcher : Fetcher<RoomEvent.Image> {
val d = ByteArray(CRYPTO_BUFFER_SIZE)
var decodedBytes: ByteArray
val outputStream = Buffer()
response.body()?.let {
it.byteStream().use {
read = it.read(d)
@ -56,7 +64,7 @@ class DecryptingFetcher : Fetcher<RoomEvent.Image> {
}
}
}
return SourceResult(outputStream, null, DataSource.NETWORK)
return outputStream
}
override fun key(data: RoomEvent.Image) = data.imageMeta.url

4
features/messenger/src/main/kotlin/app/dapk/st/messenger/MessengerScreen.kt
View File

@ -212,6 +212,8 @@ private fun <T : RoomEvent> LazyItemScope.AlignedBubble(
}
}
private val decryptingFetcher = DecryptingFetcher()
@Composable
private fun MessageImage(content: BubbleContent<RoomEvent.Image>) {
Box(modifier = Modifier.padding(start = 6.dp)) {
@ -242,7 +244,7 @@ private fun MessageImage(content: BubbleContent<RoomEvent.Image>) {
modifier = Modifier.size(content.message.imageMeta.scaleMeta(LocalDensity.current, LocalConfiguration.current)),
painter = rememberImagePainter(
data = content.message,
builder = { fetcher(DecryptingFetcher()) }
builder = { fetcher(decryptingFetcher) }
),
contentDescription = null,
)