IntenseFinance/simplex-chat
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: replaced function that requires higher API (#3324)

Browse Source
This commit is contained in:
Stanislav Dmitrenko 2023-11-08 06:58:19 +08:00 committed by GitHub
parent 2dc621a56c
commit e3938f6fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Utils.kt
View File

@ -137,7 +137,7 @@ fun saveAnimImage(uri: URI, encrypted: Boolean): CryptoFile? {
val destFileName = generateNewFileName("IMG", ext) val destFileName = generateNewFileName("IMG", ext)
val destFile = File(getAppFilePath(destFileName)) val destFile = File(getAppFilePath(destFileName))
if (encrypted) { if (encrypted) {
val args = writeCryptoFile(destFile.absolutePath, uri.inputStream()?.readAllBytes() ?: return null) val args = writeCryptoFile(destFile.absolutePath, uri.inputStream()?.readBytes() ?: return null)
CryptoFile(destFileName, args) CryptoFile(destFileName, args)
} else { } else {
Files.copy(uri.inputStream(), destFile.toPath()) Files.copy(uri.inputStream(), destFile.toPath())

3
apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/Images.desktop.kt
View File

@ -170,9 +170,8 @@ actual fun isAnimImage(uri: URI, drawable: Any?): Boolean {
return path.endsWith(".gif") || path.endsWith(".webp") return path.endsWith(".gif") || path.endsWith(".webp")
} }
@Suppress("NewApi")
actual fun loadImageBitmap(inputStream: InputStream): ImageBitmap = actual fun loadImageBitmap(inputStream: InputStream): ImageBitmap =
Image.makeFromEncoded(inputStream.readAllBytes()).toComposeImageBitmap() Image.makeFromEncoded(inputStream.readBytes()).toComposeImageBitmap()
// https://stackoverflow.com/a/68926993 // https://stackoverflow.com/a/68926993
fun BufferedImage.rotate(angle: Double): BufferedImage { fun BufferedImage.rotate(angle: Double): BufferedImage {

3
apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/call/CallView.desktop.kt
View File

@ -189,12 +189,11 @@ fun startServer(onResponse: (WVAPIMessage) -> Unit): NanoWSD {
val server = object: NanoWSD(SERVER_HOST, SERVER_PORT) { val server = object: NanoWSD(SERVER_HOST, SERVER_PORT) {
override fun openWebSocket(session: IHTTPSession): WebSocket = MyWebSocket(onResponse, session) override fun openWebSocket(session: IHTTPSession): WebSocket = MyWebSocket(onResponse, session)
@Suppress("NewApi")
fun resourcesToResponse(path: String): Response { fun resourcesToResponse(path: String): Response {
val uri = Class.forName("chat.simplex.common.AppKt").getResource("/assets/www$path") ?: return resourceNotFound val uri = Class.forName("chat.simplex.common.AppKt").getResource("/assets/www$path") ?: return resourceNotFound
val response = newFixedLengthResponse( val response = newFixedLengthResponse(
Status.OK, getMimeTypeForFile(uri.file), Status.OK, getMimeTypeForFile(uri.file),
uri.openStream().readAllBytes() uri.openStream().readBytes()
) )
response.setKeepAlive(true) response.setKeepAlive(true)
response.setUseGzip(true) response.setUseGzip(true)