|
|
|
@ -6,7 +6,6 @@ import android.util.Log
|
|
|
|
import org.thoughtcrime.securesms.database.Database
|
|
|
|
import org.thoughtcrime.securesms.database.Database
|
|
|
|
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
|
|
|
|
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
|
|
|
|
import org.thoughtcrime.securesms.loki.utilities.*
|
|
|
|
import org.thoughtcrime.securesms.loki.utilities.*
|
|
|
|
import org.thoughtcrime.securesms.util.TextSecurePreferences
|
|
|
|
|
|
|
|
import org.whispersystems.signalservice.loki.api.Snode
|
|
|
|
import org.whispersystems.signalservice.loki.api.Snode
|
|
|
|
import org.whispersystems.signalservice.loki.database.LokiAPIDatabaseProtocol
|
|
|
|
import org.whispersystems.signalservice.loki.database.LokiAPIDatabaseProtocol
|
|
|
|
import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.DeviceLink
|
|
|
|
import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.DeviceLink
|
|
|
|
@ -71,6 +70,10 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
|
|
|
|
// Open group public keys
|
|
|
|
// Open group public keys
|
|
|
|
private val openGroupPublicKeyTable = "open_group_public_keys"
|
|
|
|
private val openGroupPublicKeyTable = "open_group_public_keys"
|
|
|
|
@JvmStatic val createOpenGroupPublicKeyTableCommand = "CREATE TABLE $openGroupPublicKeyTable ($server STRING PRIMARY KEY, $publicKey INTEGER DEFAULT 0);"
|
|
|
|
@JvmStatic val createOpenGroupPublicKeyTableCommand = "CREATE TABLE $openGroupPublicKeyTable ($server STRING PRIMARY KEY, $publicKey INTEGER DEFAULT 0);"
|
|
|
|
|
|
|
|
// Open group profile picture cache
|
|
|
|
|
|
|
|
private val openGroupProfilePictureTable = "open_group_avatar_cache"
|
|
|
|
|
|
|
|
private val openGroupProfilePicture = "open_group_avatar"
|
|
|
|
|
|
|
|
@JvmStatic val createOpenGroupProfilePictureTableCommand = "CREATE TABLE $openGroupProfilePictureTable ($publicChatID STRING PRIMARY KEY, $openGroupProfilePicture TEXT NULLABLE DEFAULT NULL);"
|
|
|
|
|
|
|
|
|
|
|
|
// region Deprecated
|
|
|
|
// region Deprecated
|
|
|
|
private val deviceLinkCache = "loki_pairing_authorisation_cache"
|
|
|
|
private val deviceLinkCache = "loki_pairing_authorisation_cache"
|
|
|
|
@ -114,6 +117,30 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
|
|
|
|
database.insertOrUpdate(snodePoolTable, row, "${Companion.dummyKey} = ?", wrap("dummy_key"))
|
|
|
|
database.insertOrUpdate(snodePoolTable, row, "${Companion.dummyKey} = ?", wrap("dummy_key"))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
override fun setOnionRequestPaths(newValue: List<List<Snode>>) {
|
|
|
|
|
|
|
|
// FIXME: This approach assumes either 1 or 2 paths of length 3 each. We should do better than this.
|
|
|
|
|
|
|
|
val database = databaseHelper.writableDatabase
|
|
|
|
|
|
|
|
fun set(indexPath: String, snode: Snode) {
|
|
|
|
|
|
|
|
var snodeAsString = "${snode.address}-${snode.port}"
|
|
|
|
|
|
|
|
val keySet = snode.publicKeySet
|
|
|
|
|
|
|
|
if (keySet != null) {
|
|
|
|
|
|
|
|
snodeAsString += "-${keySet.ed25519Key}-${keySet.x25519Key}"
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
val row = wrap(mapOf( Companion.indexPath to indexPath, Companion.snode to snodeAsString ))
|
|
|
|
|
|
|
|
database.insertOrUpdate(onionRequestPathTable, row, "${Companion.indexPath} = ?", wrap(indexPath))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
Log.d("Loki", "Persisting onion request paths to database.")
|
|
|
|
|
|
|
|
clearOnionRequestPaths()
|
|
|
|
|
|
|
|
if (newValue.count() < 1) { return }
|
|
|
|
|
|
|
|
val path0 = newValue[0]
|
|
|
|
|
|
|
|
if (path0.count() != 3) { return }
|
|
|
|
|
|
|
|
set("0-0", path0[0]); set("0-1", path0[1]); set("0-2", path0[2])
|
|
|
|
|
|
|
|
if (newValue.count() < 2) { return }
|
|
|
|
|
|
|
|
val path1 = newValue[1]
|
|
|
|
|
|
|
|
if (path1.count() != 3) { return }
|
|
|
|
|
|
|
|
set("1-0", path1[0]); set("1-1", path1[1]); set("1-2", path1[2])
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
override fun getOnionRequestPaths(): List<List<Snode>> {
|
|
|
|
override fun getOnionRequestPaths(): List<List<Snode>> {
|
|
|
|
val database = databaseHelper.readableDatabase
|
|
|
|
val database = databaseHelper.readableDatabase
|
|
|
|
fun get(indexPath: String): Snode? {
|
|
|
|
fun get(indexPath: String): Snode? {
|
|
|
|
@ -131,10 +158,16 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
val path0Snode0 = get("0-0") ?: return listOf(); val path0Snode1 = get("0-1") ?: return listOf()
|
|
|
|
val result = mutableListOf<List<Snode>>()
|
|
|
|
val path0Snode2 = get("0-2") ?: return listOf(); val path1Snode0 = get("1-0") ?: return listOf()
|
|
|
|
val path0Snode0 = get("0-0"); val path0Snode1 = get("0-1"); val path0Snode2 = get("0-2")
|
|
|
|
val path1Snode1 = get("1-1") ?: return listOf(); val path1Snode2 = get("1-2") ?: return listOf()
|
|
|
|
if (path0Snode0 != null && path0Snode1 != null && path0Snode2 != null) {
|
|
|
|
return listOf( listOf( path0Snode0, path0Snode1, path0Snode2 ), listOf( path1Snode0, path1Snode1, path1Snode2 ) )
|
|
|
|
result.add(listOf( path0Snode0, path0Snode1, path0Snode2 ))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
val path1Snode0 = get("1-0"); val path1Snode1 = get("1-1"); val path1Snode2 = get("1-2")
|
|
|
|
|
|
|
|
if (path1Snode0 != null && path1Snode1 != null && path1Snode2 != null) {
|
|
|
|
|
|
|
|
result.add(listOf( path1Snode0, path1Snode1, path1Snode2 ))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return result
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
override fun clearOnionRequestPaths() {
|
|
|
|
override fun clearOnionRequestPaths() {
|
|
|
|
@ -147,28 +180,6 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
|
|
|
|
delete("1-1"); delete("1-2")
|
|
|
|
delete("1-1"); delete("1-2")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
override fun setOnionRequestPaths(newValue: List<List<Snode>>) {
|
|
|
|
|
|
|
|
// TODO: Make this work with arbitrary paths
|
|
|
|
|
|
|
|
if (newValue.count() != 2) { return }
|
|
|
|
|
|
|
|
val path0 = newValue[0]
|
|
|
|
|
|
|
|
val path1 = newValue[1]
|
|
|
|
|
|
|
|
if (path0.count() != 3 || path1.count() != 3) { return }
|
|
|
|
|
|
|
|
Log.d("Loki", "Persisting onion request paths to database.")
|
|
|
|
|
|
|
|
val database = databaseHelper.writableDatabase
|
|
|
|
|
|
|
|
fun set(indexPath: String, snode: Snode) {
|
|
|
|
|
|
|
|
var snodeAsString = "${snode.address}-${snode.port}"
|
|
|
|
|
|
|
|
val keySet = snode.publicKeySet
|
|
|
|
|
|
|
|
if (keySet != null) {
|
|
|
|
|
|
|
|
snodeAsString += "-${keySet.ed25519Key}-${keySet.x25519Key}"
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
val row = wrap(mapOf( Companion.indexPath to indexPath, Companion.snode to snodeAsString ))
|
|
|
|
|
|
|
|
database.insertOrUpdate(onionRequestPathTable, row, "${Companion.indexPath} = ?", wrap(indexPath))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
set("0-0", path0[0]); set("0-1", path0[1])
|
|
|
|
|
|
|
|
set("0-2", path0[2]); set("1-0", path1[0])
|
|
|
|
|
|
|
|
set("1-1", path1[1]); set("1-2", path1[2])
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
override fun getSwarm(publicKey: String): Set<Snode>? {
|
|
|
|
override fun getSwarm(publicKey: String): Set<Snode>? {
|
|
|
|
val database = databaseHelper.readableDatabase
|
|
|
|
val database = databaseHelper.readableDatabase
|
|
|
|
return database.get(swarmTable, "${Companion.swarmPublicKey} = ?", wrap(publicKey)) { cursor ->
|
|
|
|
return database.get(swarmTable, "${Companion.swarmPublicKey} = ?", wrap(publicKey)) { cursor ->
|
|
|
|
@ -343,6 +354,27 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
|
|
|
|
database.insertOrUpdate(openGroupPublicKeyTable, row, "${LokiAPIDatabase.server} = ?", wrap(server))
|
|
|
|
database.insertOrUpdate(openGroupPublicKeyTable, row, "${LokiAPIDatabase.server} = ?", wrap(server))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
override fun getOpenGroupProfilePictureURL(group: Long, server: String): String? {
|
|
|
|
|
|
|
|
val database = databaseHelper.readableDatabase
|
|
|
|
|
|
|
|
val index = "$server.$group"
|
|
|
|
|
|
|
|
return database.get(openGroupProfilePictureTable, "$publicChatID = ?", wrap(index)) { cursor ->
|
|
|
|
|
|
|
|
cursor.getString(openGroupProfilePicture)
|
|
|
|
|
|
|
|
}?.toString()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
override fun setOpenGroupProfilePictureURL(group: Long, server: String, newValue: String) {
|
|
|
|
|
|
|
|
val database = databaseHelper.writableDatabase
|
|
|
|
|
|
|
|
val index = "$server.$group"
|
|
|
|
|
|
|
|
val row = wrap(mapOf(publicChatID to index, openGroupProfilePicture to newValue))
|
|
|
|
|
|
|
|
database.insertOrUpdate(openGroupProfilePictureTable, row, "$publicChatID = ?", wrap(index))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fun clearOpenGroupProfilePictureURL(group: Long, server: String): Boolean {
|
|
|
|
|
|
|
|
val database = databaseHelper.writableDatabase
|
|
|
|
|
|
|
|
val index = "$server.$group"
|
|
|
|
|
|
|
|
return database.delete(openGroupProfilePictureTable, "$publicChatID = ?", arrayOf(index)) > 0
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// region Deprecated
|
|
|
|
// region Deprecated
|
|
|
|
override fun getDeviceLinks(publicKey: String): Set<DeviceLink> {
|
|
|
|
override fun getDeviceLinks(publicKey: String): Set<DeviceLink> {
|
|
|
|
return setOf()
|
|
|
|
return setOf()
|
|
|
|
|
Anton Chekulaev
4 years ago