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

Simplification

Browse Source
This commit is contained in:
M66B
2019-06-30 23:12:36 +02:00
parent 19c8fbce7a
commit 784f4bb442
3 changed files with 12 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3483,8 +3483,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
public static class FragmentDialogLink extends DialogFragment {
private TwoStateOwner owner = new TwoStateOwner("link:open");
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3619,7 +3617,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
else
tvOwner.setText(ex.getMessage());
}
}.execute(getContext(), owner, args, "link:domain");
}.execute(getContext(), getActivity(), args, "link:domain");
}
return new AlertDialog.Builder(getContext())
@@ -3628,36 +3626,22 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override
public void onClick(DialogInterface dialog, int which) {
Uri uri = Uri.parse(etLink.getText().toString());
Helper.view(getContext(), owner, uri, false);
Helper.view(getContext(), getActivity(), uri, false);
}
})
.setNeutralButton(R.string.title_browse, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Uri uri = Uri.parse(etLink.getText().toString());
Helper.view(getContext(), owner, uri, true);
Helper.view(getContext(), getActivity(), uri, true);
}
})
.setNegativeButton(R.string.title_no, null)
.show();
}
@Override
public void onStart() {
super.onStart();
owner.resume();
}
@Override
public void onDestroyView() {
owner.destroy();
super.onDestroyView();
}
}
public static class FragmentKeywordManage extends DialogFragment {
private TwoStateOwner owner = new TwoStateOwner("keyword:manage");
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3732,9 +3716,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getContext(), owner, ex);
Helper.unexpectedError(getContext(), getActivity(), ex);
}
}.execute(getContext(), owner, args, "message:keywords:managa");
}.execute(getContext(), getActivity(), args, "message:keywords:manage");
}
})
.setNeutralButton(R.string.title_add, new DialogInterface.OnClickListener() {
@@ -3750,23 +3734,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
})
.create();
}
@Override
public void onStart() {
super.onStart();
owner.resume();
}
@Override
public void onDestroyView() {
owner.destroy();
super.onDestroyView();
}
}
public static class FragmentKeywordAdd extends DialogFragment {
private TwoStateOwner owner = new TwoStateOwner("keyword:add");
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3810,24 +3780,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getContext(), owner, ex);
Helper.unexpectedError(getContext(), getActivity(), ex);
}
}.execute(getContext(), owner, args, "message:keyword:add");
}.execute(getContext(), getActivity(), args, "message:keyword:add");
}
}
}).create();
}
@Override
public void onStart() {
super.onStart();
owner.resume();
}
@Override
public void onDestroyView() {
owner.destroy();
super.onDestroyView();
}
}
}

18
app/src/main/java/eu/faircode/email/FragmentContacts.java
View File

@@ -181,8 +181,6 @@ public class FragmentContacts extends FragmentBase {
}
public static class FragmentDelete extends DialogFragment {
private TwoStateOwner owner = new TwoStateOwner("contacts:delete");
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -207,25 +205,13 @@ public class FragmentContacts extends FragmentBase {
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getContext(), owner, ex);
Helper.unexpectedError(getContext(), getActivity(), ex);
}
}.execute(getContext(), owner, new Bundle(), "contacts:delete");
}.execute(getContext(), getActivity(), new Bundle(), "contacts:delete");
}
})
.setNegativeButton(android.R.string.cancel, null)
.create();
}
@Override
public void onStart() {
super.onStart();
owner.resume();
}
@Override
public void onDestroyView() {
owner.destroy();
super.onDestroyView();
}
}
}

20
app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
View File

@@ -42,8 +42,6 @@ import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;
public class FragmentDialogFolder extends DialogFragment {
private TwoStateOwner owner = new TwoStateOwner("folder:select");
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -79,7 +77,7 @@ public class FragmentDialogFolder extends DialogFragment {
long account = args.getLong("account");
AdapterFolder adapter = new AdapterFolder(
getContext(), owner, FragmentDialogFolder.this,
getContext(), getActivity(), FragmentDialogFolder.this,
account, false, new AdapterFolder.IFolderSelectedListener() {
@Override
public void onFolderSelected(TupleFolderEx folder) {
@@ -99,9 +97,9 @@ public class FragmentDialogFolder extends DialogFragment {
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getContext(), owner, ex);
Helper.unexpectedError(getContext(), getActivity(), ex);
}
}.execute(getContext(), owner, args, "folder:select");
}.execute(getContext(), getActivity(), args, "folder:select");
return new AlertDialog.Builder(getContext())
.setTitle(title)
@@ -115,18 +113,6 @@ public class FragmentDialogFolder extends DialogFragment {
.create();
}
@Override
public void onStart() {
super.onStart();
owner.resume();
}
@Override
public void onDestroyView() {
owner.destroy();
super.onDestroyView();
}
private void sendResult(int result, long folder) {
Bundle args = getArguments();
args.putLong("folder", folder);