Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-27 21:24:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update SQLCipher to 4.5.3-FTS-S1

Browse Source
This commit is contained in:
Greyson Parrelli
2023-02-10 11:51:01 -05:00
parent cf250b4b32
commit ffbebe0670
8 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
View File

@@ -95,7 +95,6 @@ public class JobDatabase extends SQLiteOpenHelper implements SignalDatabaseOpenH
if (instance == null) {
SqlCipherLibraryLoader.load();
instance = new JobDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
instance.setWriteAheadLoggingEnabled(true);
}
}
}
@@ -103,7 +102,7 @@ public class JobDatabase extends SQLiteOpenHelper implements SignalDatabaseOpenH
}
public JobDatabase(@NonNull Application application, @NonNull DatabaseSecret databaseSecret) {
super(application, DATABASE_NAME, databaseSecret.asString(), null, DATABASE_VERSION, 0, new SqlCipherErrorHandler(DATABASE_NAME), new SqlCipherDatabaseHook());
super(application, DATABASE_NAME, databaseSecret.asString(), null, DATABASE_VERSION, 0, new SqlCipherErrorHandler(DATABASE_NAME), new SqlCipherDatabaseHook(), true);
this.application = application;
}

3
app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java
View File

@@ -55,7 +55,6 @@ public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase
if (instance == null) {
SqlCipherLibraryLoader.load();
instance = new KeyValueDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
instance.setWriteAheadLoggingEnabled(true);
}
}
}
@@ -68,7 +67,7 @@ public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase
private KeyValueDatabase(@NonNull Application application, @NonNull DatabaseSecret databaseSecret) {
super(application, DATABASE_NAME, databaseSecret.asString(), null, DATABASE_VERSION, 0,new SqlCipherErrorHandler(DATABASE_NAME), new SqlCipherDatabaseHook());
super(application, DATABASE_NAME, databaseSecret.asString(), null, DATABASE_VERSION, 0,new SqlCipherErrorHandler(DATABASE_NAME), new SqlCipherDatabaseHook(), true);
this.application = application;
}

4
app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt
View File

@@ -35,7 +35,8 @@ class LocalMetricsDatabase private constructor(
DATABASE_VERSION,
0,
SqlCipherDeletingErrorHandler(DATABASE_NAME),
SqlCipherDatabaseHook()
SqlCipherDatabaseHook(),
true
),
SignalDatabaseOpenHelper {
@@ -83,7 +84,6 @@ class LocalMetricsDatabase private constructor(
if (instance == null) {
SqlCipherLibraryLoader.load()
instance = LocalMetricsDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context))
instance!!.setWriteAheadLoggingEnabled(true)
}
}
}

4
app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt
View File

@@ -40,7 +40,8 @@ class LogDatabase private constructor(
DATABASE_VERSION,
0,
SqlCipherDeletingErrorHandler(DATABASE_NAME),
SqlCipherDatabaseHook()
SqlCipherDatabaseHook(),
true
),
SignalDatabaseOpenHelper {
@@ -87,7 +88,6 @@ class LogDatabase private constructor(
if (instance == null) {
SqlCipherLibraryLoader.load()
instance = LogDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context))
instance!!.setWriteAheadLoggingEnabled(true)
}
}
}

3
app/src/main/java/org/thoughtcrime/securesms/database/MegaphoneDatabase.java
View File

@@ -58,7 +58,6 @@ public class MegaphoneDatabase extends SQLiteOpenHelper implements SignalDatabas
if (instance == null) {
SqlCipherLibraryLoader.load();
instance = new MegaphoneDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
instance.setWriteAheadLoggingEnabled(true);
}
}
}
@@ -66,7 +65,7 @@ public class MegaphoneDatabase extends SQLiteOpenHelper implements SignalDatabas
}
public MegaphoneDatabase(@NonNull Application application, @NonNull DatabaseSecret databaseSecret) {
super(application, DATABASE_NAME, databaseSecret.asString(), null, DATABASE_VERSION, 0, new SqlCipherErrorHandler(DATABASE_NAME), new SqlCipherDatabaseHook());
super(application, DATABASE_NAME, databaseSecret.asString(), null, DATABASE_VERSION, 0, new SqlCipherErrorHandler(DATABASE_NAME), new SqlCipherDatabaseHook(), true);
this.application = application;
}

4
app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt
View File

@@ -34,7 +34,8 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
SignalDatabaseMigrations.DATABASE_VERSION,
0,
SqlCipherErrorHandler(DATABASE_NAME),
SqlCipherDatabaseHook()
SqlCipherDatabaseHook(),
true
),
SignalDatabaseOpenHelper {
@@ -227,7 +228,6 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
synchronized(SignalDatabase::class.java) {
if (instance == null) {
instance = SignalDatabase(application, databaseSecret, attachmentSecret)
instance!!.setWriteAheadLoggingEnabled(true)
}
}
}