Refactoring

pull/197/head
M66B 4 years ago
parent 43b65d1de5
commit 524aefab7c

@ -48,8 +48,6 @@ import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.ListUpdateCallback; import androidx.recyclerview.widget.ListUpdateCallback;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.snackbar.Snackbar;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
@ -298,6 +296,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
long id = args.getLong("id"); long id = args.getLong("id");
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
EntityRule rule = db.rule().getRule(id); EntityRule rule = db.rule().getRule(id);
if (rule == null) if (rule == null)
return 0; return 0;
@ -307,9 +306,11 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
if (jheader != null) if (jheader != null)
throw new IllegalArgumentException(context.getString(R.string.title_rule_no_headers)); throw new IllegalArgumentException(context.getString(R.string.title_rule_no_headers));
List<Long> ids = db.message().getMessageIdsByFolder(rule.folder);
if (ids == null)
return 0;
int applied = 0; int applied = 0;
List<Long> ids =
db.message().getMessageIdsByFolder(rule.folder);
for (long mid : ids) for (long mid : ids)
try { try {
db.beginTransaction(); db.beginTransaction();
@ -335,19 +336,13 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
@Override @Override
protected void onExecuted(Bundle args, Integer applied) { protected void onExecuted(Bundle args, Integer applied) {
Snackbar.make( ToastEx.makeText(context,
parentFragment.getView(), context.getString(R.string.title_rule_applied, applied),
context.getString(R.string.title_rule_applied, applied), Snackbar.LENGTH_LONG) Toast.LENGTH_LONG).show();
.setGestureInsetBottomIgnored(true).show();
} }
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException)
Snackbar.make(
parentFragment.getView(), ex.getMessage(), Snackbar.LENGTH_LONG)
.setGestureInsetBottomIgnored(true).show();
else
Log.unexpectedError(parentFragment.getParentFragmentManager(), ex, false); Log.unexpectedError(parentFragment.getParentFragmentManager(), ex, false);
} }
}.execute(context, owner, args, "rule:execute"); }.execute(context, owner, args, "rule:execute");

Loading…
Cancel
Save