From 2fda4ebd35d230b20dcf4a62599e9031eeeb7c30 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 1 Aug 2019 08:38:15 +0200 Subject: [PATCH] Prevent crash --- .../main/java/eu/faircode/email/ActivityView.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index b5c5290f75..7a3f496ff5 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -35,6 +35,7 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.os.Handler; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -510,15 +511,17 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB } if (intent.hasExtra(Intent.EXTRA_PROCESS_TEXT)) { - searching = true; - String search = getIntent().getCharSequenceExtra(Intent.EXTRA_PROCESS_TEXT).toString(); + CharSequence csearch = getIntent().getCharSequenceExtra(Intent.EXTRA_PROCESS_TEXT); + String search = (csearch == null ? null : csearch.toString()); + if (!TextUtils.isEmpty(search)) { + searching = true; + FragmentMessages.search( + ActivityView.this, ActivityView.this, getSupportFragmentManager(), + -1, false, search); + } intent.removeExtra(Intent.EXTRA_PROCESS_TEXT); setIntent(intent); - - FragmentMessages.search( - ActivityView.this, ActivityView.this, getSupportFragmentManager(), - -1, false, search); } }