Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 14:17:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added no junk folder error message

Browse Source
This commit is contained in:
M66B
2020-07-13 14:19:57 +02:00
parent 65e40f5877
commit deefc33d9e
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6394,7 +6394,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
EntityFolder junk = db.folder().getFolderByType(message.account, EntityFolder.JUNK);
if (junk == null)
return null;
throw new IllegalArgumentException(context.getString(R.string.title_no_junk_folder));
EntityOperation.queue(context, message, EntityOperation.MOVE, junk.id);
@@ -6404,7 +6404,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
rule.id = db.rule().insertRule(rule);
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
@@ -6417,7 +6416,17 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(getParentFragmentManager(), ex);
if (ex instanceof IllegalArgumentException) {
Snackbar snackbar = Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_INDEFINITE);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(getContext(), ActivitySetup.class));
}
});
snackbar.show();
} else
Log.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "message:junk");
}