null
/
Closer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: sealed reveal flow fixes (batch v1.0.19)

This commit is contained in:
null 2026-06-20 01:40:24 -05:00
parent b64ae1f29a
commit 737514d18f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/app/closer/crypto/SealedRevealManager.kt
View File

@ -44,7 +44,8 @@ class SealedRevealManager @Inject constructor(
userId: String, userId: String,
partnerId: String partnerId: String
): Boolean { ): Boolean {
val oneTimeKey = pendingAnswerKeyStore.load(questionId) ?: return false val storeKey = "daily_${date}_${questionId}"
val oneTimeKey = pendingAnswerKeyStore.load(storeKey) ?: return false
val partnerPublicKey = deviceKeyDataSource.getPublicKey(partnerId) ?: return false val partnerPublicKey = deviceKeyDataSource.getPublicKey(partnerId) ?: return false
val keybox = releaseKeyEncryptor.wrapForRecipient( val keybox = releaseKeyEncryptor.wrapForRecipient(
@ -64,7 +65,7 @@ class SealedRevealManager @Inject constructor(
encryptedAnswerKey = keybox encryptedAnswerKey = keybox
) )
pendingAnswerKeyStore.remove(questionId) pendingAnswerKeyStore.remove(storeKey)
return true return true
} }

2
app/src/main/java/app/closer/data/remote/FirestoreAnswerDataSource.kt
View File

@ -87,7 +87,7 @@ class FirestoreAnswerDataSource @Inject constructor(
answer.writtenText, answer.selectedOptionIds, answer.scaleValue answer.writtenText, answer.selectedOptionIds, answer.scaleValue
) )
pendingAnswerKeyStore.store(questionId, oneTimeKey) pendingAnswerKeyStore.store("daily_${date}_${questionId}", oneTimeKey)
val data = mapOf( val data = mapOf(
"userId" to userId, "userId" to userId,

3
app/src/main/java/app/closer/ui/answers/AnswerRevealViewModel.kt
View File

@ -130,7 +130,8 @@ class AnswerRevealViewModel @Inject constructor(
private fun computeSealedPhase(answer: LocalAnswer?, partnerAnswer: LocalAnswer?): SealedRevealPhase { private fun computeSealedPhase(answer: LocalAnswer?, partnerAnswer: LocalAnswer?): SealedRevealPhase {
if (answer?.schemaVersion != 3) return SealedRevealPhase.NONE if (answer?.schemaVersion != 3) return SealedRevealPhase.NONE
if (answer.isRevealed) return SealedRevealPhase.REVEALED if (answer.isRevealed) return SealedRevealPhase.REVEALED
if (!pendingAnswerKeyStore.hasPendingKey(questionId)) return SealedRevealPhase.LOST_LOCAL_KEY val pendingKey = "daily_${answer.answerDate}_${questionId}"
if (!pendingAnswerKeyStore.hasPendingKey(pendingKey)) return SealedRevealPhase.LOST_LOCAL_KEY
return if (partnerAnswer != null) SealedRevealPhase.BOTH_ANSWERED else SealedRevealPhase.ANSWER_SEALED return if (partnerAnswer != null) SealedRevealPhase.BOTH_ANSWERED else SealedRevealPhase.ANSWER_SEALED
} }