TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 14:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean

Browse Source
This commit is contained in:
nielsandriesse
2020-08-07 10:53:36 +10:00
parent 944f85ddb9
commit 15f3942838
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/loki/protocol/PushNullMessageSendJob.kt → src/org/thoughtcrime/securesms/loki/protocol/NullMessageSendJob.kt
View File

@@ -18,7 +18,7 @@ import java.security.SecureRandom
import java.util.*
import java.util.concurrent.TimeUnit
class PushNullMessageSendJob private constructor(parameters: Parameters, private val publicKey: String) : BaseJob(parameters) {
class NullMessageSendJob private constructor(parameters: Parameters, private val publicKey: String) : BaseJob(parameters) {
companion object {
const val KEY = "PushNullMessageSendJob"
@@ -70,12 +70,12 @@ class PushNullMessageSendJob private constructor(parameters: Parameters, private
override fun onCanceled() { }
class Factory : Job.Factory<PushNullMessageSendJob> {
class Factory : Job.Factory<NullMessageSendJob> {
override fun create(parameters: Parameters, data: Data): PushNullMessageSendJob {
override fun create(parameters: Parameters, data: Data): NullMessageSendJob {
try {
val publicKey = data.getString("publicKey")
return PushNullMessageSendJob(parameters, publicKey)
return NullMessageSendJob(parameters, publicKey)
} catch (e: IOException) {
throw AssertionError(e)
}

4
src/org/thoughtcrime/securesms/loki/protocol/SessionManagementProtocol.kt
View File

@@ -76,7 +76,7 @@ object SessionManagementProtocol {
val preKeyBundle = preKeyBundleMessage.getPreKeyBundle(registrationID)
lokiPreKeyBundleDatabase.setPreKeyBundle(publicKey, preKeyBundle)
DatabaseFactory.getLokiAPIDatabase(context).setSessionRequestProcessedTimestamp(publicKey, Date().time)
val job = PushNullMessageSendJob(publicKey)
val job = NullMessageSendJob(publicKey)
ApplicationContext.getInstance(context).jobManager.add(job)
}
@@ -89,7 +89,7 @@ object SessionManagementProtocol {
sessionStore.archiveAllSessions(content.sender)
lokiThreadDB.setSessionResetStatus(content.sender, SessionResetStatus.REQUEST_RECEIVED)
Log.d("Loki", "Sending an ephemeral message back to: ${content.sender}.")
val job = PushNullMessageSendJob(content.sender)
val job = NullMessageSendJob(content.sender)
ApplicationContext.getInstance(context).jobManager.add(job)
SecurityEvent.broadcastSecurityUpdateEvent(context)
}

8
src/org/thoughtcrime/securesms/loki/protocol/PushSessionRequestMessageSendJob.kt → src/org/thoughtcrime/securesms/loki/protocol/SessionRequestMessageSendJob.kt
View File

@@ -19,7 +19,7 @@ import java.security.SecureRandom
import java.util.*
import java.util.concurrent.TimeUnit
class PushSessionRequestMessageSendJob private constructor(parameters: Parameters, private val publicKey: String, private val timestamp: Long) : BaseJob(parameters) {
class SessionRequestMessageSendJob private constructor(parameters: Parameters, private val publicKey: String, private val timestamp: Long) : BaseJob(parameters) {
companion object {
const val KEY = "PushSessionRequestMessageSendJob"
@@ -92,13 +92,13 @@ class PushSessionRequestMessageSendJob private constructor(parameters: Parameter
}
}
class Factory : Job.Factory<PushSessionRequestMessageSendJob> {
class Factory : Job.Factory<SessionRequestMessageSendJob> {
override fun create(parameters: Parameters, data: Data): PushSessionRequestMessageSendJob {
override fun create(parameters: Parameters, data: Data): SessionRequestMessageSendJob {
try {
val publicKey = data.getString("publicKey")
val timestamp = data.getLong("timestamp")
return PushSessionRequestMessageSendJob(parameters, publicKey, timestamp)
return SessionRequestMessageSendJob(parameters, publicKey, timestamp)
} catch (e: IOException) {
throw AssertionError(e)
}

2
src/org/thoughtcrime/securesms/loki/protocol/SessionResetImplementation.kt
View File

@@ -19,7 +19,7 @@ class SessionResetImplementation(private val context: Context) : SessionResetPro
override fun onNewSessionAdopted(publicKey: String, oldSessionResetStatus: SessionResetStatus) {
if (oldSessionResetStatus == SessionResetStatus.IN_PROGRESS) {
val job = PushNullMessageSendJob(publicKey)
val job = NullMessageSendJob(publicKey)
ApplicationContext.getInstance(context).jobManager.add(job)
}
// TODO: Show session reset succeed message