diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt b/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt index f62cd343..bf4a6c23 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt @@ -8,7 +8,6 @@ import android.net.Uri import android.util.Log import com.greenart7c3.nostrsigner.database.HistoryEntity import com.greenart7c3.nostrsigner.models.SignerType -import com.greenart7c3.nostrsigner.models.TimeUtils import com.greenart7c3.nostrsigner.models.kindToNip import com.greenart7c3.nostrsigner.service.AmberUtils import com.greenart7c3.nostrsigner.service.IntentUtils @@ -17,6 +16,7 @@ import com.vitorpamplona.quartz.encoders.toHexKey import com.vitorpamplona.quartz.encoders.toNpub import com.vitorpamplona.quartz.events.Event import com.vitorpamplona.quartz.events.LnZapRequestEvent +import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/models/TimeUtils.kt b/app/src/main/java/com/greenart7c3/nostrsigner/models/TimeUtils.kt index 335bffe1..9d26fe92 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/models/TimeUtils.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/models/TimeUtils.kt @@ -4,27 +4,8 @@ import java.time.Instant import java.time.LocalDateTime import java.time.ZoneId import java.time.format.DateTimeFormatter -import java.time.format.FormatStyle object TimeUtils { - fun now() = System.currentTimeMillis() / 1000 - - fun convertLongToDateTime(longValue: Long): String { - val dateTime = - LocalDateTime.ofInstant( - Instant.ofEpochMilli(longValue), - ZoneId.systemDefault(), - ) - - val formatter = - DateTimeFormatter.ofLocalizedDateTime( - FormatStyle.SHORT, - FormatStyle.MEDIUM, - ) - - return dateTime.format(formatter) - } - fun formatLongToCustomDateTime(longValue: Long): String { val dateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(longValue), ZoneId.systemDefault()) val formatter = DateTimeFormatter.ofPattern("HH:mm - dd MMM") diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt index b06a93a6..552ae74b 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/BunkerRequestUtils.kt @@ -16,7 +16,6 @@ import com.greenart7c3.nostrsigner.models.IntentData import com.greenart7c3.nostrsigner.models.Permission import com.greenart7c3.nostrsigner.models.ReturnType import com.greenart7c3.nostrsigner.models.SignerType -import com.greenart7c3.nostrsigner.models.TimeUtils import com.greenart7c3.nostrsigner.models.containsNip import com.greenart7c3.nostrsigner.relays.AmberListenerSingleton import com.greenart7c3.nostrsigner.service.IntentUtils.getUnsignedEvent @@ -24,6 +23,7 @@ import com.greenart7c3.nostrsigner.service.model.AmberEvent import com.vitorpamplona.ammolite.relays.RelaySetupInfo import com.vitorpamplona.quartz.encoders.toNpub import com.vitorpamplona.quartz.events.Event +import com.vitorpamplona.quartz.utils.TimeUtils import java.util.concurrent.ConcurrentHashMap import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt index 0abd57a4..69904cc9 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt @@ -41,13 +41,13 @@ import com.greenart7c3.nostrsigner.models.BunkerResponse import com.greenart7c3.nostrsigner.models.EncryptionType import com.greenart7c3.nostrsigner.models.Permission import com.greenart7c3.nostrsigner.models.SignerType -import com.greenart7c3.nostrsigner.models.TimeUtils import com.greenart7c3.nostrsigner.service.NotificationUtils.sendNotification import com.greenart7c3.nostrsigner.service.model.AmberEvent import com.vitorpamplona.quartz.crypto.nip04.Nip04 import com.vitorpamplona.quartz.encoders.Hex import com.vitorpamplona.quartz.encoders.toNpub import com.vitorpamplona.quartz.events.Event +import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.coroutines.launch class EventNotificationConsumer(private val applicationContext: Context) { diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/NotificationDataSource.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/NotificationDataSource.kt index 55ab924b..dae2b0c2 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/NotificationDataSource.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/NotificationDataSource.kt @@ -24,7 +24,6 @@ import com.greenart7c3.nostrsigner.LocalPreferences import com.greenart7c3.nostrsigner.NostrSigner import com.greenart7c3.nostrsigner.checkNotInMainThread import com.greenart7c3.nostrsigner.database.LogEntity -import com.greenart7c3.nostrsigner.models.TimeUtils import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES import com.vitorpamplona.ammolite.relays.NostrClient import com.vitorpamplona.ammolite.relays.NostrDataSource @@ -34,6 +33,7 @@ import com.vitorpamplona.ammolite.relays.filters.EOSETime import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter import com.vitorpamplona.quartz.encoders.toHexKey import com.vitorpamplona.quartz.events.Event +import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/model/AmberEvent.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/model/AmberEvent.kt index 067b6ee2..5b97bb84 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/model/AmberEvent.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/model/AmberEvent.kt @@ -11,9 +11,9 @@ import com.google.gson.JsonObject import com.google.gson.JsonSerializationContext import com.google.gson.JsonSerializer import com.google.gson.annotations.SerializedName -import com.greenart7c3.nostrsigner.models.TimeUtils import com.vitorpamplona.quartz.encoders.HexKey import com.vitorpamplona.quartz.events.Event +import com.vitorpamplona.quartz.utils.TimeUtils import java.lang.reflect.Type @Immutable diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt index 2970ea1b..ed937c05 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt @@ -97,7 +97,6 @@ import com.greenart7c3.nostrsigner.models.IntentData import com.greenart7c3.nostrsigner.models.Permission import com.greenart7c3.nostrsigner.models.ReturnType import com.greenart7c3.nostrsigner.models.SignerType -import com.greenart7c3.nostrsigner.models.TimeUtils import com.greenart7c3.nostrsigner.models.basicPermissions import com.greenart7c3.nostrsigner.service.BunkerRequestUtils import com.greenart7c3.nostrsigner.service.EventNotificationConsumer @@ -115,6 +114,7 @@ import com.greenart7c3.nostrsigner.ui.components.IconRow import com.greenart7c3.nostrsigner.ui.navigation.Route import com.greenart7c3.nostrsigner.ui.navigation.routes import com.vitorpamplona.quartz.encoders.toHexKey +import com.vitorpamplona.quartz.utils.TimeUtils import java.io.ByteArrayOutputStream import java.util.Base64 import java.util.zip.GZIPOutputStream diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/EditRelaysDialog.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/EditRelaysDialog.kt index d465c68d..59aa80a5 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/EditRelaysDialog.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/EditRelaysDialog.kt @@ -47,7 +47,7 @@ import com.greenart7c3.nostrsigner.NostrSigner import com.greenart7c3.nostrsigner.R import com.greenart7c3.nostrsigner.RelayListener2 import com.greenart7c3.nostrsigner.models.Account -import com.greenart7c3.nostrsigner.models.TimeUtils +import com.greenart7c3.nostrsigner.models.TimeUtils.formatLongToCustomDateTimeWithSeconds import com.greenart7c3.nostrsigner.okhttp.OkHttpWebSocket import com.greenart7c3.nostrsigner.relays.AmberListenerSingleton import com.greenart7c3.nostrsigner.service.Nip11Retriever @@ -68,6 +68,7 @@ import com.vitorpamplona.quartz.encoders.RelayUrlFormatter import com.vitorpamplona.quartz.encoders.toHexKey import com.vitorpamplona.quartz.events.Event import com.vitorpamplona.quartz.signers.NostrSignerInternal +import com.vitorpamplona.quartz.utils.TimeUtils import java.util.Base64 import java.util.UUID import kotlinx.coroutines.CoroutineScope @@ -511,7 +512,7 @@ fun RelayLogScreen( ) { Text( modifier = Modifier.padding(top = 16.dp), - text = TimeUtils.formatLongToCustomDateTimeWithSeconds(log.time), + text = formatLongToCustomDateTimeWithSeconds(log.time), fontSize = 14.sp, maxLines = 1, overflow = TextOverflow.Ellipsis, diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/MultiEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/MultiEventHomeScreen.kt index 18fd0260..b6337519 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/MultiEventHomeScreen.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/MultiEventHomeScreen.kt @@ -58,7 +58,6 @@ import com.greenart7c3.nostrsigner.models.BunkerResponse import com.greenart7c3.nostrsigner.models.IntentData import com.greenart7c3.nostrsigner.models.Permission import com.greenart7c3.nostrsigner.models.SignerType -import com.greenart7c3.nostrsigner.models.TimeUtils import com.greenart7c3.nostrsigner.service.AmberUtils import com.greenart7c3.nostrsigner.service.ApplicationNameCache import com.greenart7c3.nostrsigner.service.BunkerRequestUtils @@ -74,6 +73,7 @@ import com.vitorpamplona.quartz.crypto.CryptoUtils import com.vitorpamplona.quartz.encoders.toHexKey import com.vitorpamplona.quartz.encoders.toNpub import com.vitorpamplona.quartz.events.LnZapRequestEvent +import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SingleEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SingleEventHomeScreen.kt index a71c3656..f764a6cf 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SingleEventHomeScreen.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SingleEventHomeScreen.kt @@ -32,7 +32,6 @@ import com.greenart7c3.nostrsigner.database.HistoryEntity import com.greenart7c3.nostrsigner.models.Account import com.greenart7c3.nostrsigner.models.IntentData import com.greenart7c3.nostrsigner.models.SignerType -import com.greenart7c3.nostrsigner.models.TimeUtils import com.greenart7c3.nostrsigner.models.kindToNip import com.greenart7c3.nostrsigner.service.AmberUtils import com.greenart7c3.nostrsigner.service.getAppCompatActivity @@ -44,6 +43,7 @@ import com.vitorpamplona.quartz.encoders.bechToBytes import com.vitorpamplona.quartz.encoders.toHexKey import com.vitorpamplona.quartz.encoders.toNpub import com.vitorpamplona.quartz.events.LnZapRequestEvent +import com.vitorpamplona.quartz.utils.TimeUtils import fr.acinq.secp256k1.Hex import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch