Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor

app/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java

@@ -33,6 +33,7 @@ import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiUserDatabase;
+import org.thoughtcrime.securesms.loki.database.SessionJobDatabase;
 import org.thoughtcrime.securesms.loki.database.SharedSenderKeysDatabase;
 
 public class DatabaseFactory {
@@ -67,6 +68,7 @@ public class DatabaseFactory {
   private final LokiUserDatabase lokiUserDatabase;
   private final LokiBackupFilesDatabase lokiBackupFilesDatabase;
   private final SharedSenderKeysDatabase sskDatabase;
+  private final SessionJobDatabase sessionJobDatabase;
 
   // Refactor
   private final Storage storage;
@@ -177,6 +179,10 @@ public class DatabaseFactory {
   public static SharedSenderKeysDatabase getSSKDatabase(Context context) {
     return getInstance(context).sskDatabase;
   }
+
+  public static SessionJobDatabase getSessionJobDatabase(Context context) {
+    return getInstance(context).sessionJobDatabase;
+  }
   // endregion
 
   // region Refactor
@@ -226,6 +232,7 @@ public class DatabaseFactory {
     this.sskDatabase               = new SharedSenderKeysDatabase(context, databaseHelper);
     this.storage                   = new Storage(context, databaseHelper);
     this.attachmentProvider        = new DatabaseAttachmentProvider(context, databaseHelper);
+    this.sessionJobDatabase        = new SessionJobDatabase(context, databaseHelper);
   }
 
 }

app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

@@ -6,6 +6,7 @@ import com.google.protobuf.ByteString
 import org.session.libsession.messaging.StorageProtocol
 import org.session.libsession.messaging.jobs.AttachmentUploadJob
 import org.session.libsession.messaging.jobs.Job
+import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.messaging.jobs.MessageSendJob
 import org.session.libsession.messaging.messages.Message
 import org.session.libsession.messaging.messages.visible.Attachment
@@ -80,10 +81,6 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         return registrationID
     }
 
-    override fun persist(job: Job) {
-        TODO("Not yet implemented")
-    }
-
     override fun persist(attachments: List<Attachment>): List<Long> {
         TODO("Not yet implemented")
     }
@@ -128,34 +125,44 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         return messageID
     }
 
+    // JOBS
+
+    override fun persist(job: Job) {
+        DatabaseFactory.getSessionJobDatabase(context).persistJob(job)
+    }
+
     override fun markJobAsSucceeded(job: Job) {
-        TODO("Not yet implemented")
+        DatabaseFactory.getSessionJobDatabase(context).markJobAsSucceeded(job)
     }
 
     override fun markJobAsFailed(job: Job) {
-        TODO("Not yet implemented")
+        DatabaseFactory.getSessionJobDatabase(context).markJobAsFailed(job)
     }
 
     override fun getAllPendingJobs(type: String): List<Job> {
-        TODO("Not yet implemented")
+        return DatabaseFactory.getSessionJobDatabase(context).getAllPendingJobs(type)
     }
 
     override fun getAttachmentUploadJob(attachmentID: Long): AttachmentUploadJob? {
-        TODO("Not yet implemented")
+        return DatabaseFactory.getSessionJobDatabase(context).getAttachmentUploadJob(attachmentID)
     }
 
     override fun getMessageSendJob(messageSendJobID: String): MessageSendJob? {
-        TODO("Not yet implemented")
+        return DatabaseFactory.getSessionJobDatabase(context).getMessageSendJob(messageSendJobID)
     }
 
     override fun resumeMessageSendJobIfNeeded(messageSendJobID: String) {
-        TODO("Not yet implemented")
+        val job = DatabaseFactory.getSessionJobDatabase(context).getMessageSendJob(messageSendJobID) ?: return
+        job.delegate = JobQueue.shared
+        job.execute()
     }
 
     override fun isJobCanceled(job: Job): Boolean {
-        TODO("Not yet implemented")
+        return DatabaseFactory.getSessionJobDatabase(context).isJobCanceled(job)
     }
 
+    // Authorization
+
     override fun getAuthToken(server: String): String? {
         return DatabaseFactory.getLokiAPIDatabase(context).getAuthToken(server)
     }

app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionJobDatabase.kt

@@ -1,4 +1,94 @@
 package org.thoughtcrime.securesms.loki.database
 
-class SessionJobDatabase {
+import android.content.ContentValues
+import android.content.Context
+import net.sqlcipher.Cursor
+import org.session.libsession.messaging.jobs.*
+import org.thoughtcrime.securesms.database.Database
+import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
+import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer
+import org.thoughtcrime.securesms.loki.utilities.*
+
+class SessionJobDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper) {
+
+    companion object {
+        private val sessionJobTable = "loki_thread_session_reset_database"
+        val jobID = "job_id"
+        val jobType = "job_type"
+        val failureCount = "failure_count"
+        val serializedData = "serialized_data"
+        @JvmStatic val createSessionJobTableCommand = "CREATE TABLE $sessionJobTable ($jobID INTEGER PRIMARY KEY, $jobType STRING, $failureCount INTEGER DEFAULT 0, $serializedData TEXT);"
+    }
+
+    fun persistJob(job: Job) {
+        val database = databaseHelper.writableDatabase
+        val contentValues = ContentValues(2)
+        contentValues.put(jobID, job.id)
+        contentValues.put(jobType, job.getFactoryKey())
+        contentValues.put(failureCount, job.failureCount)
+        contentValues.put(serializedData, SessionJobHelper.dataSerializer.serialize(job.serialize()))
+        database.insertOrUpdate(sessionJobTable, contentValues, "$jobID = ?", arrayOf(jobID.toString()))
+    }
+
+    fun markJobAsSucceeded(job: Job) {
+        databaseHelper.writableDatabase.delete(sessionJobTable, "$jobID = ?", arrayOf(job.id))
+    }
+
+    fun markJobAsFailed(job: Job) {
+        databaseHelper.writableDatabase.delete(sessionJobTable, "$jobID = ?", arrayOf(job.id))
+    }
+
+    fun getAllPendingJobs(type: String): List<Job> {
+        val database = databaseHelper.readableDatabase
+        return database.getAll(sessionJobTable, "$jobType = ?", arrayOf(type)) { cursor ->
+            jobFromCursor(cursor)
+        }
+    }
+
+    fun getAttachmentUploadJob(attachmentID: Long): AttachmentUploadJob? {
+        val database = databaseHelper.readableDatabase
+        var result = mutableListOf<AttachmentUploadJob>()
+        database.getAll(sessionJobTable, "$jobType = ?", arrayOf(AttachmentUploadJob.KEY)) { cursor ->
+            result.add(jobFromCursor(cursor) as AttachmentUploadJob)
+        }
+        return result.first { job -> job.attachmentID == attachmentID }
+    }
+
+    fun getMessageSendJob(messageSendJobID: String): MessageSendJob? {
+        val database = databaseHelper.readableDatabase
+        return database.get(sessionJobTable, "$jobID = ? AND $jobType = ?", arrayOf(messageSendJobID, MessageSendJob.KEY)) { cursor ->
+            jobFromCursor(cursor) as MessageSendJob
+        }
+    }
+
+    fun isJobCanceled(job: Job): Boolean {
+        val database = databaseHelper.readableDatabase
+        var cursor: android.database.Cursor? = null
+        try {
+            cursor = database.rawQuery("SELECT * FROM $sessionJobTable WHERE $jobID = ?", arrayOf(job.id))
+            return cursor != null && cursor.moveToFirst()
+        } catch (e: Exception) {
+            // Do nothing
+        }  finally {
+            cursor?.close()
+        }
+        return false
+    }
+
+    private fun jobFromCursor(cursor: Cursor): Job {
+        val type = cursor.getString(jobType)
+        val data = SessionJobHelper.dataSerializer.deserialize(cursor.getString(serializedData))
+        val job = SessionJobHelper.sessionJobInstantiator.instantiate(type, data)
+        job.id = cursor.getString(jobID)
+        job.failureCount = cursor.getInt(failureCount)
+        return job
+    }
+}
+
+class SessionJobHelper() {
+
+    companion object {
+        val dataSerializer: Data.Serializer = JsonDataSerializer()
+        val sessionJobInstantiator: SessionJobInstantiator = SessionJobInstantiator(SessionJobManagerFactories.getSessionJobFactories())
+    }
 }