Skip to content

Added a retry strategy to get idToken.| #1614 #1663

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
IvanPizhenko merged 1 commit into from
Jan 26, 2022
Merged

Added a retry strategy to get idToken.| #1614 #1663

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 18 additions & 10 deletions ...src/main/java/com/flowcrypt/email/jetpack/workmanager/HandlePasswordProtectedMsgWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import com.google.android.gms.auth.api.signin.GoogleSignIn
import com.google.gson.GsonBuilder
import com.sun.mail.util.MailConnectException
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.withContext
import org.bouncycastle.openpgp.PGPPublicKeyRingCollection
import org.bouncycastle.openpgp.PGPSecretKeyRingCollection
Expand All @@ -49,6 +50,7 @@ import java.io.InputStream
import java.net.SocketException
import java.util.Base64
import java.util.Properties
import java.util.concurrent.TimeUnit
import javax.mail.Address
import javax.mail.Message
import javax.mail.MessagingException
Expand Down Expand Up @@ -387,17 +389,22 @@ class HandlePasswordProtectedMsgWorker(context: Context, params: WorkerParameter
return@withContext String(decryptionResult.content?.toByteArray() ?: byteArrayOf())
}

private suspend fun getGoogleIdToken(): String = withContext(Dispatchers.IO) {
val googleSignInClient = GoogleSignIn.getClient(
applicationContext,
GoogleApiClientHelper.generateGoogleSignInOptions()
)
val silentSignIn = googleSignInClient.silentSignIn()
if (!silentSignIn.isSuccessful) {
throw IllegalStateException("Could not receive idToken")
private suspend fun getGoogleIdToken(retryAttempt: Int = 0): String =
withContext(Dispatchers.IO) {
val googleSignInClient = GoogleSignIn.getClient(
applicationContext,
GoogleApiClientHelper.generateGoogleSignInOptions()
)
val silentSignIn = googleSignInClient.silentSignIn()
if (!silentSignIn.isSuccessful || silentSignIn.result.isExpired) {
if (retryAttempt <= RETRY_ATTEMPTS_COUNT_FOR_GETTING_ID_TOKEN) {
//do delay for 10 seconds and try again. Max attempts == RETRY_ATTEMPTS_COUNT_FOR_GETTING_ID_TOKEN
delay(TimeUnit.SECONDS.toMillis(10))
return@withContext getGoogleIdToken(retryAttempt + 1)
} else throw IllegalStateException("Could not receive idToken")
}
return@withContext requireNotNull(silentSignIn.result.idToken)
}
return@withContext requireNotNull(silentSignIn.result.idToken)
}

private suspend fun fetchReplyToken(
apiRepository: FlowcryptApiRepository,
Expand Down Expand Up @@ -427,6 +434,7 @@ class HandlePasswordProtectedMsgWorker(context: Context, params: WorkerParameter

companion object {
private val TAG = HandlePasswordProtectedMsgWorker::class.java.simpleName
private const val RETRY_ATTEMPTS_COUNT_FOR_GETTING_ID_TOKEN = 6
val NAME = HandlePasswordProtectedMsgWorker::class.java.simpleName

private fun genInfoDiv(replyInfo: String?) =
Expand Down