empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ensure SQLCipher is loaded before logging begins.

Browse source
This commit is contained in:
Greyson Parrelli 2021-07-22 02:21:45 -04:00
parent b2c3a34d68
commit 60b4862b1b
6 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
View file

@ -121,12 +121,12 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
super.onCreate(); super.onCreate();
AppStartup.getInstance().addBlocking("security-provider", this::initializeSecurityProvider) AppStartup.getInstance().addBlocking("security-provider", this::initializeSecurityProvider)
.addBlocking("sqlcipher-init", () -> SqlCipherLibraryLoader.load(this))
.addBlocking("logging", () -> { .addBlocking("logging", () -> {
initializeLogging(); initializeLogging();
Log.i(TAG, "onCreate()"); Log.i(TAG, "onCreate()");
}) })
.addBlocking("crash-handling", this::initializeCrashHandling) .addBlocking("crash-handling", this::initializeCrashHandling)
.addBlocking("sqlcipher-init", () -> SqlCipherLibraryLoader.load(this))
.addBlocking("rx-init", () -> { .addBlocking("rx-init", () -> {
RxJavaPlugins.setInitIoSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED_IO, true, false)); RxJavaPlugins.setInitIoSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED_IO, true, false));
RxJavaPlugins.setInitComputationSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED, true, false)); RxJavaPlugins.setInitComputationSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED, true, false));

1
app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
View file

@ -94,6 +94,7 @@ public class JobDatabase extends SQLiteOpenHelper implements SignalDatabase {
if (instance == null) { if (instance == null) {
synchronized (JobDatabase.class) { synchronized (JobDatabase.class) {
if (instance == null) { if (instance == null) {
SqlCipherLibraryLoader.load(context);
instance = new JobDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context)); instance = new JobDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
} }
} }

1
app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java
View file

@ -54,6 +54,7 @@ public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase
if (instance == null) { if (instance == null) {
synchronized (KeyValueDatabase.class) { synchronized (KeyValueDatabase.class) {
if (instance == null) { if (instance == null) {
SqlCipherLibraryLoader.load(context);
instance = new KeyValueDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context)); instance = new KeyValueDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
} }
} }

1
app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt
View file

@ -71,6 +71,7 @@ class LogDatabase private constructor(
if (instance == null) { if (instance == null) {
synchronized(LogDatabase::class.java) { synchronized(LogDatabase::class.java) {
if (instance == null) { if (instance == null) {
SqlCipherLibraryLoader.load(context)
instance = LogDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context)) instance = LogDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context))
} }
} }

1
app/src/main/java/org/thoughtcrime/securesms/database/MegaphoneDatabase.java
View file

@ -57,6 +57,7 @@ public class MegaphoneDatabase extends SQLiteOpenHelper implements SignalDatabas
if (instance == null) { if (instance == null) {
synchronized (MegaphoneDatabase.class) { synchronized (MegaphoneDatabase.class) {
if (instance == null) { if (instance == null) {
SqlCipherLibraryLoader.load(context);
instance = new MegaphoneDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context)); instance = new MegaphoneDatabase(context, DatabaseSecretProvider.getOrCreateDatabaseSecret(context));
} }
} }

1
app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherLibraryLoader.kt
View file

@ -10,6 +10,7 @@ import net.sqlcipher.database.SQLiteDatabase
class SqlCipherLibraryLoader { class SqlCipherLibraryLoader {
companion object { companion object {
@Volatile
private var loaded = false private var loaded = false
private val LOCK = Object() private val LOCK = Object()