TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-30 13:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

only create DB readers as needed

Browse Source 
Closes #3730
// FREEBIE
This commit is contained in:
Jake McGinty 2015-07-20 15:05:56 -07:00 committed by Moxie Marlinspike
parent a3a7f8fb6c
commit f812efff3c
2 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/ConversationAdapter.java
View File

@ -158,7 +158,7 @@ public class ConversationAdapter extends CursorAdapter implements AbsListView.Re
MessageRecord messageRecord = reader.getCurrent(); MessageRecord messageRecord = reader.getCurrent();
messageRecordCache.put(type + messageId, new SoftReference<MessageRecord>(messageRecord)); messageRecordCache.put(type + messageId, new SoftReference<>(messageRecord));
return messageRecord; return messageRecord;
} }

42
src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
View File

@ -21,10 +21,13 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteQueryBuilder; import android.database.sqlite.SQLiteQueryBuilder;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.whispersystems.libaxolotl.util.guava.Optional;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
@ -222,30 +225,45 @@ public class MmsSmsDatabase extends Database {
return db.rawQuery(query, null); return db.rawQuery(query, null);
} }
public Reader readerFor(Cursor cursor, MasterSecret masterSecret) { public Reader readerFor(@NonNull Cursor cursor, @Nullable MasterSecret masterSecret) {
return new Reader(cursor, masterSecret); return new Reader(cursor, masterSecret);
} }
public Reader readerFor(Cursor cursor) { public Reader readerFor(@NonNull Cursor cursor) {
return new Reader(cursor); return new Reader(cursor);
} }
public class Reader { public class Reader {
private final Cursor cursor; private final Cursor cursor;
private final EncryptingSmsDatabase.Reader smsReader; private final Optional<MasterSecret> masterSecret;
private final MmsDatabase.Reader mmsReader; private EncryptingSmsDatabase.Reader smsReader;
private MmsDatabase.Reader mmsReader;
public Reader(Cursor cursor, MasterSecret masterSecret) { public Reader(Cursor cursor, @Nullable MasterSecret masterSecret) {
this.cursor = cursor; this.cursor = cursor;
this.smsReader = DatabaseFactory.getEncryptingSmsDatabase(context).readerFor(masterSecret, cursor); this.masterSecret = Optional.fromNullable(masterSecret);
this.mmsReader = DatabaseFactory.getMmsDatabase(context).readerFor(masterSecret, cursor);
} }
public Reader(Cursor cursor) { public Reader(Cursor cursor) {
this.cursor = cursor; this(cursor, null);
this.smsReader = DatabaseFactory.getSmsDatabase(context).readerFor(cursor); }
this.mmsReader = DatabaseFactory.getMmsDatabase(context).readerFor(null, cursor);
private EncryptingSmsDatabase.Reader getSmsReader() {
if (smsReader == null) {
if (masterSecret.isPresent()) smsReader = DatabaseFactory.getEncryptingSmsDatabase(context).readerFor(masterSecret.get(), cursor);
else smsReader = DatabaseFactory.getSmsDatabase(context).readerFor(cursor);
}
return smsReader;
}
private MmsDatabase.Reader getMmsReader() {
if (mmsReader == null) {
mmsReader = DatabaseFactory.getMmsDatabase(context).readerFor(masterSecret.orNull(), cursor);
}
return mmsReader;
} }
public MessageRecord getNext() { public MessageRecord getNext() {
@ -259,9 +277,9 @@ public class MmsSmsDatabase extends Database {
String type = cursor.getString(cursor.getColumnIndexOrThrow(TRANSPORT)); String type = cursor.getString(cursor.getColumnIndexOrThrow(TRANSPORT));
if (MmsSmsDatabase.MMS_TRANSPORT.equals(type)) { if (MmsSmsDatabase.MMS_TRANSPORT.equals(type)) {
return mmsReader.getCurrent(); return getMmsReader().getCurrent();
} else { } else {
return smsReader.getCurrent(); return getSmsReader().getCurrent();
} }
} }