msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Refactoring

Browse Source
pull/215/head
M66B 1 year ago
parent d21d766cf1
commit 15ecc61a29
17 changed files with 144 additions and 126 deletions
Show Stats Download Patch File Download Diff File

5
app/src/main/java/eu/faircode/email/ActivityEML.java
Unescape View File

@ -700,8 +700,9 @@ public class ActivityEML extends ActivityBase {
@Override @Override
protected void onException(Bundle args, @NonNull Throwable ex) { protected void onException(Bundle args, @NonNull Throwable ex) {
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(findViewById(android.R.id.content), new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(findViewById(android.R.id.content), new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(getSupportFragmentManager(), ex); Log.unexpectedError(getSupportFragmentManager(), ex);
} }

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

@ -1455,8 +1455,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
final View content = drawerLayout.getChildAt(0); final View content = drawerLayout.getChildAt(0);
final Snackbar snackbar = Snackbar.make(content, title, Snackbar.LENGTH_INDEFINITE) final Snackbar snackbar = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(content, title, Snackbar.LENGTH_INDEFINITE));
Helper.setSnackbarLines(snackbar, 7); Helper.setSnackbarLines(snackbar, 7);
lastSnackbar = snackbar; lastSnackbar = snackbar;

9
app/src/main/java/eu/faircode/email/AdapterFolder.java
Unescape View File

@ -913,8 +913,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalStateException) { if (ex instanceof IllegalStateException) {
Snackbar snackbar = Snackbar.make(parentFragment.getView(), new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Snackbar snackbar = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(parentFragment.getView(), new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG));
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -925,8 +925,9 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
}); });
snackbar.show(); snackbar.show();
} else if (ex instanceof IllegalArgumentException) } else if (ex instanceof IllegalArgumentException)
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(parentFragment.getParentFragmentManager(), ex); Log.unexpectedError(parentFragment.getParentFragmentManager(), ex);
} }

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

@ -3537,8 +3537,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof OutOfMemoryError) if (ex instanceof OutOfMemoryError)
Snackbar.make(parentFragment.getView(), new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(parentFragment.getView(), new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(parentFragment.getParentFragmentManager(), ex); Log.unexpectedError(parentFragment.getParentFragmentManager(), ex);
} }

15
app/src/main/java/eu/faircode/email/FragmentAccount.java
Unescape View File

@ -719,8 +719,9 @@ public class FragmentAccount extends FragmentBase {
(ex instanceof UnknownHostException || (ex instanceof UnknownHostException ||
ex instanceof FileNotFoundException || ex instanceof FileNotFoundException ||
ex instanceof IllegalArgumentException)) ex instanceof IllegalArgumentException))
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }
@ -883,8 +884,9 @@ public class FragmentAccount extends FragmentBase {
cbIdentity.setVisibility(View.GONE); cbIdentity.setVisibility(View.GONE);
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
showError(ex); showError(ex);
} }
@ -1518,8 +1520,9 @@ public class FragmentAccount extends FragmentBase {
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
showError(ex); showError(ex);
} }

9
app/src/main/java/eu/faircode/email/FragmentAccounts.java
Unescape View File

@ -669,8 +669,8 @@ public class FragmentAccounts extends FragmentBase {
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalStateException) { if (ex instanceof IllegalStateException) {
Snackbar snackbar = Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Snackbar snackbar = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG));
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -681,8 +681,9 @@ public class FragmentAccounts extends FragmentBase {
}); });
snackbar.show(); snackbar.show();
} else if (ex instanceof IllegalArgumentException) } else if (ex instanceof IllegalArgumentException)
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }

5
app/src/main/java/eu/faircode/email/FragmentAnswer.java
Unescape View File

@ -542,8 +542,9 @@ public class FragmentAnswer extends FragmentBase {
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }

59
app/src/main/java/eu/faircode/email/FragmentCompose.java
Unescape View File

@ -3087,8 +3087,8 @@ public class FragmentCompose extends FragmentBase {
PackageManager pm = getContext().getPackageManager(); PackageManager pm = getContext().getPackageManager();
Intent intent = new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION); Intent intent = new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION);
if (intent.resolveActivity(pm) == null) { // action whitelisted if (intent.resolveActivity(pm) == null) { // action whitelisted
Snackbar snackbar = Snackbar.make(view, getString(R.string.title_no_recorder), Snackbar.LENGTH_INDEFINITE) Snackbar snackbar = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(view, getString(R.string.title_no_recorder), Snackbar.LENGTH_INDEFINITE));
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -3137,8 +3137,7 @@ public class FragmentCompose extends FragmentBase {
} }
private void noStorageAccessFramework() { private void noStorageAccessFramework() {
Snackbar snackbar = Snackbar.make(view, R.string.title_no_saf, Snackbar.LENGTH_LONG) Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_no_saf, Snackbar.LENGTH_LONG));
.setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -3222,8 +3221,7 @@ public class FragmentCompose extends FragmentBase {
@Override @Override
public void onNothingSelected() { public void onNothingSelected() {
Snackbar snackbar = Snackbar.make(view, R.string.title_no_key, Snackbar.LENGTH_LONG) Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_no_key, Snackbar.LENGTH_LONG));
.setGestureInsetBottomIgnored(true);
final Intent intent = (Build.VERSION.SDK_INT < Build.VERSION_CODES.R final Intent intent = (Build.VERSION.SDK_INT < Build.VERSION_CODES.R
? KeyChain.createInstallIntent() ? KeyChain.createInstallIntent()
: new Intent(Settings.ACTION_SECURITY_SETTINGS)); : new Intent(Settings.ACTION_SECURITY_SETTINGS));
@ -3290,8 +3288,9 @@ public class FragmentCompose extends FragmentBase {
onPgp(intent); onPgp(intent);
} catch (Throwable ex) { } catch (Throwable ex) {
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else { else {
Log.e(ex); Log.e(ex);
Log.unexpectedError(FragmentCompose.this, ex); Log.unexpectedError(FragmentCompose.this, ex);
@ -3619,8 +3618,8 @@ public class FragmentCompose extends FragmentBase {
// https://developer.android.com/training/camera/photobasics // https://developer.android.com/training/camera/photobasics
Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
if (intent.resolveActivity(pm) == null) { // action whitelisted if (intent.resolveActivity(pm) == null) { // action whitelisted
Snackbar snackbar = Snackbar.make(view, getString(R.string.title_no_camera), Snackbar.LENGTH_LONG) Snackbar snackbar = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(view, getString(R.string.title_no_camera), Snackbar.LENGTH_LONG));
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -4269,11 +4268,11 @@ public class FragmentCompose extends FragmentBase {
if (ex instanceof IllegalArgumentException if (ex instanceof IllegalArgumentException
|| ex instanceof GeneralSecurityException /* InvalidKeyException */) { || ex instanceof GeneralSecurityException /* InvalidKeyException */) {
Log.i(ex); Log.i(ex);
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
} else if (ex instanceof OperationCanceledException) { } else if (ex instanceof OperationCanceledException) {
Snackbar snackbar = Snackbar.make(view, R.string.title_no_openpgp, Snackbar.LENGTH_INDEFINITE) Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_no_openpgp, Snackbar.LENGTH_INDEFINITE));
.setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -4630,8 +4629,8 @@ public class FragmentCompose extends FragmentBase {
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException) { if (ex instanceof IllegalArgumentException) {
Log.i(ex); Log.i(ex);
Snackbar snackbar = Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_INDEFINITE) Snackbar snackbar = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_INDEFINITE));
Helper.setSnackbarLines(snackbar, 7); Helper.setSnackbarLines(snackbar, 7);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
@ -6359,9 +6358,8 @@ public class FragmentCompose extends FragmentBase {
bottom_navigation.getMenu().findItem(R.id.action_redo).setVisible(data.draft.revision < data.draft.revisions); bottom_navigation.getMenu().findItem(R.id.action_redo).setVisible(data.draft.revision < data.draft.revisions);
if (args.getBoolean("noreply")) { if (args.getBoolean("noreply")) {
final Snackbar snackbar = Snackbar.make( final Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(
view, R.string.title_noreply_reminder, Snackbar.LENGTH_INDEFINITE) view, R.string.title_noreply_reminder, Snackbar.LENGTH_INDEFINITE));
.setGestureInsetBottomIgnored(true);
snackbar.setAction(android.R.string.ok, new View.OnClickListener() { snackbar.setAction(android.R.string.ok, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
@ -6370,9 +6368,8 @@ public class FragmentCompose extends FragmentBase {
}); });
snackbar.show(); snackbar.show();
} else if (args.getBoolean("incomplete")) { } else if (args.getBoolean("incomplete")) {
final Snackbar snackbar = Snackbar.make( final Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(
view, R.string.title_attachments_incomplete, Snackbar.LENGTH_INDEFINITE) view, R.string.title_attachments_incomplete, Snackbar.LENGTH_INDEFINITE));
.setGestureInsetBottomIgnored(true);
snackbar.setAction(android.R.string.ok, new View.OnClickListener() { snackbar.setAction(android.R.string.ok, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
@ -6631,8 +6628,8 @@ public class FragmentCompose extends FragmentBase {
String msg = getResources().getQuantityString( String msg = getResources().getQuantityString(
R.plurals.title_notification_unseen, diff, diff); R.plurals.title_notification_unseen, diff, diff);
Snackbar snackbar = Snackbar.make(view, msg, Snackbar.LENGTH_INDEFINITE) Snackbar snackbar = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(view, msg, Snackbar.LENGTH_INDEFINITE));
snackbar.setAction(R.string.title_show, new View.OnClickListener() { snackbar.setAction(R.string.title_show, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -6696,8 +6693,8 @@ public class FragmentCompose extends FragmentBase {
if (ex instanceof MessageRemovedException) if (ex instanceof MessageRemovedException)
finish(); finish();
else if (ex instanceof OperationCanceledException) { else if (ex instanceof OperationCanceledException) {
Snackbar snackbar = Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_INDEFINITE) Snackbar snackbar = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_INDEFINITE));
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -6732,8 +6729,9 @@ public class FragmentCompose extends FragmentBase {
at android.content.ContentResolver.openInputStream(ContentResolver.java:1187) at android.content.ContentResolver.openInputStream(ContentResolver.java:1187)
at eu.faircode.email.FragmentCompose.addAttachment(SourceFile:27) at eu.faircode.email.FragmentCompose.addAttachment(SourceFile:27)
*/ */
Snackbar.make(view, new ThrowableWrapper(ex).toSafeString(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).toSafeString(), Snackbar.LENGTH_LONG))
.show();
} else { } else {
if (ex instanceof IOException && if (ex instanceof IOException &&
ex.getCause() instanceof ErrnoException && ex.getCause() instanceof ErrnoException &&
@ -7631,8 +7629,9 @@ public class FragmentCompose extends FragmentBase {
else { else {
setBusy(false); setBusy(false);
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }

10
app/src/main/java/eu/faircode/email/FragmentFolder.java
Unescape View File

@ -718,8 +718,9 @@ public class FragmentFolder extends FragmentBase {
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(getParentFragmentManager(), ex, !(ex instanceof SQLiteConstraintException)); Log.unexpectedError(getParentFragmentManager(), ex, !(ex instanceof SQLiteConstraintException));
} }
@ -777,8 +778,9 @@ public class FragmentFolder extends FragmentBase {
pbSave.setVisibility(View.GONE); pbSave.setVisibility(View.GONE);
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }

9
app/src/main/java/eu/faircode/email/FragmentFolders.java
Unescape View File

@ -585,8 +585,8 @@ public class FragmentFolders extends FragmentBase {
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalStateException) { if (ex instanceof IllegalStateException) {
Snackbar snackbar = Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Snackbar snackbar = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG));
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -597,8 +597,9 @@ public class FragmentFolders extends FragmentBase {
}); });
snackbar.show(); snackbar.show();
} else if (ex instanceof IllegalArgumentException) } else if (ex instanceof IllegalArgumentException)
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }

10
app/src/main/java/eu/faircode/email/FragmentIdentity.java
Unescape View File

@ -734,8 +734,9 @@ public class FragmentIdentity extends FragmentBase {
(ex instanceof UnknownHostException || (ex instanceof UnknownHostException ||
ex instanceof FileNotFoundException || ex instanceof FileNotFoundException ||
ex instanceof IllegalArgumentException)) ex instanceof IllegalArgumentException))
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }
@ -1244,8 +1245,9 @@ public class FragmentIdentity extends FragmentBase {
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
showError(ex); showError(ex);
} }

105
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -2424,8 +2424,8 @@ public class FragmentMessages extends FragmentBase
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalStateException) { if (ex instanceof IllegalStateException) {
Snackbar snackbar = Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Snackbar snackbar = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG));
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -2436,8 +2436,9 @@ public class FragmentMessages extends FragmentBase
}); });
snackbar.show(); snackbar.show();
} else if (ex instanceof IllegalArgumentException) } else if (ex instanceof IllegalArgumentException)
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }
@ -3749,8 +3750,9 @@ public class FragmentMessages extends FragmentBase
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }
@ -4177,8 +4179,7 @@ public class FragmentMessages extends FragmentBase
protected void onExecuted(Bundle args, List<EntityAnswer> answers) { protected void onExecuted(Bundle args, List<EntityAnswer> answers) {
final Context context = getContext(); final Context context = getContext();
if (answers == null || answers.size() == 0) { if (answers == null || answers.size() == 0) {
Snackbar snackbar = Snackbar.make(view, R.string.title_no_answers, Snackbar.LENGTH_LONG) Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_no_answers, Snackbar.LENGTH_LONG));
.setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -5635,8 +5636,7 @@ public class FragmentMessages extends FragmentBase
if (!redmi_note) if (!redmi_note)
return false; return false;
final Snackbar snackbar = Snackbar.make(view, R.string.app_data_loss, Snackbar.LENGTH_INDEFINITE) final Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.app_data_loss, Snackbar.LENGTH_INDEFINITE));
.setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_info, new View.OnClickListener() { snackbar.setAction(R.string.title_info, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -5666,10 +5666,9 @@ public class FragmentMessages extends FragmentBase
if (AlarmManagerCompatEx.canScheduleExactAlarms(context)) if (AlarmManagerCompatEx.canScheduleExactAlarms(context))
return false; return false;
final Snackbar snackbar = Snackbar.make(view, final Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view,
R.string.title_setup_alarm_12, R.string.title_setup_alarm_12,
Snackbar.LENGTH_INDEFINITE) Snackbar.LENGTH_INDEFINITE));
.setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -5691,8 +5690,7 @@ public class FragmentMessages extends FragmentBase
prefs.getBoolean("crash_reports_asked", false)) prefs.getBoolean("crash_reports_asked", false))
return false; return false;
final Snackbar snackbar = Snackbar.make(view, R.string.title_ask_help, Snackbar.LENGTH_INDEFINITE) final Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_ask_help, Snackbar.LENGTH_INDEFINITE));
.setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_info, new View.OnClickListener() { snackbar.setAction(R.string.title_info, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -5739,8 +5737,7 @@ public class FragmentMessages extends FragmentBase
return false; return false;
} }
final Snackbar snackbar = Snackbar.make(view, R.string.title_ask_review, Snackbar.LENGTH_INDEFINITE) final Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_ask_review, Snackbar.LENGTH_INDEFINITE));
.setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_info, new View.OnClickListener() { snackbar.setAction(R.string.title_info, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -5767,8 +5764,7 @@ public class FragmentMessages extends FragmentBase
if (prefs.getBoolean("third_party_notified", false)) if (prefs.getBoolean("third_party_notified", false))
return false; return false;
final Snackbar snackbar = Snackbar.make(view, R.string.title_third_party, Snackbar.LENGTH_INDEFINITE) final Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_third_party, Snackbar.LENGTH_INDEFINITE));
.setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_info, new View.OnClickListener() { snackbar.setAction(R.string.title_info, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -5846,8 +5842,7 @@ public class FragmentMessages extends FragmentBase
final int resid = (passwd > 0 final int resid = (passwd > 0
? R.string.title_check_gmail_password ? R.string.title_check_gmail_password
: R.string.title_check_gmail_oauth); : R.string.title_check_gmail_oauth);
final Snackbar snackbar = Snackbar.make(view, resid, Snackbar.LENGTH_INDEFINITE) final Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, resid, Snackbar.LENGTH_INDEFINITE));
.setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_info, new View.OnClickListener() { snackbar.setAction(R.string.title_info, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -5936,8 +5931,7 @@ public class FragmentMessages extends FragmentBase
final int resid = (passwd > 0 final int resid = (passwd > 0
? R.string.title_check_outlook_password ? R.string.title_check_outlook_password
: R.string.title_check_outlook_oauth); : R.string.title_check_outlook_oauth);
final Snackbar snackbar = Snackbar.make(view, resid, Snackbar.LENGTH_INDEFINITE) final Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, resid, Snackbar.LENGTH_INDEFINITE));
.setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_info, new View.OnClickListener() { snackbar.setAction(R.string.title_info, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -7259,8 +7253,8 @@ public class FragmentMessages extends FragmentBase
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
if (ex instanceof IllegalStateException) { if (ex instanceof IllegalStateException) {
// No internet connection // No internet connection
Snackbar snackbar = Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG) Snackbar snackbar = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG));
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -8193,8 +8187,9 @@ public class FragmentMessages extends FragmentBase
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }
@ -8851,8 +8846,8 @@ public class FragmentMessages extends FragmentBase
Helper.openAdvanced(context, create); Helper.openAdvanced(context, create);
PackageManager pm = context.getPackageManager(); PackageManager pm = context.getPackageManager();
if (create.resolveActivity(pm) == null) // system whitelisted if (create.resolveActivity(pm) == null) // system whitelisted
Snackbar.make(view, R.string.title_no_saf, Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_no_saf, Snackbar.LENGTH_LONG))
.setGestureInsetBottomIgnored(true).show(); .show();
else else
startActivityForResult(Helper.getChooser(context, create), REQUEST_RAW); startActivityForResult(Helper.getChooser(context, create), REQUEST_RAW);
} }
@ -8910,8 +8905,7 @@ public class FragmentMessages extends FragmentBase
@Override @Override
public void onNothingSelected() { public void onNothingSelected() {
Snackbar snackbar = Snackbar.make(view, R.string.title_no_key, Snackbar.LENGTH_LONG) Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_no_key, Snackbar.LENGTH_LONG));
.setGestureInsetBottomIgnored(true);
final Intent intent = (Build.VERSION.SDK_INT < Build.VERSION_CODES.R final Intent intent = (Build.VERSION.SDK_INT < Build.VERSION_CODES.R
? KeyChain.createInstallIntent() ? KeyChain.createInstallIntent()
: new Intent(Settings.ACTION_SECURITY_SETTINGS)); : new Intent(Settings.ACTION_SECURITY_SETTINGS));
@ -9156,15 +9150,16 @@ public class FragmentMessages extends FragmentBase
@Override @Override
protected void onExecuted(Bundle args, Void data) { protected void onExecuted(Bundle args, Void data) {
Snackbar.make(view, R.string.title_raw_saved, Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_raw_saved, Snackbar.LENGTH_LONG))
.setGestureInsetBottomIgnored(true).show(); .show();
} }
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException || ex instanceof FileNotFoundException) if (ex instanceof IllegalArgumentException || ex instanceof FileNotFoundException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG))
.show();
else if (!(ex instanceof MessageRemovedException)) else if (!(ex instanceof MessageRemovedException))
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }
@ -9495,8 +9490,8 @@ public class FragmentMessages extends FragmentBase
protected void onExecuted(Bundle args, PendingIntent pi) { protected void onExecuted(Bundle args, PendingIntent pi) {
if (args.containsKey("sigresult")) { if (args.containsKey("sigresult")) {
String text = args.getString("sigresult"); String text = args.getString("sigresult");
Snackbar sb = Snackbar.make(view, text, Snackbar.LENGTH_LONG) Snackbar sb = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(view, text, Snackbar.LENGTH_LONG));
Helper.setSnackbarLines(sb, 7); Helper.setSnackbarLines(sb, 7);
sb.show(); sb.show();
} }
@ -9523,11 +9518,11 @@ public class FragmentMessages extends FragmentBase
if (ex instanceof IllegalArgumentException) { if (ex instanceof IllegalArgumentException) {
Log.i(ex); Log.i(ex);
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG))
.show();
} else if (ex instanceof OperationCanceledException) { } else if (ex instanceof OperationCanceledException) {
Snackbar snackbar = Snackbar.make(view, R.string.title_no_openpgp, Snackbar.LENGTH_INDEFINITE) Snackbar snackbar = Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_no_openpgp, Snackbar.LENGTH_INDEFINITE));
.setGestureInsetBottomIgnored(true);
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -9906,8 +9901,9 @@ public class FragmentMessages extends FragmentBase
message = getString(R.string.title_signature_invalid); message = getString(R.string.title_signature_invalid);
else else
message = getString(R.string.title_signature_invalid_reason, reason); message = getString(R.string.title_signature_invalid_reason, reason);
Snackbar.make(view, message, Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, message, Snackbar.LENGTH_LONG))
.show();
} else } else
try { try {
boolean auto = args.getBoolean("auto"); boolean auto = args.getBoolean("auto");
@ -9932,8 +9928,8 @@ public class FragmentMessages extends FragmentBase
} }
if (known && !record.isExpired(time) && match && valid) if (known && !record.isExpired(time) && match && valid)
Snackbar.make(view, R.string.title_signature_valid, Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(Snackbar.make(view, R.string.title_signature_valid, Snackbar.LENGTH_LONG))
.setGestureInsetBottomIgnored(true).show(); .show();
else if (!auto) { else if (!auto) {
LayoutInflater inflator = LayoutInflater.from(getContext()); LayoutInflater inflator = LayoutInflater.from(getContext());
View dview = inflator.inflate(R.layout.dialog_certificate, null); View dview = inflator.inflate(R.layout.dialog_certificate, null);
@ -10043,14 +10039,16 @@ public class FragmentMessages extends FragmentBase
builder.show(); builder.show();
} }
} catch (Throwable ex) { } catch (Throwable ex) {
Snackbar.make(view, Log.formatThrowable(ex), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, Log.formatThrowable(ex), Snackbar.LENGTH_LONG))
.show();
} }
} else if (EntityMessage.SMIME_SIGNENCRYPT.equals(type)) { } else if (EntityMessage.SMIME_SIGNENCRYPT.equals(type)) {
String algo = args.getString("algo"); String algo = args.getString("algo");
if (!TextUtils.isEmpty(algo)) if (!TextUtils.isEmpty(algo))
Snackbar.make(view, algo, Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, algo, Snackbar.LENGTH_LONG))
.show();
} }
} }
@ -10062,8 +10060,9 @@ public class FragmentMessages extends FragmentBase
if (ex instanceof IllegalArgumentException || if (ex instanceof IllegalArgumentException ||
ex instanceof CMSException || ex instanceof KeyChainException) ex instanceof CMSException || ex instanceof KeyChainException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }
@ -10444,8 +10443,8 @@ public class FragmentMessages extends FragmentBase
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException) { if (ex instanceof IllegalArgumentException) {
Snackbar snackbar = Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_INDEFINITE) Snackbar snackbar = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_INDEFINITE));
snackbar.setAction(R.string.title_fix, new View.OnClickListener() { snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

5
app/src/main/java/eu/faircode/email/FragmentPop.java
Unescape View File

@ -792,8 +792,9 @@ public class FragmentPop extends FragmentBase {
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else { else {
tvError.setText(Log.formatThrowable(ex, false)); tvError.setText(Log.formatThrowable(ex, false));
grpError.setVisibility(View.VISIBLE); grpError.setVisibility(View.VISIBLE);

4
app/src/main/java/eu/faircode/email/FragmentPro.java
Unescape View File

@ -303,8 +303,8 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
if (view == null) if (view == null)
return; return;
Snackbar snackbar = Snackbar.make(view, message, Snackbar.LENGTH_INDEFINITE) Snackbar snackbar = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(view, message, Snackbar.LENGTH_INDEFINITE));
snackbar.setAction(R.string.title_setup_help, new View.OnClickListener() { snackbar.setAction(R.string.title_setup_help, new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {

5
app/src/main/java/eu/faircode/email/FragmentRule.java
Unescape View File

@ -1629,8 +1629,9 @@ public class FragmentRule extends FragmentBase {
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException) if (ex instanceof IllegalArgumentException)
Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG) Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true).show(); Snackbar.make(view, new ThrowableWrapper(ex).getSafeMessage(), Snackbar.LENGTH_LONG))
.show();
else else
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }

4
app/src/main/java/eu/faircode/email/FragmentSetup.java
Unescape View File

@ -1453,8 +1453,8 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
NumberFormat NF = NumberFormat.getInstance(); NumberFormat NF = NumberFormat.getInstance();
String msg = getString(R.string.title_setup_import_graph_new, NF.format(count)); String msg = getString(R.string.title_setup_import_graph_new, NF.format(count));
final Snackbar snackbar = Snackbar.make(view, msg, Snackbar.LENGTH_INDEFINITE) final Snackbar snackbar = Helper.setSnackbarOptions(
.setGestureInsetBottomIgnored(true); Snackbar.make(view, msg, Snackbar.LENGTH_INDEFINITE));
snackbar.setAction(R.string.title_check, new View.OnClickListener() { snackbar.setAction(R.string.title_check, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

5
app/src/main/java/eu/faircode/email/Helper.java
Unescape View File

@ -2067,6 +2067,11 @@ public class Helper {
view.setLayoutParams(lparam); view.setLayoutParams(lparam);
} }
static Snackbar setSnackbarOptions(Snackbar snackbar) {
snackbar.setGestureInsetBottomIgnored(true);
return snackbar;
}
static void setSnackbarLines(Snackbar snackbar, int lines) { static void setSnackbarLines(Snackbar snackbar, int lines) {
View sv = snackbar.getView(); View sv = snackbar.getView();
if (sv == null) if (sv == null)

Write Preview
Loading…
Cancel
Save