From 074629c071e7fe627c61739373e10ee33e5874fa Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 7 Feb 2019 12:44:14 +0000 Subject: [PATCH] Small improvements --- .../java/eu/faircode/email/ActivityCompose.java | 1 + .../main/java/eu/faircode/email/ActivityEml.java | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java index d11e1ee1f8..01de0feb1b 100644 --- a/app/src/main/java/eu/faircode/email/ActivityCompose.java +++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java @@ -65,6 +65,7 @@ public class ActivityCompose extends ActivityBilling implements FragmentManager. Intent.ACTION_SENDTO.equals(action) || Intent.ACTION_SEND.equals(action) || Intent.ACTION_SEND_MULTIPLE.equals(action)) { + Log.i(intent.toString()); Log.logExtras(intent); args = new Bundle(); diff --git a/app/src/main/java/eu/faircode/email/ActivityEml.java b/app/src/main/java/eu/faircode/email/ActivityEml.java index 108064f6b0..9593b6936d 100644 --- a/app/src/main/java/eu/faircode/email/ActivityEml.java +++ b/app/src/main/java/eu/faircode/email/ActivityEml.java @@ -10,6 +10,8 @@ import android.text.Spanned; import android.view.View; import android.widget.TextView; +import com.google.android.material.snackbar.Snackbar; + import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -55,10 +57,18 @@ public class ActivityEml extends ActivityBase { args.putParcelable("uri", uri); new SimpleTask() { + @Override + protected void onPostExecute(Bundle args) { + pbWait.setVisibility(View.GONE); + } + @Override protected Result onExecute(Context context, Bundle args) throws Throwable { Uri uri = args.getParcelable("uri"); + if ("file".equals(uri.getScheme())) + throw new IllegalArgumentException(context.getString(R.string.title_no_stream)); + Result result = new Result(); InputStream is = null; @@ -119,12 +129,14 @@ public class ActivityEml extends ActivityBase { tvBody.setText(result.body); tvEml.setText(result.eml); grpEml.setVisibility(View.VISIBLE); - pbWait.setVisibility(View.GONE); } @Override protected void onException(Bundle args, Throwable ex) { - Helper.unexpectedError(ActivityEml.this, ActivityEml.this, ex); + if (ex instanceof IllegalArgumentException) + Snackbar.make(findViewById(android.R.id.content), ex.getMessage(), Snackbar.LENGTH_LONG).show(); + else + Helper.unexpectedError(ActivityEml.this, ActivityEml.this, ex); } }.execute(this, args, "eml"); }