mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-23 14:41:08 +00:00
Code Issues Releases Wiki Activity

Improved error message

Browse source
This commit is contained in:
M66B 2022-10-21 10:35:13 +02:00
parent ea9e58d3ae
commit aabde2a61c
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -6393,13 +6393,17 @@ public class FragmentMessages extends FragmentBase
}); });
snackbar.show(); snackbar.show();
} else { } else {
Bundle args = new Bundle(); if (viewType == AdapterMessage.ViewType.SEARCH && !server)
args.putString("error", Log.formatThrowable(ex, false)); Log.unexpectedError(getParentFragmentManager(), ex);
else {
Bundle args = new Bundle();
args.putString("error", Log.formatThrowable(ex, false));
FragmentDialogBoundaryError fragment = new FragmentDialogBoundaryError(); FragmentDialogBoundaryError fragment = new FragmentDialogBoundaryError();
fragment.setArguments(args); fragment.setArguments(args);
fragment.setTargetFragment(FragmentMessages.this, REQUEST_BOUNDARY_RETRY); fragment.setTargetFragment(FragmentMessages.this, REQUEST_BOUNDARY_RETRY);
fragment.show(getParentFragmentManager(), "boundary:error"); fragment.show(getParentFragmentManager(), "boundary:error");
}
} }
} }
}; };
@ -10612,12 +10616,13 @@ public class FragmentMessages extends FragmentBase
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
String error = getArguments().getString("error"); String error = getArguments().getString("error");
View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_boundary_error, null); final Context context = getContext();
View dview = LayoutInflater.from(context).inflate(R.layout.dialog_boundary_error, null);
TextView tvError = dview.findViewById(R.id.tvError); TextView tvError = dview.findViewById(R.id.tvError);
tvError.setText(error); tvError.setText(error);
return new AlertDialog.Builder(getContext()) return new AlertDialog.Builder(context)
.setView(dview) .setView(dview)
.setPositiveButton(R.string.title_boundary_retry, new DialogInterface.OnClickListener() { .setPositiveButton(R.string.title_boundary_retry, new DialogInterface.OnClickListener() {
@Override @Override