diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt b/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt index 87213df0..ae7ceb7b 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/SignerProvider.kt @@ -6,7 +6,6 @@ import android.database.Cursor import android.database.MatrixCursor import android.net.Uri import android.util.Log -import com.greenart7c3.nostrsigner.database.ApplicationPermissionsEntity import com.greenart7c3.nostrsigner.database.HistoryEntity2 import com.greenart7c3.nostrsigner.database.LogEntity import com.greenart7c3.nostrsigner.models.SignerType @@ -108,7 +107,7 @@ class SignerProvider : ContentProvider() { "SIGN_MESSAGE", ) val signPolicy = database.applicationDao().getSignPolicy(packageName) - val isRemembered = isRemembered(signPolicy, permission) + val isRemembered = IntentUtils.isRemembered(signPolicy, permission) if (isRemembered == null) { return null } @@ -206,7 +205,7 @@ class SignerProvider : ContentProvider() { } } val signPolicy = database.applicationDao().getSignPolicy(packageName) - val isRemembered = isRemembered(signPolicy, permission) + val isRemembered = IntentUtils.isRemembered(signPolicy, permission) if (isRemembered == null) { return null } @@ -306,7 +305,7 @@ class SignerProvider : ContentProvider() { } } val signPolicy = database.applicationDao().getSignPolicy(packageName) - val isRemembered = isRemembered(signPolicy, permission) + val isRemembered = IntentUtils.isRemembered(signPolicy, permission) if (isRemembered == null) { return null } @@ -411,7 +410,7 @@ class SignerProvider : ContentProvider() { ) val signPolicy = database.applicationDao().getSignPolicy(packageName) - val isRemembered = isRemembered(signPolicy, permission) + val isRemembered = IntentUtils.isRemembered(signPolicy, permission) if (isRemembered == null) { return null } @@ -485,20 +484,4 @@ class SignerProvider : ContentProvider() { ): Int { return 0 } - - fun isRemembered(signPolicy: Int?, permission: ApplicationPermissionsEntity?): Boolean? { - val rejectUntil = permission?.rejectUntil ?: 0 - val acceptUntil = permission?.acceptUntil ?: 0 - if (signPolicy == 2) { - return true - } - if (rejectUntil == 0L && acceptUntil == 0L) return null - return if (rejectUntil > TimeUtils.now() && rejectUntil > 0 && permission?.acceptable == false) { - false - } else if (acceptUntil > TimeUtils.now() && acceptUntil > 0 && permission?.acceptable == true) { - true - } else { - null - } - } } diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentUtils.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentUtils.kt index 9c7c66cd..cdda2589 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentUtils.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/IntentUtils.kt @@ -796,4 +796,20 @@ object IntentUtils { onLoading(false) } } + + fun isRemembered(signPolicy: Int?, permission: ApplicationPermissionsEntity?): Boolean? { + val rejectUntil = permission?.rejectUntil ?: 0 + val acceptUntil = permission?.acceptUntil ?: 0 + if (signPolicy == 2) { + return true + } + if (rejectUntil == 0L && acceptUntil == 0L) return null + return if (rejectUntil > TimeUtils.now() && rejectUntil > 0 && permission?.acceptable == false) { + false + } else if (acceptUntil > TimeUtils.now() && acceptUntil > 0 && permission?.acceptable == true) { + true + } else { + null + } + } } diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentSingleEventHomeScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentSingleEventHomeScreen.kt index c1c3cc68..2e06c8f6 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentSingleEventHomeScreen.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentSingleEventHomeScreen.kt @@ -38,7 +38,6 @@ import com.vitorpamplona.quartz.nip19Bech32.toNpub import com.vitorpamplona.quartz.nip55AndroidSigner.signString import com.vitorpamplona.quartz.nip57Zaps.LnZapRequestEvent import com.vitorpamplona.quartz.utils.Hex -import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -121,18 +120,7 @@ fun IntentSingleEventHomeScreen( it.pkKey == key && it.type == intentData.type.toString() } - val acceptUntil = permission?.acceptUntil ?: 0 - val rejectUntil = permission?.rejectUntil ?: 0 - - val acceptOrReject = if (rejectUntil == 0L && acceptUntil == 0L) { - null - } else if (rejectUntil > TimeUtils.now() && rejectUntil > 0) { - false - } else if (acceptUntil > TimeUtils.now() && acceptUntil > 0) { - true - } else { - null - } + val acceptOrReject = IntentUtils.isRemembered(applicationEntity?.application?.signPolicy, permission) SignMessage( account = account, @@ -195,18 +183,7 @@ fun IntentSingleEventHomeScreen( } } - val acceptUntil = permission?.acceptUntil ?: 0 - val rejectUntil = permission?.rejectUntil ?: 0 - - val acceptOrReject = if (rejectUntil == 0L && acceptUntil == 0L) { - null - } else if (rejectUntil > TimeUtils.now() && rejectUntil > 0) { - false - } else if (acceptUntil > TimeUtils.now() && acceptUntil > 0) { - true - } else { - null - } + val acceptOrReject = IntentUtils.isRemembered(applicationEntity?.application?.signPolicy, permission) EncryptDecryptData( account = account, @@ -284,18 +261,7 @@ fun IntentSingleEventHomeScreen( it.pkKey == key && ((it.type == intentData.type.toString() && it.kind == event.kind) || (nip != null && it.type == "NIP" && it.kind == nip)) } - val acceptUntil = permission?.acceptUntil ?: 0 - val rejectUntil = permission?.rejectUntil ?: 0 - - val acceptOrReject = if (rejectUntil == 0L && acceptUntil == 0L) { - null - } else if (rejectUntil > TimeUtils.now() && rejectUntil > 0) { - false - } else if (acceptUntil > TimeUtils.now() && acceptUntil > 0) { - true - } else { - null - } + val acceptOrReject = IntentUtils.isRemembered(applicationEntity?.application?.signPolicy, permission) EventData( account = account,