ProtonMail
/
proton-mail-android
mirror of https://github.com/ProtonMail/proton-mail-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unneded 'request pending' boolean flag 

MAILAND-1767
This commit is contained in:
Marino Meneghel 2021-05-17 17:24:39 +02:00
parent 34fce5c331
commit aef1daf21e
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/ch/protonmail/android/activities/messageDetails/RegisterReloadTask.kt
View File

@ -23,21 +23,16 @@ import ch.protonmail.android.core.ProtonMailApplication
import ch.protonmail.android.data.local.MessageDatabase
import ch.protonmail.android.data.local.model.Message
import ch.protonmail.android.jobs.FetchMessageDetailJob
import java.util.concurrent.atomic.AtomicBoolean
internal class RegisterReloadTask(
private val message: Message,
private val requestPending: AtomicBoolean
):AsyncTask<Void,Void,Void>() {
internal class RegisterReloadTask(private val message: Message) : AsyncTask<Void, Void, Void>() {
override fun doInBackground(vararg voids:Void):Void? {
val app = ProtonMailApplication.getApplication()
val messagesDatabase = MessageDatabase.getInstance(app, app.userManager.requireCurrentUserId()).getDao()
val jobManager = app.jobManager
if(message.checkIfAttHeadersArePresent(messagesDatabase)) {
requestPending.set(true)
jobManager.addJobInBackground(FetchMessageDetailJob(message.messageId))
}
return null
}
override fun doInBackground(vararg voids: Void): Void? {
val app = ProtonMailApplication.getApplication()
val messagesDatabase = MessageDatabase.getInstance(app, app.userManager.requireCurrentUserId()).getDao()
val jobManager = app.jobManager
if (message.checkIfAttHeadersArePresent(messagesDatabase)) {
jobManager.addJobInBackground(FetchMessageDetailJob(message.messageId))
}
return null
}
}

4
app/src/main/java/ch/protonmail/android/activities/messageDetails/viewmodel/MessageDetailsViewModel.kt
View File

@ -127,7 +127,6 @@ internal class MessageDetailsViewModel @Inject constructor(
private var _embeddedImagesToFetch: ArrayList<EmbeddedImage> = ArrayList()
private var remoteContentDisplayed: Boolean = false
private val requestPending = AtomicBoolean(false)
var renderedFromCache = AtomicBoolean(false)
var refreshedKeys: Boolean = true
@ -234,7 +233,6 @@ internal class MessageDetailsViewModel @Inject constructor(
if (message == null) {
Timber.d("Failed fetching Message Details for message $messageId")
requestPending.set(false)
_messageDetailsError.postValue(Event("Failed getting message details"))
return@launch
}
@ -510,7 +508,7 @@ internal class MessageDetailsViewModel @Inject constructor(
_reloadRecipientsEvent.value = Event(true)
// render with the new verification keys
if (renderingPassed && message != null) {
RegisterReloadTask(message, requestPending).execute()
RegisterReloadTask(message).execute()
}
}