Skip to content

Fix "message not found in the local cache" issue #1613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomholub merged 2 commits into from
Dec 17, 2021
Merged

Fix "message not found in the local cache" issue #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39ef262
Added a delay when use MsgsCacheManager.getMsgSnapshot().| #1549
DenBond7 Dec 16, 2021
a592bbf
Added MsgsCacheManager.getMsgSnapshotWithRetryStrategy(). Refactored …
DenBond7 Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions FlowCrypt/src/main/java/com/flowcrypt/email/api/email/MsgsCacheManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ import com.flowcrypt.email.BuildConfig
import com.flowcrypt.email.security.KeyStoreCryptoManager
import com.flowcrypt.email.util.ProgressOutputStream
import com.flowcrypt.email.util.cache.DiskLruCache
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.withContext
import okhttp3.internal.io.FileSystem
import okio.buffer
import java.io.File
Expand Down Expand Up @@ -69,6 +72,20 @@ object MsgsCacheManager {
return diskLruCache[key]
}

/**
* Due to the realization of [DiskLruCache] we need to add a little delay
* before fetching [DiskLruCache.Snapshot]
*/
suspend fun getMsgSnapshotWithRetryStrategy(key: String): DiskLruCache.Snapshot? =
withContext(Dispatchers.IO) {
var attemptsCount = 0
while (diskLruCache[key] == null && attemptsCount <= 50) {
delay(50)
attemptsCount++
}
return@withContext diskLruCache[key]
}

fun isMsgExist(key: String): Boolean {
val snapshot = diskLruCache[key] ?: return false
return snapshot.getLength(0) > 0
Expand Down
12 changes: 8 additions & 4 deletions FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MsgDetailsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,10 @@ class MsgDetailsViewModel(
Result.success(null)
}
if (result.status == Result.Status.SUCCESS) {
return@withContext MsgsCacheManager.getMsgSnapshot(messageEntity.id.toString())
?: throw java.lang.NullPointerException("Message not found in the local cache")
val snapshot =
MsgsCacheManager.getMsgSnapshotWithRetryStrategy(messageEntity.id.toString())
return@withContext snapshot
?: throw java.lang.NullPointerException("Message not found in the local cache (GOOGLE API)")
} else throw result.exception ?: java.lang.IllegalStateException(
context.getString(
R
Expand Down Expand Up @@ -553,8 +555,10 @@ class MsgDetailsViewModel(
)
)

return@execute MsgsCacheManager.getMsgSnapshot(messageEntity.id.toString())
?: throw java.lang.NullPointerException("Message not found in the local cache")
val snapshot =
MsgsCacheManager.getMsgSnapshotWithRetryStrategy(messageEntity.id.toString())
return@execute snapshot
?: throw java.lang.NullPointerException("Message not found in the local cache(IMAP)")
}
}
}
Expand Down