From 4c1df33059524c69432d84e038d219481db66126 Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <ryanzhaors@qq.com>
Date: Thu, 10 Dec 2020 15:31:38 +1100
Subject: [PATCH] job related

---
 .../session/libsession/messaging/jobs/JobQueue.kt    | 12 ++++++------
 .../libsession/messaging/jobs/MessageReceiveJob.kt   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt
index 0054a77b1d..6fbf1d8f12 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt
@@ -4,7 +4,7 @@ import kotlin.math.min
 import kotlin.math.pow
 import java.util.Timer
 
-import org.session.libsession.messaging.Configuration
+import org.session.libsession.messaging.MessagingConfiguration
 
 import org.session.libsignal.libsignal.logging.Log
 import kotlin.concurrent.schedule
@@ -25,7 +25,7 @@ class JobQueue : JobDelegate {
 
     fun addWithoutExecuting(job: Job) {
         job.id = System.currentTimeMillis().toString()
-        Configuration.shared.storage.persist(job)
+        MessagingConfiguration.shared.storage.persist(job)
         job.delegate = this
     }
 
@@ -37,7 +37,7 @@ class JobQueue : JobDelegate {
         hasResumedPendingJobs = true
         val allJobTypes = listOf(AttachmentDownloadJob.collection, AttachmentDownloadJob.collection, MessageReceiveJob.collection, MessageSendJob.collection, NotifyPNServerJob.collection)
         allJobTypes.forEach { type ->
-            val allPendingJobs = Configuration.shared.storage.getAllPendingJobs(type)
+            val allPendingJobs = MessagingConfiguration.shared.storage.getAllPendingJobs(type)
             allPendingJobs.sortedBy { it.id }.forEach { job ->
                 Log.i("Jobs", "Resuming pending job of type: ${job::class.simpleName}.")
                 job.delegate = this
@@ -47,12 +47,12 @@ class JobQueue : JobDelegate {
     }
 
     override fun handleJobSucceeded(job: Job) {
-        Configuration.shared.storage.markJobAsSucceeded(job)
+        MessagingConfiguration.shared.storage.markJobAsSucceeded(job)
     }
 
     override fun handleJobFailed(job: Job, error: Exception) {
         job.failureCount += 1
-        val storage = Configuration.shared.storage
+        val storage = MessagingConfiguration.shared.storage
         if (storage.isJobCanceled(job)) { return Log.i("Jobs", "${job::class.simpleName} canceled.")}
         storage.persist(job)
         if (job.failureCount == job.maxFailureCount) {
@@ -69,7 +69,7 @@ class JobQueue : JobDelegate {
 
     override fun handleJobFailedPermanently(job: Job, error: Exception) {
         job.failureCount += 1
-        val storage = Configuration.shared.storage
+        val storage = MessagingConfiguration.shared.storage
         storage.persist(job)
         storage.markJobAsFailed(job)
     }
diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt
index fb5e3d34b5..5f9ee29c6b 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt
@@ -1,6 +1,6 @@
 package org.session.libsession.messaging.jobs
 
-class MessageReceiveJob : Job {
+class MessageReceiveJob(val data: ByteArray, val isBackgroundPoll: Boolean, val openGroupMessageServerID: Long? = null, val openGroupID: String? = null) : Job {
     override var delegate: JobDelegate? = null
     override var id: String? = null
     override var failureCount: Int = 0