diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt index 05abfd8e37..7b46d618fe 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt @@ -81,7 +81,6 @@ import com.vitorpamplona.amethyst.model.nip96FileStorage.FileStorageServerListSt import com.vitorpamplona.amethyst.model.nipB7Blossom.BlossomServerListState import com.vitorpamplona.amethyst.model.serverList.MergedFollowListsState import com.vitorpamplona.amethyst.model.serverList.MergedFollowPlusMineRelayListsState -import com.vitorpamplona.amethyst.model.serverList.MergedFollowPlusMineWithIndexAndSearchRelayListsState import com.vitorpamplona.amethyst.model.serverList.MergedFollowPlusMineWithIndexRelayListsState import com.vitorpamplona.amethyst.model.serverList.MergedFollowPlusMineWithSearchRelayListsState import com.vitorpamplona.amethyst.model.serverList.MergedServerListState @@ -315,7 +314,6 @@ class Account( val followOutboxesOrProxy = FollowListOutboxOrProxyRelays(kind3FollowList, blockedRelayList, proxyRelayList, cache, scope) val followPlusAllMineWithIndex = MergedFollowPlusMineWithIndexRelayListsState(followOutboxesOrProxy, nip65RelayList, privateStorageRelayList, localRelayList, indexerRelayList, scope) val followPlusAllMineWithSearch = MergedFollowPlusMineWithSearchRelayListsState(followOutboxesOrProxy, nip65RelayList, privateStorageRelayList, localRelayList, searchRelayList, scope) - val followPlusAllMineWithIndexAndSearch = MergedFollowPlusMineWithIndexAndSearchRelayListsState(followOutboxesOrProxy, nip65RelayList, privateStorageRelayList, localRelayList, indexerRelayList, searchRelayList, scope) val defaultGlobalRelays = MergedFollowPlusMineRelayListsState(followOutboxesOrProxy, nip65RelayList, privateStorageRelayList, localRelayList, scope) // keeps a cache of the outbox relays for each author diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/serverList/MergedFollowPlusMineWithIndexAndSearchRelayListsState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/serverList/MergedFollowPlusMineWithIndexAndSearchRelayListsState.kt deleted file mode 100644 index 68956135bb..0000000000 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/serverList/MergedFollowPlusMineWithIndexAndSearchRelayListsState.kt +++ /dev/null @@ -1,92 +0,0 @@ -/** - * Copyright (c) 2025 Vitor Pamplona - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the - * Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -package com.vitorpamplona.amethyst.model.serverList - -import com.vitorpamplona.amethyst.model.edits.PrivateStorageRelayListState -import com.vitorpamplona.amethyst.model.localRelays.LocalRelayListState -import com.vitorpamplona.amethyst.model.nip02FollowLists.FollowListOutboxOrProxyRelays -import com.vitorpamplona.amethyst.model.nip51Lists.indexerRelays.IndexerRelayListState -import com.vitorpamplona.amethyst.model.nip51Lists.searchRelays.SearchRelayListState -import com.vitorpamplona.amethyst.model.nip65RelayList.Nip65RelayListState -import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.SharingStarted -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.combine -import kotlinx.coroutines.flow.flowOn -import kotlinx.coroutines.flow.onStart -import kotlinx.coroutines.flow.stateIn - -class MergedFollowPlusMineWithIndexAndSearchRelayListsState( - val followsOutboxOrProxyRelayList: FollowListOutboxOrProxyRelays, - val nip65RelayList: Nip65RelayListState, - val privateOutboxRelayList: PrivateStorageRelayListState, - val localRelayList: LocalRelayListState, - val indexerRelayList: IndexerRelayListState, - val searchRelayListsState: SearchRelayListState, - val scope: CoroutineScope, -) { - fun mergeLists(lists: Array>): Set = lists.reduce { acc, set -> acc + set } - - val flow: StateFlow> = - combine( - listOf( - followsOutboxOrProxyRelayList.flow, - nip65RelayList.outboxFlow, - nip65RelayList.inboxFlow, - privateOutboxRelayList.flow, - localRelayList.flow, - indexerRelayList.flow, - searchRelayListsState.flow, - ), - ::mergeLists, - ).onStart { - emit( - mergeLists( - arrayOf( - followsOutboxOrProxyRelayList.flow.value, - nip65RelayList.outboxFlow.value, - nip65RelayList.inboxFlow.value, - privateOutboxRelayList.flow.value, - localRelayList.flow.value, - indexerRelayList.flow.value, - searchRelayListsState.flow.value, - ), - ), - ) - }.flowOn(Dispatchers.Default) - .stateIn( - scope, - SharingStarted.Eagerly, - mergeLists( - arrayOf( - followsOutboxOrProxyRelayList.flow.value, - nip65RelayList.outboxFlow.value, - nip65RelayList.inboxFlow.value, - privateOutboxRelayList.flow.value, - localRelayList.flow.value, - indexerRelayList.flow.value, - searchRelayListsState.flow.value, - ), - ), - ) -} diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpClientFactory.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpClientFactory.kt index 8e6e1267e0..43c70ef1bf 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpClientFactory.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpClientFactory.kt @@ -61,7 +61,8 @@ class OkHttpClientFactory( val myDispatcher = Dispatcher().apply { if (!isEmulator()) { - maxRequests = 512 + maxRequestsPerHost = 10 + maxRequests = 1024 } else { Log.i("OkHttpClientFactory", "Emulator detected, using default maxRequests: 64.") } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpDebugLogging.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpDebugLogging.kt new file mode 100644 index 0000000000..79bb1abeb2 --- /dev/null +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpDebugLogging.kt @@ -0,0 +1,67 @@ +/** + * Copyright (c) 2025 Vitor Pamplona + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the + * Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +package com.vitorpamplona.amethyst.service.okhttp + +import okhttp3.internal.concurrent.TaskRunner +import okhttp3.internal.http2.Http2 +import java.io.Closeable +import java.util.concurrent.CopyOnWriteArraySet +import java.util.logging.ConsoleHandler +import java.util.logging.Handler +import java.util.logging.Level +import java.util.logging.LogRecord +import java.util.logging.Logger +import java.util.logging.SimpleFormatter +import kotlin.reflect.KClass + +object OkHttpDebugLogging { + // Keep references to loggers to prevent their configuration from being GC'd. + private val configuredLoggers = CopyOnWriteArraySet() + + fun enableHttp2() = enable(Http2::class) + + fun enableTaskRunner() = enable(TaskRunner::class) + + fun logHandler() = + ConsoleHandler().apply { + level = Level.FINE + formatter = + object : SimpleFormatter() { + override fun format(record: LogRecord) = String.format("[%1\$tF %1\$tT] %2\$s %n", record.millis, record.message) + } + } + + fun enable( + loggerClass: String, + handler: Handler = logHandler(), + ): Closeable { + val logger = Logger.getLogger(loggerClass) + if (configuredLoggers.add(logger)) { + logger.addHandler(handler) + logger.level = Level.FINEST + } + return Closeable { + logger.removeHandler(handler) + } + } + + fun enable(loggerClass: KClass<*>) = enable(loggerClass.java.name) +} diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/eoseManagers/BaseEoseManager.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/eoseManagers/BaseEoseManager.kt index 70a0c54553..06e79b57ca 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/eoseManagers/BaseEoseManager.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/eoseManagers/BaseEoseManager.kt @@ -50,7 +50,7 @@ abstract class BaseEoseManager( fun dismissSubscription(subId: String) = orchestrator.dismissSubscription(subId) // Refreshes observers in batches. - private val bundler = BundledUpdate(300, Dispatchers.Default) + private val bundler = BundledUpdate(500, Dispatchers.Default) fun invalidateFilters() { bundler.invalidate { diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/FilterUserMetadataForKey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/FilterUserMetadataForKey.kt index b419e86a58..b20cc7dccc 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/FilterUserMetadataForKey.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/FilterUserMetadataForKey.kt @@ -38,14 +38,16 @@ val MetadataAndRelayListKinds = fun filterFindUserMetadataForKey( author: HexKey, + indexRelays: Set, defaultRelays: Set, ): List = LocalCache.checkGetOrCreateUser(author)?.let { - filterFindUserMetadataForKey(setOf(it), defaultRelays) + filterFindUserMetadataForKey(setOf(it), indexRelays, defaultRelays) } ?: emptyList() fun filterFindUserMetadataForKey( authors: Set, + indexRelays: Set, defaultRelays: Set, ): List { val perRelayKeys = @@ -53,8 +55,8 @@ fun filterFindUserMetadataForKey( authors.forEach { key -> val relays = key.authorRelayList()?.writeRelaysNorm() - ?: LocalCache.relayHints.hintsForKey(key.pubkeyHex).ifEmpty { null } - ?: (key.relaysBeingUsed.keys + defaultRelays).toList() + ?: (key.relaysBeingUsed.keys + LocalCache.relayHints.hintsForKey(key.pubkeyHex) + indexRelays).ifEmpty { null } + ?: defaultRelays.toList() relays.forEach { add(it, key.pubkeyHex) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/UserLoaderSubAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/UserLoaderSubAssembler.kt index 357f29434d..04057d91ab 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/UserLoaderSubAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/UserLoaderSubAssembler.kt @@ -20,6 +20,7 @@ */ package com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.loaders +import com.vitorpamplona.amethyst.model.DefaultIndexerRelayList import com.vitorpamplona.amethyst.model.LocalCache import com.vitorpamplona.amethyst.model.User import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.SingleSubNoEoseCacheEoseManager @@ -43,10 +44,15 @@ class UserLoaderSubAssembler( } } + val indexRelays = mutableSetOf() val defaultRelays = mutableSetOf() keys.mapTo(mutableSetOf()) { it.account }.forEach { - defaultRelays.addAll(it.followPlusAllMineWithIndexAndSearch.flow.value) + indexRelays.addAll( + it.indexerRelayList.flow.value + .ifEmpty { DefaultIndexerRelayList }, + ) + defaultRelays.addAll(it.followPlusAllMineWithSearch.flow.value) it.kind3FollowList.flow.value.authors.forEach { val user = LocalCache.getOrCreateUser(it) @@ -60,7 +66,7 @@ class UserLoaderSubAssembler( if (firstTimers.isEmpty()) return null - return filterFindUserMetadataForKey(firstTimers, defaultRelays) + return filterFindUserMetadataForKey(firstTimers, indexRelays, defaultRelays) } override fun distinct(key: UserFinderQueryState) = key.user diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/FilterByAuthor.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/FilterByAuthor.kt index c3b2efd28a..916bfa09c1 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/FilterByAuthor.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/FilterByAuthor.kt @@ -26,5 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl fun filterByAuthor( pubKey: HexKey, + indexRelays: Set, defaultRelays: Set, -) = filterFindUserMetadataForKey(pubKey, defaultRelays) +) = filterFindUserMetadataForKey(pubKey, indexRelays, defaultRelays) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/SearchWatcherSubAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/SearchWatcherSubAssembler.kt index 098d8e0710..d7fbba00f6 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/SearchWatcherSubAssembler.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/searchCommand/subassemblies/SearchWatcherSubAssembler.kt @@ -20,6 +20,7 @@ */ package com.vitorpamplona.amethyst.service.relayClient.searchCommand.subassemblies +import com.vitorpamplona.amethyst.model.DefaultIndexerRelayList import com.vitorpamplona.amethyst.model.LocalCache import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUniqueIdEoseManager import com.vitorpamplona.amethyst.service.relayClient.searchCommand.SearchQueryState @@ -55,23 +56,25 @@ class SearchWatcherSubAssembler( if (mySearchString.isBlank()) return null - val defaultRelaysWithIndexAndSearch = key.account.followPlusAllMineWithIndexAndSearch.flow.value + val indexRelays = + key.account.indexerRelayList.flow.value + .ifEmpty { DefaultIndexerRelayList } val defaultRelaysWithSearch = key.account.followPlusAllMineWithSearch.flow.value val directFilters = runCatching { if (Hex.isHex(mySearchString)) { val hexKey = Hex.decode(mySearchString).toHexKey() - filterByAuthor(hexKey, defaultRelaysWithIndexAndSearch) + filterByEvent(hexKey, defaultRelaysWithSearch) + filterByAuthor(hexKey, indexRelays, defaultRelaysWithSearch) + filterByEvent(hexKey, defaultRelaysWithSearch) } else { val parsed = Nip19Parser.uriToRoute(mySearchString)?.entity if (parsed != null) { cache.consume(parsed) when (parsed) { - is NSec -> filterByAuthor(parsed.toPubKeyHex(), defaultRelaysWithIndexAndSearch) - is NPub -> filterByAuthor(parsed.hex, defaultRelaysWithIndexAndSearch) - is NProfile -> filterByAuthor(parsed.hex, defaultRelaysWithIndexAndSearch) + is NSec -> filterByAuthor(parsed.toPubKeyHex(), indexRelays, defaultRelaysWithSearch) + is NPub -> filterByAuthor(parsed.hex, indexRelays, defaultRelaysWithSearch) + is NProfile -> filterByAuthor(parsed.hex, indexRelays, defaultRelaysWithSearch) is NNote -> filterByEvent(parsed.hex, defaultRelaysWithSearch) is NEvent -> filterByEvent(parsed.hex, defaultRelaysWithSearch) is NEmbed -> emptyList() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/speedLogger/RelaySpeedLogger.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/speedLogger/RelaySpeedLogger.kt index fc565f5394..c4397535b4 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/speedLogger/RelaySpeedLogger.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/speedLogger/RelaySpeedLogger.kt @@ -33,7 +33,7 @@ class RelaySpeedLogger( val client: INostrClient, ) { companion object { - val TAG = RelaySpeedLogger::class.java.simpleName + val TAG: String = RelaySpeedLogger::class.java.simpleName } var current = FrameStat() @@ -55,6 +55,8 @@ class RelaySpeedLogger( init { Log.d(TAG, "Init, Subscribe") client.subscribe(clientListener) + // OkHttpDebugLogging.enableHttp2() + // OkHttpDebugLogging.enableTaskRunner() } fun destroy() { diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MediaCompressor.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MediaCompressor.kt index 9f5cfe255f..0b506c4dcb 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MediaCompressor.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MediaCompressor.kt @@ -25,23 +25,12 @@ import android.graphics.Bitmap import android.net.Uri import androidx.core.net.toUri import androidx.media3.common.MimeTypes -import com.abedelazizshe.lightcompressorlibrary.CompressionListener -import com.abedelazizshe.lightcompressorlibrary.VideoCompressor -import com.abedelazizshe.lightcompressorlibrary.VideoQuality -import com.abedelazizshe.lightcompressorlibrary.config.AppSpecificStorageConfiguration -import com.abedelazizshe.lightcompressorlibrary.config.Configuration import com.vitorpamplona.amethyst.service.checkNotInMainThread import com.vitorpamplona.amethyst.ui.components.util.MediaCompressorFileUtils import com.vitorpamplona.quartz.utils.Log import id.zelory.compressor.Compressor import id.zelory.compressor.constraint.default import kotlinx.coroutines.CancellationException -import kotlinx.coroutines.suspendCancellableCoroutine -import kotlinx.coroutines.withTimeoutOrNull -import java.io.File -import kotlin.coroutines.resume -import kotlin.uuid.ExperimentalUuidApi -import kotlin.uuid.Uuid class MediaCompressorResult( val uri: Uri, @@ -67,7 +56,9 @@ class MediaCompressor { // branch into compression based on content type return when { - contentType?.startsWith("video", ignoreCase = true) == true -> compressVideo(uri, contentType, applicationContext, mediaQuality) + contentType?.startsWith("video", ignoreCase = true) == true -> { + VideoCompressionHelper.compressVideo(uri, contentType, applicationContext, mediaQuality) + } contentType?.startsWith("image", ignoreCase = true) == true && !contentType.contains("gif") && !contentType.contains("svg") -> @@ -76,91 +67,6 @@ class MediaCompressor { } } - @OptIn(ExperimentalUuidApi::class) - private suspend fun compressVideo( - uri: Uri, - contentType: String?, - applicationContext: Context, - mediaQuality: CompressorQuality, - ): MediaCompressorResult { - val videoQuality = - when (mediaQuality) { - CompressorQuality.VERY_LOW -> VideoQuality.VERY_LOW - // Override user selection LOW to use VERY_LOW for better video streaming experience - CompressorQuality.LOW -> VideoQuality.VERY_LOW - CompressorQuality.MEDIUM -> VideoQuality.MEDIUM - CompressorQuality.HIGH -> VideoQuality.HIGH - CompressorQuality.VERY_HIGH -> VideoQuality.VERY_HIGH - else -> VideoQuality.MEDIUM - } - - Log.d("MediaCompressor", "Using video compression $videoQuality") - - val result = - withTimeoutOrNull(30000) { - suspendCancellableCoroutine { continuation -> - VideoCompressor.start( - // => This is required - context = applicationContext, - // => Source can be provided as content uris - uris = listOf(uri), - isStreamable = false, - // THIS STORAGE - // sharedStorageConfiguration = SharedStorageConfiguration( - // saveAt = SaveLocation.movies, // => default is movies - // videoName = "compressed_video" // => required name - // ), - // OR AND NOT BOTH - storageConfiguration = AppSpecificStorageConfiguration(), - configureWith = - Configuration( - quality = videoQuality, - // => required name - videoNames = listOf(Uuid.random().toString()), - ), - listener = - object : CompressionListener { - override fun onProgress( - index: Int, - percent: Float, - ) {} - - override fun onStart(index: Int) {} - - override fun onSuccess( - index: Int, - size: Long, - path: String?, - ) { - if (path != null) { - Log.d("MediaCompressor", "Video compression success. Compressed size [$size]") - continuation.resume(MediaCompressorResult(Uri.fromFile(File(path)), contentType, size)) - } else { - Log.d("MediaCompressor", "Video compression successful, but returned null path") - continuation.resume(null) - } - } - - override fun onFailure( - index: Int, - failureMessage: String, - ) { - Log.d("MediaCompressor", "Video compression failed: $failureMessage") - // keeps going with original video - continuation.resume(null) - } - - override fun onCancelled(index: Int) { - continuation.resume(null) - } - }, - ) - } - } - - return result ?: MediaCompressorResult(uri, contentType, null) - } - private suspend fun compressImage( uri: Uri, contentType: String?, @@ -203,15 +109,6 @@ class MediaCompressor { 3 -> CompressorQuality.UNCOMPRESSED else -> CompressorQuality.MEDIUM } - - fun compressorQualityToInt(compressorQuality: CompressorQuality): Int = - when (compressorQuality) { - CompressorQuality.LOW -> 0 - CompressorQuality.MEDIUM -> 1 - CompressorQuality.HIGH -> 2 - CompressorQuality.UNCOMPRESSED -> 3 - else -> 1 - } } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/VideoCompressionHelper.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/VideoCompressionHelper.kt new file mode 100644 index 0000000000..894b40708f --- /dev/null +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/VideoCompressionHelper.kt @@ -0,0 +1,362 @@ +/** + * Copyright (c) 2025 Vitor Pamplona + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the + * Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +package com.vitorpamplona.amethyst.service.uploads + +import android.content.Context +import android.media.MediaMetadataRetriever +import android.net.Uri +import android.os.Handler +import android.os.Looper +import android.text.format.Formatter.formatFileSize +import android.util.Log +import android.widget.Toast +import com.abedelazizshe.lightcompressorlibrary.CompressionListener +import com.abedelazizshe.lightcompressorlibrary.VideoCompressor +import com.abedelazizshe.lightcompressorlibrary.config.AppSpecificStorageConfiguration +import com.abedelazizshe.lightcompressorlibrary.config.Configuration +import com.abedelazizshe.lightcompressorlibrary.config.VideoResizer +import kotlinx.coroutines.suspendCancellableCoroutine +import kotlinx.coroutines.withTimeoutOrNull +import java.io.File +import java.util.UUID +import kotlin.coroutines.resume +import kotlin.math.roundToInt + +data class VideoInfo( + val resolution: VideoResolution, + val framerate: Float, +) + +data class VideoResolution( + val width: Int, + val height: Int, +) { + val pixels: Int get() = width * height + + fun getStandard(): VideoStandard = + when { + pixels >= 3840 * 2160 -> VideoStandard.UHD_4K + pixels >= 2560 * 1440 -> VideoStandard.QHD_1440P + pixels >= 1920 * 1080 -> VideoStandard.FHD_1080P + pixels >= 1280 * 720 -> VideoStandard.HD_720P + pixels >= 854 * 480 -> VideoStandard.SD_480P + pixels >= 640 * 360 -> VideoStandard.NHD_360P + pixels >= 426 * 240 -> VideoStandard.QVGA_240P + else -> VideoStandard.UNKNOWN + } +} + +enum class VideoStandard( + val label: String, +) { + UHD_4K("4K"), + QHD_1440P("1440p"), + FHD_1080P("1080p"), + HD_720P("720p"), + SD_480P("480p"), + NHD_360P("360p"), + QVGA_240P("240p"), + UNKNOWN("unknown"), + ; + + override fun toString(): String = label +} + +data class CompressionRule( + val width: Int, + val height: Int, + val bitrateMbps: Float, + val description: String, +) { + fun getBitrateMbpsInt(framerate: Float): Int { + // Apply 1.5x multiplier for 60fps+ videos + val multiplier = if (framerate >= 60f) 1.5f else 1.0f + + // Library doesn't support float so we have to convert it to int and use 1 as minimum + return (bitrateMbps * multiplier).roundToInt().coerceAtLeast(1) + } +} + +object VideoCompressionHelper { + private const val LOG_TAG = "VideoCompressionHelper" + + private val compressionRules = + mapOf( + CompressorQuality.LOW to + mapOf( + VideoStandard.UHD_4K to CompressionRule(1280, 720, 2f, "4K→720p, 2Mbps"), + VideoStandard.QHD_1440P to CompressionRule(1280, 720, 2f, "1440p→720p, 2Mbps"), + VideoStandard.FHD_1080P to CompressionRule(854, 480, 1f, "1080p→480p, 1Mbps"), + VideoStandard.HD_720P to CompressionRule(640, 360, 1f, "720p→360p, 1Mbps"), + VideoStandard.SD_480P to CompressionRule(426, 240, 1f, "480p→240p, 1Mbps"), + VideoStandard.NHD_360P to CompressionRule(426, 240, 0.3f, "360p→240p, 0.3Mbps"), + VideoStandard.QVGA_240P to CompressionRule(320, 180, 0.2f, "240p→180p, 0.2Mbps"), + VideoStandard.UNKNOWN to CompressionRule(854, 480, 1f, "Low quality fallback, 1Mbps"), + ), + CompressorQuality.MEDIUM to + mapOf( + VideoStandard.UHD_4K to CompressionRule(1920, 1080, 6f, "4K→1080p, 6Mbps"), + VideoStandard.QHD_1440P to CompressionRule(1920, 1080, 6f, "1440p→1080p, 6Mbps"), + VideoStandard.FHD_1080P to CompressionRule(1280, 720, 3f, "1080p→720p, 3Mbps"), + VideoStandard.HD_720P to CompressionRule(854, 480, 2f, "720p→480p, 2Mbps"), + VideoStandard.SD_480P to CompressionRule(640, 360, 1f, "480p→360p, 1Mbps"), + VideoStandard.NHD_360P to CompressionRule(426, 240, 0.5f, "360p→240p, 0.5Mbps"), + VideoStandard.QVGA_240P to CompressionRule(320, 180, 0.3f, "240p→180p, 0.3Mbps"), + VideoStandard.UNKNOWN to CompressionRule(1280, 720, 2f, "Medium quality fallback, 2Mbps"), + ), + CompressorQuality.HIGH to + mapOf( + VideoStandard.UHD_4K to CompressionRule(3840, 2160, 16f, "4K→4K, 16Mbps"), + VideoStandard.QHD_1440P to CompressionRule(1920, 1080, 8f, "1440p→1080p, 8Mbps"), + VideoStandard.FHD_1080P to CompressionRule(1920, 1080, 6f, "1080p→1080p, 6Mbps"), + VideoStandard.HD_720P to CompressionRule(1280, 720, 3f, "720p→720p, 3Mbps"), + VideoStandard.SD_480P to CompressionRule(854, 480, 2f, "480p→480p, 2Mbps"), + VideoStandard.NHD_360P to CompressionRule(640, 360, 1f, "360p→360p, 1Mbps"), + VideoStandard.QVGA_240P to CompressionRule(426, 240, 0.5f, "240p→240p, 0.5Mbps"), + VideoStandard.UNKNOWN to CompressionRule(1920, 1080, 3f, "High quality fallback, 3Mbps"), + ), + ) + + suspend fun compressVideo( + uri: Uri, + contentType: String?, + applicationContext: Context, + mediaQuality: CompressorQuality, + timeoutMs: Long = 60_000L, // configurable, default 60s + ): MediaCompressorResult { + val videoInfo = getVideoInfo(uri, applicationContext) + + val videoBitrateInMbps = + if (videoInfo != null) { + val bitrateMbpsInt = + compressionRules + .getValue(mediaQuality) + .getValue(videoInfo.resolution.getStandard()) + .getBitrateMbpsInt(videoInfo.framerate) + + Log.d( + LOG_TAG, + "Bitrate: ${bitrateMbpsInt}Mbps for ${videoInfo.resolution.getStandard()} " + + "quality=$mediaQuality framerate=${videoInfo.framerate}fps.", + ) + } else { + Log.w(LOG_TAG, "Video bitrate fallback: 2Mbps (videoInfo unavailable)") + 2 + } + + val resizer = + if (videoInfo != null) { + val rules = + compressionRules + .getValue(mediaQuality) + .getValue(videoInfo.resolution.getStandard()) + Log.d( + LOG_TAG, + "Resizer: ${videoInfo.resolution.width}x${videoInfo.resolution.height} -> " + + "${rules.width}x${rules.height} (${rules.description})", + ) + VideoResizer.limitSize(rules.width.toDouble(), rules.height.toDouble()) + } else { + Log.d(LOG_TAG, "Resizer: null (original resolution preserved)") + null + } + + // Get original file size safely + val originalSize = applicationContext.getFileSize(uri) + + val result = + withTimeoutOrNull(timeoutMs) { + suspendCancellableCoroutine { continuation -> + VideoCompressor.start( + context = applicationContext, + uris = listOf(uri), + isStreamable = true, + storageConfiguration = AppSpecificStorageConfiguration(), + configureWith = + Configuration( + videoBitrateInMbps = videoBitrateInMbps, + resizer = resizer, + videoNames = listOf(UUID.randomUUID().toString()), + isMinBitrateCheckEnabled = false, + ), + listener = + object : CompressionListener { + override fun onStart(index: Int) {} + + override fun onProgress( + index: Int, + percent: Float, + ) {} + + override fun onSuccess( + index: Int, + size: Long, + path: String?, + ) { + if (path == null) { + applicationContext.notifyUser( + "Video compression succeeded, but path was null", + Log.WARN, + ) + if (continuation.isActive) continuation.resume(null) + return + } + + val reductionPercent = + if (originalSize > 0) { + ((originalSize - size) * 100.0 / originalSize).toInt() + } else { + 0 + } + + // Sanity check: compression not smaller than original + if (originalSize > 0 && size >= originalSize) { + applicationContext.notifyUser( + "Compressed file larger than original. Using original.", + Log.WARN, + ) + if (continuation.isActive) { + continuation.resume( + MediaCompressorResult(uri, contentType, null), + ) + } + return + } + + // Show compression result + if (originalSize > 0 && size > 0) { + val sizeLabel = formatFileSize(applicationContext, size) + val percentLabel = + if (reductionPercent >= 0) "-$reductionPercent%" else "+${-reductionPercent}%" + applicationContext.notifyUser( + "Video compressed: $sizeLabel ($percentLabel)", + ) + } + + Log.d( + LOG_TAG, + "Compression success: Original [$originalSize] -> " + + "Compressed [$size] ($reductionPercent% reduction)", + ) + + // Attempt to correct the path: if it contains "_temp" then remove it + val correctedPath = + if (path.contains("_temp")) { + path.replace("_temp", "") + } else { + path + } + if (continuation.isActive) { + continuation.resume( + MediaCompressorResult(Uri.fromFile(File(correctedPath)), contentType, size), + ) + } + } + + override fun onFailure( + index: Int, + failureMessage: String, + ) { + applicationContext.notifyUser( + "Video compression failed: $failureMessage", + Log.ERROR, + ) + if (continuation.isActive) continuation.resume(null) + } + + override fun onCancelled(index: Int) { + Log.w(LOG_TAG, "Video compression cancelled") + if (continuation.isActive) continuation.resume(null) + } + }, + ) + } + } + + return result ?: MediaCompressorResult(uri, contentType, null) + } + + private fun Context.getFileSize(uri: Uri): Long = + try { + contentResolver.query(uri, arrayOf(android.provider.OpenableColumns.SIZE), null, null, null)?.use { cursor -> + val sizeIndex = cursor.getColumnIndex(android.provider.OpenableColumns.SIZE) + if (cursor.moveToFirst()) cursor.getLong(sizeIndex) else 0L + } ?: 0L + } catch (e: Exception) { + Log.w(LOG_TAG, "Failed to get file size: ${e.message}") + 0L + } + + private fun Context.notifyUser( + message: String, + logLevel: Int = Log.DEBUG, + duration: Int = Toast.LENGTH_LONG, + ) { + Handler(Looper.getMainLooper()).post { + Toast.makeText(this, message, duration).show() + } + when (logLevel) { + Log.ERROR -> Log.e(LOG_TAG, message) + Log.WARN -> Log.w(LOG_TAG, message) + else -> Log.d(LOG_TAG, message) + } + } + + private fun getVideoInfo( + uri: Uri, + context: Context, + ): VideoInfo? { + var retriever: MediaMetadataRetriever? = null + return try { + retriever = MediaMetadataRetriever() + retriever.setDataSource(context, uri) + val width = retriever.prepareVideoWidth() + val height = retriever.prepareVideoHeight() + val rotation = retriever.prepareRotation() ?: 0 + + // Get framerate + val framerateString = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_CAPTURE_FRAMERATE) + val framerate = framerateString?.toFloatOrNull() ?: 30.0f + + if (width != null && height != null && width > 0 && height > 0) { + // Account for rotation + val resolution = + if (rotation == 90 || rotation == 270) { + VideoResolution(height, width) + } else { + VideoResolution(width, height) + } + VideoInfo(resolution, framerate) + } else { + null + } + } catch (e: Exception) { + Log.w(LOG_TAG, "Failed to get video resolution: ${e.message}") + null + } finally { + try { + retriever?.release() + } catch (e: Exception) { + Log.w(LOG_TAG, "Failed to release MediaMetadataRetriever: ${e.message}") + } + } + } +} diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesGlobal.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesGlobal.kt index 2fdc48c33d..3aae8fbbb8 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesGlobal.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesGlobal.kt @@ -43,7 +43,7 @@ fun filterCommunitiesGlobal( filter = Filter( kinds = listOf(CommunityDefinitionEvent.KIND), - limit = 500, + limit = 200, since = since, ), ), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip65Follows/FilterHomePostsByAuthors.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip65Follows/FilterHomePostsByAuthors.kt index b9de073882..46bebbc444 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip65Follows/FilterHomePostsByAuthors.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/datasource/nip65Follows/FilterHomePostsByAuthors.kt @@ -42,7 +42,7 @@ import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent import com.vitorpamplona.quartz.nipA0VoiceMessages.VoiceEvent import com.vitorpamplona.quartz.nipA0VoiceMessages.VoiceReplyEvent -import kotlin.math.max +import kotlin.math.min val HomePostsNewThreadKinds = listOf( @@ -81,7 +81,7 @@ fun filterNewHomePostsByAuthors( Filter( kinds = HomePostsNewThreadKinds, authors = authorList, - limit = max(authorList.size * 10, 300), + limit = min(authorList.size * 10, 500), since = since, ), ), @@ -102,7 +102,7 @@ fun filterReplyHomePostsByAuthors( Filter( kinds = HomePostsConversationKinds, authors = authorList, - limit = max(authorList.size * 10, 300), + limit = min(authorList.size * 10, 500), since = since, ), ), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/login/ExternalSignerButton.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/login/ExternalSignerButton.kt index 4285dd0872..6280c09bd8 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/login/ExternalSignerButton.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/login/ExternalSignerButton.kt @@ -23,12 +23,39 @@ package com.vitorpamplona.amethyst.ui.screen.loggedOff.login import android.app.Activity import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.Image +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Surface +import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.TextFieldValue +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.window.Dialog +import androidx.core.graphics.drawable.toBitmap +import coil3.compose.rememberAsyncImagePainter import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.model.DefaultSignerPermissions import com.vitorpamplona.amethyst.ui.theme.Size0dp @@ -37,6 +64,7 @@ import com.vitorpamplona.amethyst.ui.theme.Size40dp import com.vitorpamplona.quartz.nip55AndroidSigner.api.PubKeyResult import com.vitorpamplona.quartz.nip55AndroidSigner.api.SignerResult import com.vitorpamplona.quartz.nip55AndroidSigner.client.ExternalSignerLogin +import com.vitorpamplona.quartz.nip55AndroidSigner.client.getExternalSignersInstalled import com.vitorpamplona.quartz.utils.Log import kotlinx.coroutines.CancellationException import kotlinx.coroutines.launch @@ -44,6 +72,9 @@ import kotlinx.coroutines.launch @Composable fun ExternalSignerButton(loginViewModel: LoginViewModel) { val scope = rememberCoroutineScope() + val context = LocalContext.current + val installedSigners = getExternalSignersInstalled(context) + var shouldSelectSigner by remember { mutableStateOf(false) } val launcher = rememberLauncherForActivityResult( @@ -63,6 +94,81 @@ fun ExternalSignerButton(loginViewModel: LoginViewModel) { } } + if (shouldSelectSigner) { + Dialog( + onDismissRequest = { + shouldSelectSigner = false + }, + content = { + Surface( + shape = RoundedCornerShape(4.dp), + ) { + Column( + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + modifier = Modifier.padding(8.dp), + text = stringResource(R.string.select_signer), + fontWeight = FontWeight.Bold, + fontSize = 24.sp, + ) + Spacer(Modifier.height(4.dp)) + LazyColumn { + items(installedSigners) { + val appName = it.loadLabel(context.packageManager).toString() + val appIcon = it.loadIcon(context.packageManager) + val iconBitmap = appIcon.toBitmap() + + Row( + Modifier + .fillMaxWidth() + .padding(start = 16.dp, end = 16.dp, bottom = 8.dp, top = 8.dp) + .clickable { + if (!loginViewModel.acceptedTerms) { + loginViewModel.termsAcceptanceIsRequiredError = true + } else { + try { + launcher.launch(ExternalSignerLogin.createIntent(DefaultSignerPermissions, it.activityInfo.packageName)) + } catch (e: Exception) { + if (e is CancellationException) throw e + Log.e("ExternalSigner", "Error opening Signer app", e) + loginViewModel.errorManager.error(R.string.error_opening_external_signer) + } finally { + shouldSelectSigner = false + } + } + }, + ) { + val painter = + rememberAsyncImagePainter( + iconBitmap, + ) + + Image( + painter = painter, + contentDescription = appName, + modifier = + Modifier + .size(48.dp) + .padding(end = 16.dp), + ) + Column { + Text(appName) + Text( + it.activityInfo.packageName, + fontSize = 14.sp, + color = Color.Gray, + ) + } + } + } + } + } + } + }, + ) + } + Box(modifier = Modifier.padding(Size40dp, Size20dp, Size40dp, Size0dp)) { LoginWithAmberButton( enabled = loginViewModel.acceptedTerms, @@ -71,7 +177,11 @@ fun ExternalSignerButton(loginViewModel: LoginViewModel) { loginViewModel.termsAcceptanceIsRequiredError = true } else { try { - launcher.launch(ExternalSignerLogin.createIntent(DefaultSignerPermissions)) + if (installedSigners.size == 1) { + launcher.launch(ExternalSignerLogin.createIntent(DefaultSignerPermissions)) + } else { + shouldSelectSigner = true + } } catch (e: Exception) { if (e is CancellationException) throw e Log.e("ExternalSigner", "Error opening Signer app", e) diff --git a/amethyst/src/main/res/values-hi-rIN/strings.xml b/amethyst/src/main/res/values-hi-rIN/strings.xml index 6dec4915ce..8e6ffcb6a1 100644 --- a/amethyst/src/main/res/values-hi-rIN/strings.xml +++ b/amethyst/src/main/res/values-hi-rIN/strings.xml @@ -112,6 +112,7 @@ पत्र प्रकाशन अभिलेखन करें बनाएँ + पुनःनामकरण निरस्त करें चित्र आरोहण असफल पुनःप्रसारक पता @@ -440,10 +441,38 @@ नहीं अनुचरण सूची सभी अनुचरित + प्रयोक्ता के सभी अनुगामी प्रतिनिधि द्वारा अनुचरित मेरे आसपास वैश्विक मौन सूची + अनुगम्य सूचियाँ + सूचक युक्त स्मर्त्तव्य सूची + सामान्य स्मर्त्तव्य सूची + सार्वजनिक + निजी + मिश्रित + लगता है आपका अब तक कोइ अनुगम्य समुच्चय नहीं है। + \nनवीकरण के लिए नीचे दबाएँ। अथवा एक नया बनाने के लिए जोड घुण्डियाँ टाँकें। + + लेखक जोडें अनुगम्य सूची में + प्रयोक्ता को सूचियों में जोडें अथवा हटाएँ अथवा इस प्रयोक्ता के साथ नई सूची बनाएँ। + सूची %1$s के लिए चिह्न + "%1$s इस सूची में है" + "%1$s इस सूची में नहीं है" + आपके अनुगम्य सूचियाँ + कोई अनुगम्य सूचियाँ प्राप्त नहीं। अथवा आपका कोई अनुगम्य सूचियाँ हैं नहीं। नवीकरण के लिए नीचे दबाएँ अथवा विकल्पसूची द्वारा एक नया बनाएँ। + लाने में अपक्रम : %1$s + नई सूची बनाएँ + प्रयोक्ता के साथ नई सूची %1$s बनाएँ + अनुगम्य सूची %1$s बनाता है तथा उससे %2$s जोडता है। + नई %1$s सूची + समुच्चय नाम + समुच्चय विवरण (आवश्यक नहीं) + समुच्चय बनाएँ + समुच्चय पुनःनामकरण + आप पनःनामकरण कर रहे हैं इस से + इस तक.. मूलविकल्प द्वार ९०५० है ## टोर द्वारा संयोजन करें ओर्बोट के साथ \n\n१. स्थापित करें [ओर्बोट](https://play.google.com/store/apps/details?id=org.torproject.android) @@ -1013,6 +1042,8 @@ अवरोहण अभिलेख खोलने में असफल कोई उग्रप्रवाह क्रमक स्थापित नहीं अभिलेख खोलने तथा अवरोहण करने के लिए। + अभिलेखविभेदक युक्त जालनिर्देशक बनाने के लिए पर्याप्त जानकारी नहीं है घटना में + मेरे सूचियाँ / समुच्चय सूचनावली छानने के लिए सूची चुनें यन्त्र ताला लगने पर निर्गमनांकन करें निजी सन्देश @@ -1020,6 +1051,7 @@ चर्चा पुनःप्रसारक वह पुनःप्रसारक जिससे इस चर्चा के सभी उपयोगकर्ता जुडते हैं चित्र बाँटें… + चित्र बाँटने में असफल। कृपया कुछ समय पश्चात पुनःप्रयास करें… विषयसूचक खोज : #%1$s अनुवाद ना करें यहाँ प्रस्तुत भाषाओं का अनुवाद नहीं होगा। भाषा चयन करें हटाने के लिए जिससे उसका अनुवाद पुनः होने लगेगा। diff --git a/amethyst/src/main/res/values-zh-rCN/strings.xml b/amethyst/src/main/res/values-zh-rCN/strings.xml index cfc05388b6..02f2316e42 100644 --- a/amethyst/src/main/res/values-zh-rCN/strings.xml +++ b/amethyst/src/main/res/values-zh-rCN/strings.xml @@ -112,6 +112,7 @@ 发布 保存 创建 + 重命名 取消 上传图片失败 中继器地址 @@ -445,6 +446,33 @@ 周围的人 全球 静音列表 + 关注集 + 有标签的书签 + 常规书签 + 公开 + 私密 + 混合 + 似乎你还没有任何关注集。 + \n轻按下方刷新，或者轻按“+”按钮新建一个。 + + 添加作者到关注集 + 从列表中添加或删除用户，或用此用户创建一个新列表。 + %1$s 列表的图标 + "此列表中有 %1$s" + "此列表中没有 %1$s" + 您的关注集 + 未找到关注集，或者你还没有任何关注集。轻按下方刷新，或使用按钮新建。 + 获取时出了问题： %1$s + 新建列表 + 创建用户新的 %1$s 列表 + 创建 %1$s 关注集，并添加 %2$s 到其中。 + 新的 %1$s 列表 + 集合名 + 集合描述（可选） + 新建集 + 重命名集 + 正将集合名称从 + 改为 默认端口为 9050 ## 通过 Orbot 连线 Tor \n\n1. 安装 [Orbot](https://play.google.com/store/apps/details?id=org.torproject.android) @@ -1014,6 +1042,8 @@ 下载 打开文件失败 没有用于打开和下载文件的 Torrent 客户端 + 事件没有足够信息来构建磁力链 + 我的列表/集合 选择一个用于过滤订阅源的列表 当设备锁定时注销 私信 diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml index d5b837e887..9c6f4283cf 100644 --- a/amethyst/src/main/res/values/strings.xml +++ b/amethyst/src/main/res/values/strings.xml @@ -1289,4 +1289,5 @@ Would you like to send the recent crash report to Amethyst in a DM? No personal information will be shared Send it This message will disappear in %1$d days + Select Signer diff --git a/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/client/ExternalSignerLogin.kt b/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/client/ExternalSignerLogin.kt index 015c3fc65f..2ec43bd092 100644 --- a/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/client/ExternalSignerLogin.kt +++ b/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/client/ExternalSignerLogin.kt @@ -29,9 +29,15 @@ import com.vitorpamplona.quartz.nip55AndroidSigner.api.foreground.intents.result import com.vitorpamplona.quartz.nip55AndroidSigner.api.permission.Permission object ExternalSignerLogin { - fun createIntent(permissions: List = LoginRequest.DefaultPermissions): Intent { + fun createIntent( + permissions: List = LoginRequest.DefaultPermissions, + packageName: String = "", + ): Intent { val intent = LoginRequest.assemble(permissions) intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP) + if (packageName.isNotBlank()) { + intent.`package` = packageName + } return intent } diff --git a/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/client/IsExternalSignerInstalled.kt b/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/client/IsExternalSignerInstalled.kt index 92d7f5e48c..cef8fa6310 100644 --- a/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/client/IsExternalSignerInstalled.kt +++ b/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/client/IsExternalSignerInstalled.kt @@ -23,6 +23,7 @@ package com.vitorpamplona.quartz.nip55AndroidSigner.client import android.annotation.SuppressLint import android.content.Context import android.content.Intent +import android.content.pm.ResolveInfo import androidx.core.net.toUri @SuppressLint("QueryPermissionsNeeded") @@ -35,3 +36,14 @@ fun isExternalSignerInstalled(context: Context): Boolean = }, 0, ).isNotEmpty() + +@SuppressLint("QueryPermissionsNeeded") +fun getExternalSignersInstalled(context: Context): List = + context.packageManager + .queryIntentActivities( + Intent().apply { + action = Intent.ACTION_VIEW + data = "nostrsigner:".toUri() + }, + 0, + ) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/single/basic/BasicRelayClient.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/single/basic/BasicRelayClient.kt index 27410def9c..ecf3e21435 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/single/basic/BasicRelayClient.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/single/basic/BasicRelayClient.kt @@ -174,6 +174,8 @@ open class BasicRelayClient( } override fun onMessage(text: String) { + // Log.d(logTag, "Receiving: $text") + if (text.startsWith(EVENT_MESSAGE_PREFIX)) { // defers the parsing of ["EVENTS" to avoid blocking the HTTP thread scope.launch(Dispatchers.Default) { @@ -239,7 +241,7 @@ open class BasicRelayClient( text: String, onConnected: () -> Unit, ) { - // Log.d(logTag, "Receiving: $text") + // Log.d(logTag, "Processing: $text") stats.addBytesReceived(text.bytesUsedInMemory()) try { @@ -465,7 +467,7 @@ open class BasicRelayClient( ) } socket?.let { - Log.d(logTag, "Sending: $str") + // Log.d(logTag, "Sending (${str.length} chars): $str") val result = it.send(str) listener.onSend(this@BasicRelayClient, str, result) stats.addBytesSent(str.bytesUsedInMemory()) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/stats/RelayStats.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/stats/RelayStats.kt index b65a22bffc..3ae818730d 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/stats/RelayStats.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/stats/RelayStats.kt @@ -29,7 +29,7 @@ object RelayStats { override fun create(key: NormalizedRelayUrl): RelayStat = RelayStat() } - fun get(url: NormalizedRelayUrl): RelayStat = innerCache.get(url) ?: RelayStat() + fun get(url: NormalizedRelayUrl): RelayStat = innerCache.get(url) ?: throw IllegalArgumentException("Should never happen") fun addBytesReceived( url: NormalizedRelayUrl,