laantungir/Amber
1
0
Fork 0
mirror of https://github.com/greenart7c3/Amber.git synced 2026-10-06 11:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix reject button not working

Browse Source
This commit is contained in:
greenart7c3
2024-08-19 13:52:29 -03:00
parent 6203daa174
commit 1b9fb442cf
1 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/greenart7c3/nostrsigner/ui/components/SingleEventHomeScreen.kt
+29 -14
View File
@@ -22,6 +22,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.greenart7c3.nostrsigner.LocalPreferences
import com.greenart7c3.nostrsigner.NostrSigner
import com.greenart7c3.nostrsigner.R
import com.greenart7c3.nostrsigner.database.AppDatabase
import com.greenart7c3.nostrsigner.database.ApplicationEntity
@@ -35,6 +36,7 @@ import com.greenart7c3.nostrsigner.models.kindToNip
import com.greenart7c3.nostrsigner.service.AmberUtils
import com.greenart7c3.nostrsigner.service.getAppCompatActivity
import com.greenart7c3.nostrsigner.service.toShortenHex
import com.greenart7c3.nostrsigner.ui.NotificationType
import com.greenart7c3.nostrsigner.ui.sendResult
import com.vitorpamplona.quartz.crypto.CryptoUtils
import com.vitorpamplona.quartz.encoders.bechToBytes
@@ -471,11 +473,26 @@ fun SingleEventHomeScreen(
)
},
{
onLoading(true)
coroutineScope.launch(Dispatchers.IO) {
if (key == "null") {
return@launch
}
val defaultRelays = NostrSigner.getInstance().settings.defaultRelays
val savedApplication = database.applicationDao().getByKey(key)
val relays = if (savedApplication != null) {
savedApplication.application.relays.ifEmpty { defaultRelays }
} else {
intentData.bunkerRequest?.relays?.ifEmpty { defaultRelays } ?: defaultRelays
}
if (intentData.bunkerRequest != null) {
NostrSigner.getInstance().checkForNewRelays(
NostrSigner.getInstance().settings.notificationType != NotificationType.DIRECT,
relays.toSet(),
)
}
if (remember.value) {
AmberUtils.acceptOrRejectPermission(
key,
@@ -488,8 +505,6 @@ fun SingleEventHomeScreen(
)
}
val savedApplication = database.applicationDao().getByKey(key)
val relays = intentData.bunkerRequest?.relays ?: listOf()
val application =
savedApplication ?: ApplicationWithPermissions(
application = ApplicationEntity(
@@ -520,19 +535,19 @@ fun SingleEventHomeScreen(
false,
),
)
}
if (intentData.bunkerRequest != null) {
AmberUtils.sendBunkerError(
account,
intentData.bunkerRequest,
applicationEntity?.application?.relays ?: emptyList(),
context,
onLoading,
)
} else {
context.getAppCompatActivity()?.intent = null
context.getAppCompatActivity()?.finish()
if (intentData.bunkerRequest != null) {
AmberUtils.sendBunkerError(
account,
intentData.bunkerRequest,
relays,
context,
onLoading,
)
} else {
context.getAppCompatActivity()?.intent = null
context.getAppCompatActivity()?.finish()
}
}
},
)