Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-01 18:41:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
M66B
2018-12-31 07:03:48 +00:00
parent 9ab964e659
commit 7ffb44f292
17 changed files with 266 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@@ -397,7 +397,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
new SimpleTask<Long>() {
@Override
protected Long onLoad(Context context, Bundle args) {
protected Long onExecute(Context context, Bundle args) {
DB db = DB.getInstance(context);
db.message().resetSearch();
@@ -409,7 +409,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}
@Override
protected void onLoaded(Bundle args, Long archive) {
protected void onExecuted(Bundle args, Long archive) {
Bundle sargs = new Bundle();
sargs.putLong("folder", archive);
sargs.putString("search", args.getString("search"));
@@ -426,7 +426,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(ActivityView.this, ActivityView.this, ex);
}
}.load(ActivityView.this, args);
}.execute(ActivityView.this, args);
} else {
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
@@ -554,7 +554,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
private void checkCrash() {
new SimpleTask<Long>() {
@Override
protected Long onLoad(Context context, Bundle args) throws Throwable {
protected Long onExecute(Context context, Bundle args) throws Throwable {
File file = new File(context.getCacheDir(), "crash.log");
if (file.exists()) {
StringBuilder sb = new StringBuilder();
@@ -580,7 +580,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}
@Override
protected void onLoaded(Bundle args, Long id) {
protected void onExecuted(Bundle args, Long id) {
if (id != null)
startActivity(
new Intent(ActivityView.this, ActivityCompose.class)
@@ -595,7 +595,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
else
Toast.makeText(ActivityView.this, ex.toString(), Toast.LENGTH_LONG).show();
}
}.load(this, new Bundle());
}.execute(this, new Bundle());
}
private class UpdateInfo {
@@ -614,7 +614,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
new SimpleTask<UpdateInfo>() {
@Override
protected UpdateInfo onLoad(Context context, Bundle args) throws Throwable {
protected UpdateInfo onExecute(Context context, Bundle args) throws Throwable {
StringBuilder json = new StringBuilder();
HttpsURLConnection urlConnection = null;
try {
@@ -666,7 +666,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}
@Override
protected void onLoaded(Bundle args, UpdateInfo info) {
protected void onExecuted(Bundle args, UpdateInfo info) {
if (info == null)
return;
@@ -688,7 +688,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
if (BuildConfig.DEBUG)
Helper.unexpectedError(ActivityView.this, ActivityView.this, ex);
}
}.load(this, new Bundle());
}.execute(this, new Bundle());
}
private void updateShortcuts() {
@@ -820,13 +820,13 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
new SimpleTask<Long>() {
@Override
protected Long onLoad(Context context, Bundle args) {
protected Long onExecute(Context context, Bundle args) {
long account = args.getLong("account");
return DB.getInstance(context).folder().getFolderByType(account, EntityFolder.INBOX).id;
}
@Override
protected void onLoaded(Bundle args, Long folder) {
protected void onExecuted(Bundle args, Long folder) {
long account = args.getLong("account");
getSupportFragmentManager().popBackStack("unified", 0);
@@ -842,7 +842,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(ActivityView.this, ActivityView.this, ex);
}
}.load(this, args);
}.execute(this, args);
}
private void onMenuSetup() {
@@ -925,12 +925,12 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
private void onDebugInfo() {
new SimpleTask<Long>() {
@Override
protected Long onLoad(Context context, Bundle args) throws IOException {
protected Long onExecute(Context context, Bundle args) throws IOException {
return Helper.getDebugInfo(context, R.string.title_debug_info_remark, null, null).id;
}
@Override
protected void onLoaded(Bundle args, Long id) {
protected void onExecuted(Bundle args, Long id) {
startActivity(new Intent(ActivityView.this, ActivityCompose.class)
.putExtra("action", "edit")
.putExtra("id", id));
@@ -944,13 +944,13 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
Toast.makeText(ActivityView.this, ex.toString(), Toast.LENGTH_LONG).show();
}
}.load(this, new Bundle());
}.execute(this, new Bundle());
}
private void onCleanup() {
new SimpleTask<Void>() {
@Override
protected Void onLoad(Context context, Bundle args) {
protected Void onExecute(Context context, Bundle args) {
JobDaily.cleanup(ActivityView.this);
return null;
}
@@ -959,7 +959,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(ActivityView.this, ActivityView.this, ex);
}
}.load(this, new Bundle());
}.execute(this, new Bundle());
}
private void onShowLog() {
@@ -1188,7 +1188,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
new SimpleTask<PendingIntent>() {
@Override
protected PendingIntent onLoad(Context context, Bundle args) throws Throwable {
protected PendingIntent onExecute(Context context, Bundle args) throws Throwable {
// Get arguments
long id = args.getLong("id");
Intent data = args.getParcelable("data");
@@ -1308,7 +1308,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}
@Override
protected void onLoaded(Bundle args, PendingIntent pi) {
protected void onExecuted(Bundle args, PendingIntent pi) {
if (pi != null)
try {
Log.i("PGP executing pi=" + pi);
@@ -1329,7 +1329,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
else
Helper.unexpectedError(ActivityView.this, ActivityView.this, ex);
}
}.load(ActivityView.this, args);
}.execute(ActivityView.this, args);
}
@Override
@@ -1343,7 +1343,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
new SimpleTask<Void>() {
@Override
protected Void onLoad(Context context, Bundle args) throws Throwable {
protected Void onExecute(Context context, Bundle args) throws Throwable {
long id = args.getLong("id");
Uri uri = args.getParcelable("uri");
@@ -1389,7 +1389,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}
@Override
protected void onLoaded(Bundle args, Void data) {
protected void onExecuted(Bundle args, Void data) {
Toast.makeText(ActivityView.this, R.string.title_attachment_saved, Toast.LENGTH_LONG).show();
}
@@ -1400,7 +1400,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
else
Helper.unexpectedError(ActivityView.this, ActivityView.this, ex);
}
}.load(this, args);
}.execute(this, args);
}
} else if (requestCode == REQUEST_DECRYPT) {
if (data != null)