oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

refactor: move attachmentsDb into lazy init

This commit is contained in:
Harris 2021-07-19 16:33:56 +10:00
parent afb186c5f6
commit e557b102e5
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java
View File

@ -109,7 +109,14 @@ public class DatabaseFactory {
}
public static AttachmentDatabase getAttachmentDatabase(Context context) {
return getInstance(context).attachments;
DatabaseFactory factory = getInstance(context);
synchronized (lock) {
if (factory.attachments == null) {
AttachmentSecret attachmentSecret = AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret();
factory.attachments = new AttachmentDatabase(context, factory.databaseHelper, attachmentSecret);
}
return factory.attachments;
}
}
public static MediaDatabase getMediaDatabase(Context context) {
@ -299,10 +306,8 @@ public class DatabaseFactory {
SQLiteDatabase.loadLibs(context);
DatabaseSecret databaseSecret = new DatabaseSecretProvider(context).getOrCreateDatabaseSecret();
AttachmentSecret attachmentSecret = AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret();
this.databaseHelper = new SQLCipherOpenHelper(context, databaseSecret);
this.attachments = new AttachmentDatabase(context, databaseHelper, attachmentSecret);
}
}