highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-06-16 03:30:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #657 from greenart7c3/nip-98

Browse Source 
fix crash when uploading images/videos using external signer
This commit is contained in:
Vitor Pamplona 2023-10-23 15:05:43 -04:00 committed by GitHub
commit a2f0c7f548
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt
View File

@ -322,28 +322,30 @@ open class NewPostViewModel() : ViewModel() {
createNIP95Record(it.readBytes(), contentType, alt, sensitiveContent, relayList = relayList) createNIP95Record(it.readBytes(), contentType, alt, sensitiveContent, relayList = relayList)
} }
} else { } else {
ImageUploader.uploadImage( viewModelScope.launch(Dispatchers.IO) {
uri = fileUri, ImageUploader.uploadImage(
contentType = contentType, uri = fileUri,
size = size, contentType = contentType,
server = server, size = size,
contentResolver = contentResolver, server = server,
onSuccess = { imageUrl, mimeType -> contentResolver = contentResolver,
if (isNIP94Server(server)) { onSuccess = { imageUrl, mimeType ->
createNIP94Record(imageUrl, mimeType, alt, sensitiveContent) if (isNIP94Server(server)) {
} else { createNIP94Record(imageUrl, mimeType, alt, sensitiveContent)
} else {
isUploadingImage = false
message = TextFieldValue(message.text + "\n\n" + imageUrl)
urlPreview = findUrlInMessage()
}
},
onError = {
isUploadingImage = false isUploadingImage = false
message = TextFieldValue(message.text + "\n\n" + imageUrl) viewModelScope.launch {
urlPreview = findUrlInMessage() imageUploadingError.emit("Failed to upload the image / video")
}
} }
}, )
onError = { }
isUploadingImage = false
viewModelScope.launch {
imageUploadingError.emit("Failed to upload the image / video")
}
}
)
} }
}, },
onError = { onError = {