TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-19 16:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor refactoring

Browse Source
This commit is contained in:
nielsandriesse 2020-09-02 16:14:57 +10:00
parent 2866bdd0f1
commit 837ca48cde
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/org/thoughtcrime/securesms/loki/api/PublicChatPoller.kt
View File

@ -5,7 +5,6 @@ import android.os.Handler
import android.util.Log import android.util.Log
import nl.komponents.kovenant.Promise import nl.komponents.kovenant.Promise
import nl.komponents.kovenant.functional.bind import nl.komponents.kovenant.functional.bind
import nl.komponents.kovenant.then
import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.ApplicationContext
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
import org.thoughtcrime.securesms.database.Address import org.thoughtcrime.securesms.database.Address
@ -34,7 +33,7 @@ import java.util.*
class PublicChatPoller(private val context: Context, private val group: PublicChat) { class PublicChatPoller(private val context: Context, private val group: PublicChat) {
private val handler = Handler() private val handler = Handler()
private var hasStarted = false private var hasStarted = false
private var isPolling = false private var isPollOngoing = false
public var isCaughtUp = false public var isCaughtUp = false
// region Convenience // region Convenience
@ -211,8 +210,8 @@ class PublicChatPoller(private val context: Context, private val group: PublicCh
} }
} }
} }
if (isPolling) { return } if (isPollOngoing) { return }
isPolling = true isPollOngoing = true
val userDevices = MultiDeviceProtocol.shared.getAllLinkedDevices(userHexEncodedPublicKey) val userDevices = MultiDeviceProtocol.shared.getAllLinkedDevices(userHexEncodedPublicKey)
var uniqueDevices = setOf<String>() var uniqueDevices = setOf<String>()
val userPrivateKey = IdentityKeyUtil.getIdentityKeyPair(context).privateKey.serialize() val userPrivateKey = IdentityKeyUtil.getIdentityKeyPair(context).privateKey.serialize()
@ -250,10 +249,10 @@ class PublicChatPoller(private val context: Context, private val group: PublicCh
} }
} }
isCaughtUp = true isCaughtUp = true
isPolling = false isPollOngoing = false
}.fail { }.fail {
Log.d("Loki", "Failed to get messages for group chat with ID: ${group.channel} on server: ${group.server}.") Log.d("Loki", "Failed to get messages for group chat with ID: ${group.channel} on server: ${group.server}.")
isPolling = false isPollOngoing = false
} }
} }