From 2ff5b3f773a9dfe6111bc9950b11cad6be4bb6f2 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 12 Jan 2019 13:15:15 +0000 Subject: [PATCH] Task names --- .../eu/faircode/email/AdapterAttachment.java | 4 ++-- .../java/eu/faircode/email/AdapterFolder.java | 6 +++--- .../java/eu/faircode/email/AdapterImage.java | 2 +- .../java/eu/faircode/email/FragmentAccount.java | 14 +++++++------- .../java/eu/faircode/email/FragmentAnswer.java | 6 +++--- .../java/eu/faircode/email/FragmentFolder.java | 6 +++--- .../java/eu/faircode/email/FragmentIdentity.java | 14 +++++++------- .../eu/faircode/email/FragmentOperations.java | 2 +- .../java/eu/faircode/email/FragmentOptions.java | 2 +- .../java/eu/faircode/email/FragmentWebView.java | 2 +- .../main/java/eu/faircode/email/SimpleTask.java | 16 ---------------- 11 files changed, 29 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java index 01dcec111e..a399208d23 100644 --- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java +++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java @@ -160,7 +160,7 @@ public class AdapterAttachment extends RecyclerView.Adapter protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(context, owner, ex); } - }.execute(context, owner, args); + }.execute(context, owner, args, "image:fetch"); } } } diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index ca922298eb..da4b9fe84e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -303,7 +303,7 @@ public class FragmentAccount extends FragmentEx { else Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(FragmentAccount.this, args); + }.execute(FragmentAccount.this, args, "account:config"); } }); @@ -623,7 +623,7 @@ public class FragmentAccount extends FragmentEx { }); } } - }.execute(FragmentAccount.this, args); + }.execute(FragmentAccount.this, args, "account:check"); } }); @@ -937,7 +937,7 @@ public class FragmentAccount extends FragmentEx { }); } } - }.execute(FragmentAccount.this, args); + }.execute(FragmentAccount.this, args, "account:save"); } }); @@ -1071,7 +1071,7 @@ public class FragmentAccount extends FragmentEx { protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(FragmentAccount.this, new Bundle()); + }.execute(FragmentAccount.this, new Bundle(), "account:primary"); } else { int provider = savedInstanceState.getInt("provider"); spProvider.setTag(provider); @@ -1111,14 +1111,14 @@ public class FragmentAccount extends FragmentEx { protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(FragmentAccount.this, args); + }.execute(FragmentAccount.this, args, "account:folders"); } @Override protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(this, args); + }.execute(this, args, "account:get"); } @Override @@ -1181,7 +1181,7 @@ public class FragmentAccount extends FragmentEx { protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(FragmentAccount.this, args); + }.execute(FragmentAccount.this, args, "account:delete"); } }) .setNegativeButton(android.R.string.cancel, null) diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java index 9cba7dce78..31eb6154f1 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java +++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java @@ -127,7 +127,7 @@ public class FragmentAnswer extends FragmentEx { protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(this, args); + }.execute(this, args, "answer:get"); } private void onActionTrash() { @@ -159,7 +159,7 @@ public class FragmentAnswer extends FragmentEx { Helper.setViewsEnabled(view, true); Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(FragmentAnswer.this, args); + }.execute(FragmentAnswer.this, args, "answer:delete"); } }) .setNegativeButton(android.R.string.cancel, null) @@ -207,7 +207,7 @@ public class FragmentAnswer extends FragmentEx { Helper.setViewsEnabled(view, true); Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(this, args); + }.execute(this, args, "answer:save"); } private void handleExit() { diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java index 433293fe59..e261fa25cd 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolder.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java @@ -259,7 +259,7 @@ public class FragmentFolder extends FragmentEx { else Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(FragmentFolder.this, args); + }.execute(FragmentFolder.this, args, "folder:save"); } }); @@ -342,7 +342,7 @@ public class FragmentFolder extends FragmentEx { else Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(FragmentFolder.this, args); + }.execute(FragmentFolder.this, args, "folder:delete"); } }) .setNegativeButton(android.R.string.cancel, null) @@ -399,6 +399,6 @@ public class FragmentFolder extends FragmentEx { protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(this, args); + }.execute(this, args, "folder:get"); } } diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index 3c6b2366f8..2e9827086e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -421,7 +421,7 @@ public class FragmentIdentity extends FragmentEx { else Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(FragmentIdentity.this, args); + }.execute(FragmentIdentity.this, args, "identity:config"); } }); @@ -659,7 +659,7 @@ public class FragmentIdentity extends FragmentEx { }); } } - }.execute(FragmentIdentity.this, args); + }.execute(FragmentIdentity.this, args, "identity:save"); } }); @@ -752,7 +752,7 @@ public class FragmentIdentity extends FragmentEx { protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(FragmentIdentity.this, new Bundle()); + }.execute(FragmentIdentity.this, new Bundle(), "identity:count"); } else { tilPassword.getEditText().setText(savedInstanceState.getString("password")); grpAdvanced.setVisibility(savedInstanceState.getInt("advanced")); @@ -849,14 +849,14 @@ public class FragmentIdentity extends FragmentEx { protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(FragmentIdentity.this, args); + }.execute(FragmentIdentity.this, args, "identity:accounts:get"); } @Override protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(this, args); + }.execute(this, args, "identity:get"); } @Override @@ -917,7 +917,7 @@ public class FragmentIdentity extends FragmentEx { protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(FragmentIdentity.this, args); + }.execute(FragmentIdentity.this, args, "identity:delete"); } }) .setNegativeButton(android.R.string.cancel, null) @@ -984,7 +984,7 @@ public class FragmentIdentity extends FragmentEx { protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(this, args); + }.execute(this, args, "identity:folders:get"); } class IdentityFolders { diff --git a/app/src/main/java/eu/faircode/email/FragmentOperations.java b/app/src/main/java/eu/faircode/email/FragmentOperations.java index 5a1195c87e..d569ba3fdc 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOperations.java +++ b/app/src/main/java/eu/faircode/email/FragmentOperations.java @@ -154,7 +154,7 @@ public class FragmentOperations extends FragmentEx { protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(FragmentOperations.this, new Bundle()); + }.execute(FragmentOperations.this, new Bundle(), "operation:delete"); } }) .setNegativeButton(android.R.string.cancel, null) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java index d42db43c55..979f836983 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptions.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java @@ -256,7 +256,7 @@ public class FragmentOptions extends FragmentEx implements SharedPreferences.OnS protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(FragmentOptions.this, null); + }.execute(FragmentOptions.this, new Bundle(), "options:preview"); } }); diff --git a/app/src/main/java/eu/faircode/email/FragmentWebView.java b/app/src/main/java/eu/faircode/email/FragmentWebView.java index 29ef9e85d1..e3864ff520 100644 --- a/app/src/main/java/eu/faircode/email/FragmentWebView.java +++ b/app/src/main/java/eu/faircode/email/FragmentWebView.java @@ -184,7 +184,7 @@ public class FragmentWebView extends FragmentEx { protected void onException(Bundle args, Throwable ex) { Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } - }.execute(this, args); + }.execute(this, args, "webview:format"); } ((ActivityBase) getActivity()).addBackPressedListener(onBackPressedListener); diff --git a/app/src/main/java/eu/faircode/email/SimpleTask.java b/app/src/main/java/eu/faircode/email/SimpleTask.java index d19c256706..6cd5b725fd 100644 --- a/app/src/main/java/eu/faircode/email/SimpleTask.java +++ b/app/src/main/java/eu/faircode/email/SimpleTask.java @@ -51,34 +51,18 @@ public abstract class SimpleTask implements LifecycleObserver { private static ExecutorService executor = Executors.newCachedThreadPool(Helper.backgroundThreadFactory); - public void execute(Context context, LifecycleOwner owner, Bundle args) { - execute(context, owner, args, null); - } - public void execute(Context context, LifecycleOwner owner, Bundle args, String name) { run(context, owner, args, name); } - public void execute(LifecycleService service, Bundle args) { - execute(service, args, null); - } - public void execute(LifecycleService service, Bundle args, String name) { run(service, service, args, name); } - public void execute(AppCompatActivity activity, Bundle args) { - execute(activity, args, null); - } - public void execute(AppCompatActivity activity, Bundle args, String name) { run(activity, activity, args, name); } - public void execute(Fragment fragment, Bundle args) { - execute(fragment, args, null); - } - public void execute(final Fragment fragment, Bundle args, String name) { try { run(fragment.getContext(), fragment.getViewLifecycleOwner(), args, name);