mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-25 09:17:44 +00:00
Merge branch 'master' of github.com:loki-project/loki-messenger-android
This commit is contained in:
commit
3e7759fd07
@ -19,6 +19,7 @@ package org.thoughtcrime.securesms.crypto;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.thoughtcrime.securesms.crypto.storage.TextSecurePreKeyStore;
|
||||
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||
import org.whispersystems.libsignal.IdentityKeyPair;
|
||||
@ -90,7 +91,17 @@ public class PreKeyUtil {
|
||||
return TextSecurePreferences.getActiveSignedPreKeyId(context);
|
||||
}
|
||||
|
||||
// region - Loki
|
||||
// region Loki
|
||||
public static synchronized @Nullable SignedPreKeyRecord getActiveSignedPreKey(Context context) {
|
||||
SignedPreKeyStore signedPreKeyStore = new TextSecurePreKeyStore(context);
|
||||
try {
|
||||
return signedPreKeyStore.loadSignedPreKey(getActiveSignedPreKeyId(context));
|
||||
} catch (InvalidKeyIdException e) {
|
||||
// Fall through
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public synchronized static List<PreKeyRecord> generatePreKeys(Context context, int amount) {
|
||||
PreKeyStore preKeyStore = new TextSecurePreKeyStore(context);
|
||||
List<PreKeyRecord> records = new LinkedList<>();
|
||||
|
@ -31,6 +31,8 @@ import org.thoughtcrime.securesms.crypto.MasterSecret;
|
||||
import org.thoughtcrime.securesms.database.helpers.ClassicOpenHelper;
|
||||
import org.thoughtcrime.securesms.database.helpers.SQLCipherMigrationHelper;
|
||||
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
|
||||
import org.thoughtcrime.securesms.loki.LokiContactPreKeyDatabase;
|
||||
import org.thoughtcrime.securesms.loki.LokiPreKeyBundleDatabase;
|
||||
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||
|
||||
public class DatabaseFactory {
|
||||
@ -59,6 +61,10 @@ public class DatabaseFactory {
|
||||
private final SearchDatabase searchDatabase;
|
||||
private final JobDatabase jobDatabase;
|
||||
|
||||
// Loki
|
||||
private final LokiContactPreKeyDatabase lokiContactPreKeyDatabase;
|
||||
private final LokiPreKeyBundleDatabase lokiPreKeyBundleDatabase;
|
||||
|
||||
public static DatabaseFactory getInstance(Context context) {
|
||||
synchronized (lock) {
|
||||
if (instance == null)
|
||||
@ -144,6 +150,18 @@ public class DatabaseFactory {
|
||||
return getInstance(context).databaseHelper.getReadableDatabase();
|
||||
}
|
||||
|
||||
// region Loki
|
||||
|
||||
public static LokiContactPreKeyDatabase getLokiContactPreKeyDatabase(Context context) {
|
||||
return getInstance(context).lokiContactPreKeyDatabase;
|
||||
}
|
||||
|
||||
public static LokiPreKeyBundleDatabase getLokiPreKeyBundleDatabase(Context context) {
|
||||
return getInstance(context).lokiPreKeyBundleDatabase;
|
||||
}
|
||||
|
||||
// endregion
|
||||
|
||||
public static void upgradeRestored(Context context, SQLiteDatabase database){
|
||||
getInstance(context).databaseHelper.onUpgrade(database, database.getVersion(), -1);
|
||||
getInstance(context).databaseHelper.markCurrent(database);
|
||||
@ -174,6 +192,9 @@ public class DatabaseFactory {
|
||||
this.sessionDatabase = new SessionDatabase(context, databaseHelper);
|
||||
this.searchDatabase = new SearchDatabase(context, databaseHelper);
|
||||
this.jobDatabase = new JobDatabase(context, databaseHelper);
|
||||
|
||||
this.lokiContactPreKeyDatabase = new LokiContactPreKeyDatabase(context, databaseHelper);
|
||||
this.lokiPreKeyBundleDatabase = new LokiPreKeyBundleDatabase(context, databaseHelper);
|
||||
}
|
||||
|
||||
public void onApplicationLevelUpgrade(@NonNull Context context, @NonNull MasterSecret masterSecret,
|
||||
|
@ -32,7 +32,7 @@ class LokiContactPreKeyDatabase(context: Context, helper: SQLCipherOpenHelper) :
|
||||
fun getPreKey(pubKey: String): PreKeyRecord? {
|
||||
val database = databaseHelper.readableDatabase
|
||||
return database.get(tableName, "${Companion.pubKey} = ?", arrayOf(pubKey)) { cursor ->
|
||||
val preKeyId = cursor.getInt(cursor.getColumnIndexOrThrow(preKeyId))
|
||||
val preKeyId = cursor.getInt(preKeyId)
|
||||
PreKeyUtil.loadPreKey(context, preKeyId)
|
||||
}
|
||||
}
|
||||
|
@ -1,7 +1,8 @@
|
||||
package org.thoughtcrime.securesms.loki
|
||||
|
||||
import android.database.Cursor
|
||||
import net.sqlcipher.Cursor
|
||||
import net.sqlcipher.database.SQLiteDatabase
|
||||
import org.thoughtcrime.securesms.util.Base64
|
||||
|
||||
fun <T> SQLiteDatabase.get(table: String, query: String, arguments: Array<String>, get: (Cursor) -> T): T? {
|
||||
var cursor: Cursor? = null
|
||||
@ -14,4 +15,16 @@ fun <T> SQLiteDatabase.get(table: String, query: String, arguments: Array<String
|
||||
cursor?.close()
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
fun Cursor.getInt(columnName: String): Int {
|
||||
return this.getInt(this.getColumnIndexOrThrow(columnName))
|
||||
}
|
||||
|
||||
fun Cursor.getString(columnName: String): String {
|
||||
return this.getString(this.getColumnIndexOrThrow(columnName))
|
||||
}
|
||||
|
||||
fun Cursor.getBase64Bytes(columnName: String): ByteArray {
|
||||
return Base64.decode(this.getString(columnName))
|
||||
}
|
@ -1,8 +1,121 @@
|
||||
package org.thoughtcrime.securesms.loki
|
||||
|
||||
import android.content.ContentValues
|
||||
import android.content.Context
|
||||
import net.sqlcipher.database.SQLiteDatabase
|
||||
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
|
||||
import org.thoughtcrime.securesms.crypto.PreKeyUtil
|
||||
import org.thoughtcrime.securesms.database.Database
|
||||
import org.thoughtcrime.securesms.database.DatabaseFactory
|
||||
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
|
||||
import org.thoughtcrime.securesms.util.Base64
|
||||
import org.thoughtcrime.securesms.util.TextSecurePreferences
|
||||
import org.whispersystems.libsignal.IdentityKey
|
||||
import org.whispersystems.libsignal.ecc.Curve
|
||||
import org.whispersystems.libsignal.state.PreKeyBundle
|
||||
|
||||
/**
|
||||
* A database for associating a `PreKeyBundle` to a contact public key.
|
||||
*/
|
||||
class LokiPreKeyBundleDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper) {
|
||||
companion object {
|
||||
private val tableName = "loki_pre_key_bundle_database"
|
||||
private val pubKey = "pub_key"
|
||||
private val preKeyId = "pre_key_id"
|
||||
private val preKeyPublic = "pre_key_public"
|
||||
private val signedPreKeyId = "signed_pre_key_id"
|
||||
private val signedPreKeyPublic = "signed_pre_key_public"
|
||||
private val signedPreKeySignature = "signed_pre_key_signature"
|
||||
private val identityKey = "identity_key"
|
||||
private val deviceId = "device_id"
|
||||
private val registrationId = "registration_id"
|
||||
|
||||
@JvmStatic
|
||||
val createTableCommand = "CREATE TABLE $tableName (" +
|
||||
"$pubKey TEXT PRIMARY KEY" +
|
||||
"$preKeyId INTEGER," +
|
||||
"$preKeyPublic TEXT NOT NULL" +
|
||||
"$signedPreKeyId INTEGER" +
|
||||
"$signedPreKeyPublic TEXT NOT NULL" +
|
||||
"$signedPreKeySignature TEXT" +
|
||||
"$identityKey TEXT NOT NULL" +
|
||||
"$deviceId INTEGER" +
|
||||
"$registrationId INTEGER" +
|
||||
");"
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate a `PreKeyBundle` for the given contact.
|
||||
* This generated bundle shouldn't be stored locally since this is used to generate bundles to send to other users.
|
||||
* @param pubKey String The hex encoded public key of the contact
|
||||
* @return PreKeyBundle? A bundle or null if something went wrong
|
||||
*/
|
||||
fun generatePreKeyBundle(pubKey: String): PreKeyBundle? {
|
||||
// TODO: Check if we have pre keys
|
||||
val identityKeyPair = IdentityKeyUtil.getIdentityKeyPair(context)
|
||||
|
||||
val signedPreKey = PreKeyUtil.getActiveSignedPreKey(context)
|
||||
if (signedPreKey == null) return null
|
||||
|
||||
val preKeyRecord = DatabaseFactory.getLokiContactPreKeyDatabase(context).getOrCreatePreKey(pubKey)
|
||||
val registrationId = TextSecurePreferences.getLocalRegistrationId(context)
|
||||
if (registrationId == 0) return null
|
||||
|
||||
// TODO: This is the primary device id, we may want to change it to support multiple devices?
|
||||
val deviceId = 1
|
||||
|
||||
return PreKeyBundle(registrationId, deviceId,preKeyRecord.id, preKeyRecord.keyPair.publicKey, signedPreKey.id, signedPreKey.keyPair.publicKey, signedPreKey.signature, identityKeyPair.publicKey)
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the `PreKeyBundle` associated with the given contact.
|
||||
* @param pubKey String The hex encoded public key of the contact.
|
||||
* @return PreKeyBundle? The prekey bundle or null if it doesn't exist
|
||||
*/
|
||||
fun getPreKeyBundle(pubKey: String): PreKeyBundle? {
|
||||
val database = databaseHelper.readableDatabase
|
||||
return database.get(tableName, "${Companion.pubKey} = ?", arrayOf(pubKey)) { cursor ->
|
||||
val registrationId = cursor.getInt(registrationId)
|
||||
val deviceId = cursor.getInt(deviceId)
|
||||
val preKeyId = cursor.getInt(preKeyId)
|
||||
val preKey = Curve.decodePoint(cursor.getBase64Bytes(preKeyPublic), 0)
|
||||
val signedPreKeyId = cursor.getInt(signedPreKeyId)
|
||||
val signedPreKey = Curve.decodePoint(cursor.getBase64Bytes(signedPreKeyPublic), 0)
|
||||
val signedPreKeySignature = cursor.getBase64Bytes(signedPreKeySignature)
|
||||
val identityKey = IdentityKey(cursor.getBase64Bytes(identityKey), 0)
|
||||
|
||||
PreKeyBundle(registrationId, deviceId, preKeyId, preKey, signedPreKeyId, signedPreKey, signedPreKeySignature, identityKey)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the `PreKeyBundle` fore the given contact.
|
||||
* @param pubKey String The hex encoded public key of the contact
|
||||
* @param preKeyBundle PreKeyBundle The pre key bundle
|
||||
*/
|
||||
fun setPreKeyBundle(pubKey: String, preKeyBundle: PreKeyBundle) {
|
||||
val database = databaseHelper.writableDatabase
|
||||
val contentValues = ContentValues()
|
||||
contentValues.put(registrationId, preKeyBundle.registrationId)
|
||||
contentValues.put(deviceId, preKeyBundle.deviceId)
|
||||
contentValues.put(preKeyId, preKeyBundle.preKeyId)
|
||||
contentValues.put(preKeyPublic, Base64.encodeBytes(preKeyBundle.preKey.serialize()))
|
||||
contentValues.put(signedPreKeyId, preKeyBundle.signedPreKeyId)
|
||||
contentValues.put(signedPreKeyPublic, Base64.encodeBytes(preKeyBundle.signedPreKey.serialize()))
|
||||
contentValues.put(signedPreKeySignature, Base64.encodeBytes(preKeyBundle.signedPreKeySignature))
|
||||
contentValues.put(identityKey, Base64.encodeBytes(preKeyBundle.identityKey.serialize()))
|
||||
contentValues.put(Companion.pubKey, pubKey)
|
||||
|
||||
database.insertWithOnConflict(tableName, null, contentValues, SQLiteDatabase.CONFLICT_REPLACE)
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the `PreKeyBundle` for the given contact.
|
||||
* @param pubKey String The hex encoded public key of the contact
|
||||
*/
|
||||
fun removePreKeyBundle(pubKey: String) {
|
||||
val database = databaseHelper.writableDatabase
|
||||
database.delete(tableName, "${Companion.pubKey} = ?", arrayOf(pubKey))
|
||||
}
|
||||
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user