From d0eadcf30d38f3006bcda41812a23a5937b8ad1e Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Mon, 8 May 2023 09:39:54 -0400 Subject: [PATCH] Formatting --- .../java/com/vitorpamplona/amethyst/service/FileHeader.kt | 5 ++--- .../vitorpamplona/amethyst/ui/actions/ImageDownloader.kt | 2 +- .../vitorpamplona/amethyst/ui/actions/NewMediaModel.kt | 4 ---- .../com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt | 8 ++++---- .../vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt | 1 - 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt index 81a09ec10..dbd5ec342 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt @@ -6,7 +6,6 @@ import android.util.Log import com.vitorpamplona.amethyst.model.toHexKey import com.vitorpamplona.amethyst.ui.actions.ImageDownloader import io.trbl.blurhash.BlurHash -import java.net.URL import java.security.MessageDigest import kotlin.math.roundToInt @@ -24,9 +23,9 @@ class FileHeader( try { val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl) - if (imageData != null) + if (imageData != null) { prepare(imageData, fileUrl, mimeType, description, onReady, onError) - else { + } else { onError() } } catch (e: Exception) { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageDownloader.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageDownloader.kt index c2bd13abf..7e2657522 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageDownloader.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageDownloader.kt @@ -44,4 +44,4 @@ class ImageDownloader { return imageData } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt index 5ee0705fa..e8a6398ec 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt @@ -11,12 +11,8 @@ import androidx.lifecycle.viewModelScope import com.vitorpamplona.amethyst.model.* import com.vitorpamplona.amethyst.service.FileHeader import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.launch -import java.net.HttpURLConnection -import java.net.URL - open class NewMediaModel : ViewModel() { var account: Account? = null diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt index 0d3c4ae74..955e0a4fc 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt @@ -110,10 +110,10 @@ fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, ac } fun isNIP94Server(selectedServer: ServersAvailable?): Boolean { - return selectedServer == ServersAvailable.NOSTRIMG_NIP_94 - || selectedServer == ServersAvailable.IMGUR_NIP_94 - || selectedServer == ServersAvailable.NOSTR_BUILD_NIP_94 - || selectedServer == ServersAvailable.NOSTRFILES_DEV_NIP_94 + return selectedServer == ServersAvailable.NOSTRIMG_NIP_94 || + selectedServer == ServersAvailable.IMGUR_NIP_94 || + selectedServer == ServersAvailable.NOSTR_BUILD_NIP_94 || + selectedServer == ServersAvailable.NOSTRFILES_DEV_NIP_94 } @Composable diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt index 8899b7beb..4b12675d4 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt @@ -19,7 +19,6 @@ import com.vitorpamplona.amethyst.service.model.TextNoteEvent import com.vitorpamplona.amethyst.ui.components.isValidURL import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.launch