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

Confirm executing rules

Browse Source
This commit is contained in:
M66B
2021-04-15 09:17:49 +02:00
parent d912e729bd
commit 710bb3df4e
2 changed files with 88 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
app/src/main/java/eu/faircode/email/AdapterFolder.java
View File

@@ -67,10 +67,6 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.snackbar.Snackbar;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Collections;
@@ -78,8 +74,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.mail.MessagingException;
public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder> {
private Fragment parentFragment;
private long account;
@@ -930,75 +924,13 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
private void onActionExecuteRules() {
Bundle args = new Bundle();
args.putLong("id", folder.id);
args.putString("question", context.getString(R.string.title_execute_rules));
args.putLong("folder", folder.id);
new SimpleTask<Integer>() {
@Override
protected void onPreExecute(Bundle args) {
ToastEx.makeText(context, R.string.title_executing, Toast.LENGTH_LONG).show();
}
@Override
protected Integer onExecute(Context context, Bundle args) throws JSONException, MessagingException, IOException {
long fid = args.getLong("id");
DB db = DB.getInstance(context);
List<EntityRule> rules = db.rule().getEnabledRules(fid);
if (rules == null)
return 0;
for (EntityRule rule : rules) {
JSONObject jcondition = new JSONObject(rule.condition);
JSONObject jheader = jcondition.optJSONObject("header");
if (jheader != null)
throw new IllegalArgumentException(context.getString(R.string.title_rule_no_headers));
}
List<Long> ids = db.message().getMessageIdsByFolder(fid);
if (ids == null)
return 0;
int applied = 0;
for (long mid : ids)
try {
db.beginTransaction();
EntityMessage message = db.message().getMessage(mid);
if (message == null)
continue;
for (EntityRule rule : rules)
if (rule.matches(context, message, null)) {
if (rule.execute(context, message))
applied++;
if (rule.stop)
break;
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
if (applied > 0)
ServiceSynchronize.eval(context, "rules/manual");
return applied;
}
@Override
protected void onExecuted(Bundle args, Integer applied) {
ToastEx.makeText(context,
context.getString(R.string.title_rule_applied, applied),
Toast.LENGTH_LONG).show();
}
@Override
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(parentFragment.getParentFragmentManager(), ex, false);
}
}.execute(context, owner, args, "folder:rules");
FragmentDialogAsk ask = new FragmentDialogAsk();
ask.setArguments(args);
ask.setTargetFragment(parentFragment, FragmentFolders.REQUEST_EXECUTE_RULES);
ask.show(parentFragment.getParentFragmentManager(), "folder:execute");
}
private void onActionEditProperties() {

83
app/src/main/java/eu/faircode/email/FragmentFolders.java
View File

@@ -56,11 +56,17 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.text.NumberFormat;
import java.util.Calendar;
import java.util.Collections;
import java.util.List;
import javax.mail.MessagingException;
import static android.app.Activity.RESULT_OK;
public class FragmentFolders extends FragmentBase {
@@ -93,6 +99,7 @@ public class FragmentFolders extends FragmentBase {
static final int REQUEST_DELETE_LOCAL = 1;
static final int REQUEST_EMPTY_FOLDER = 2;
static final int REQUEST_DELETE_FOLDER = 3;
static final int REQUEST_EXECUTE_RULES = 4;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -592,6 +599,10 @@ public class FragmentFolders extends FragmentBase {
if (resultCode == RESULT_OK && data != null)
onDeleteFolder(data.getBundleExtra("args"));
break;
case REQUEST_EXECUTE_RULES:
if (resultCode == RESULT_OK && data != null)
onExecuteRules(data.getBundleExtra("args"));
break;
}
} catch (Throwable ex) {
Log.e(ex);
@@ -752,6 +763,76 @@ public class FragmentFolders extends FragmentBase {
}.execute(this, args, "folder:delete");
}
private void onExecuteRules(Bundle args) {
new SimpleTask<Integer>() {
@Override
protected void onPreExecute(Bundle args) {
ToastEx.makeText(getContext(), R.string.title_executing, Toast.LENGTH_LONG).show();
}
@Override
protected Integer onExecute(Context context, Bundle args) throws JSONException, MessagingException, IOException {
long fid = args.getLong("id");
DB db = DB.getInstance(context);
List<EntityRule> rules = db.rule().getEnabledRules(fid);
if (rules == null)
return 0;
for (EntityRule rule : rules) {
JSONObject jcondition = new JSONObject(rule.condition);
JSONObject jheader = jcondition.optJSONObject("header");
if (jheader != null)
throw new IllegalArgumentException(context.getString(R.string.title_rule_no_headers));
}
List<Long> ids = db.message().getMessageIdsByFolder(fid);
if (ids == null)
return 0;
int applied = 0;
for (long mid : ids)
try {
db.beginTransaction();
EntityMessage message = db.message().getMessage(mid);
if (message == null)
continue;
for (EntityRule rule : rules)
if (rule.matches(context, message, null)) {
if (rule.execute(context, message))
applied++;
if (rule.stop)
break;
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
if (applied > 0)
ServiceSynchronize.eval(context, "rules/manual");
return applied;
}
@Override
protected void onExecuted(Bundle args, Integer applied) {
ToastEx.makeText(getContext(),
getString(R.string.title_rule_applied, applied),
Toast.LENGTH_LONG).show();
}
@Override
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(getParentFragmentManager(), ex, false);
}
}.execute(this, args, "folder:rules");
}
public static class FragmentDialogApply extends FragmentDialogBase {
@NonNull
@Override
@@ -836,4 +917,4 @@ public class FragmentFolders extends FragmentBase {
.create();
}
}
}
}