mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplified updating keyword colors

This commit is contained in:
M66B 2020-05-17 08:29:48 +02:00
parent e862382770
commit efa8a88a55
3 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/eu/faircode/email/AdapterKeyword.java
View File

@ -165,41 +165,6 @@ public class AdapterKeyword extends RecyclerView.Adapter<AdapterKeyword.ViewHold
prefs.edit().remove("keyword." + keyword.name).apply();
else
prefs.edit().putInt("keyword." + keyword.name, keyword.color).apply();
Bundle args = new Bundle();
args.putLong("id", id);
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
long id = args.getLong("id");
DB db = DB.getInstance(context);
EntityMessage message = db.message().getMessage(id);
if (message == null)
return null;
// Update keyword colors
try {
db.beginTransaction();
db.message().setMessageKeywords(message.id, DB.Converters.fromStringArray(null));
db.message().setMessageKeywords(message.id, DB.Converters.fromStringArray(message.keywords));
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
return null;
}
@Override
protected void onException(Bundle args, Throwable ex) {
Log.e(ex);
}
}.execute(context, owner, args, "keyword:set");
}
}

5
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -4166,6 +4166,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
FragmentDialogKeywordManage fragment = new FragmentDialogKeywordManage();
fragment.setArguments(args);
fragment.setTargetFragment(parentFragment, FragmentMessages.REQUEST_KEYWORDS);
fragment.show(parentFragment.getParentFragmentManager(), "keyword:manage");
}
@ -4993,10 +4994,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
same = false;
log("duplicate changed", next.id);
}
if (!Arrays.equals(prev.keyword_colors, next.keyword_colors)) {
same = false;
log("keyword colors changed", next.id);
}
return same;
}

4
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -324,6 +324,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
private static final int REQUEST_EMPTY_FOLDER = 20;
private static final int REQUEST_BOUNDARY_RETRY = 21;
static final int REQUEST_PICK_CONTACT = 22;
static final int REQUEST_KEYWORDS = 23;
static final String ACTION_STORE_RAW = BuildConfig.APPLICATION_ID + ".STORE_RAW";
static final String ACTION_DECRYPT = BuildConfig.APPLICATION_ID + ".DECRYPT";
@ -5049,6 +5050,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (resultCode == RESULT_OK && data != null)
onPickContact(data.getData());
break;
case REQUEST_KEYWORDS:
adapter.notifyDataSetChanged();
break;
}
} catch (Throwable ex) {
Log.e(ex);