mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-04 02:28:18 +00:00
Code Issues Releases Wiki Activity

Fixed loading inline images

Browse source
This commit is contained in:
M66B 2019-01-06 16:31:53 +00:00
parent 4646e4f048
commit c91fabe18e
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/DB.java
View file

@ -87,11 +87,7 @@ public abstract class DB extends RoomDatabase {
public static synchronized DB getInstance(Context context) {
if (sInstance == null) {
sInstance = migrate(context, Room
.databaseBuilder(context.getApplicationContext(), DB.class, DB_NAME)
.openHelperFactory(new RequerySQLiteOpenHelperFactory())
.setQueryExecutor(executor)
.setJournalMode(JournalMode.WRITE_AHEAD_LOGGING));
sInstance = migrate(context, getBuilder(context));
Log.i("sqlite version=" + exec(sInstance, "SELECT sqlite_version() AS sqlite_version"));
Log.i("sqlite sync=" + exec(sInstance, "PRAGMA synchronous"));
@ -101,6 +97,18 @@ public abstract class DB extends RoomDatabase {
return sInstance;
}
public static synchronized DB getInstanceMainThread(Context context) {
return migrate(context, getBuilder(context).allowMainThreadQueries());
}
private static RoomDatabase.Builder getBuilder(Context context) {
return Room
.databaseBuilder(context.getApplicationContext(), DB.class, DB_NAME)
.openHelperFactory(new RequerySQLiteOpenHelperFactory())
.setQueryExecutor(executor)
.setJournalMode(JournalMode.WRITE_AHEAD_LOGGING);
}
private static String exec(DB db, String command) {
Cursor cursor = null;
try {

7
app/src/main/java/eu/faircode/email/FragmentCompose.java
View file

@ -1628,7 +1628,7 @@ public class FragmentCompose extends FragmentEx {
new SimpleTask<EntityMessage>() {
@Override
protected EntityMessage onExecute(Context context, Bundle args) throws Throwable {
protected EntityMessage onExecute(Context context, Bundle args) {
long id = args.getLong("id");
DB db = DB.getInstance(context);
@ -1647,7 +1647,8 @@ public class FragmentCompose extends FragmentEx {
@Override
protected void onExecuted(Bundle args, EntityMessage draft) {
showDraft(draft);
if (draft != null && state == State.NONE)
showDraft(draft);
}
@Override
@ -1990,7 +1991,7 @@ public class FragmentCompose extends FragmentEx {
@Override
public Drawable getDrawable(String source) {
if (source != null && source.startsWith("cid:")) {
DB db = DB.getInstance(getContext());
DB db = DB.getInstanceMainThread(getContext());
String cid = "<" + source.substring(4) + ">";
EntityAttachment attachment = db.attachment().getAttachment(working, cid);
if (attachment != null) {