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

Skip counting body tasks

This commit is contained in:
M66B 2019-06-13 11:59:35 +02:00
parent c4d6f7a89f
commit 28de9b2b27
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1945,7 +1945,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
args.putBoolean("show_images", show_images);
args.putBoolean("show_quotes", show_quotes);
args.putInt("zoom", zoom);
bodyTask.execute(context, owner, args, "message:body");
bodyTask.setCount(false).execute(context, owner, args, "message:body");
}
}

22
app/src/main/java/eu/faircode/email/SimpleTask.java
View File

@ -44,6 +44,9 @@ import java.util.concurrent.Executors;
// Results will not be delivered to destroyed fragments
public abstract class SimpleTask<T> implements LifecycleObserver {
private boolean count = true;
private int executing = 0;
private static final List<SimpleTask> tasks = new ArrayList<>();
private static final ExecutorService executor = Executors.newFixedThreadPool(
@ -51,6 +54,11 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
static final String ACTION_TASK_COUNT = BuildConfig.APPLICATION_ID + ".ACTION_TASK_COUNT";
public SimpleTask<T> setCount(boolean count) {
this.count = count;
return this;
}
public void execute(Context context, LifecycleOwner owner, @NonNull Bundle args, @NonNull String name) {
run(context, owner, args, name);
}
@ -75,14 +83,14 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
final Handler handler = new Handler();
// prevent garbage collection
int count;
synchronized (tasks) {
tasks.add(this);
count = tasks.size();
if (count)
executing++;
}
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(new Intent(ACTION_TASK_COUNT).putExtra("count", count));
lbm.sendBroadcast(new Intent(ACTION_TASK_COUNT).putExtra("count", executing));
try {
onPreExecute(args);
@ -164,15 +172,15 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
}
private void cleanup(Context context) {
int count;
synchronized (tasks) {
tasks.remove(this);
count = tasks.size();
if (count)
executing--;
}
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast(new Intent(ACTION_TASK_COUNT).putExtra("count", count));
Log.i("Remaining tasks=" + count);
lbm.sendBroadcast(new Intent(ACTION_TASK_COUNT).putExtra("count", executing));
Log.i("Remaining tasks=" + tasks.size());
}
protected void onPreExecute(Bundle args) {