From 9679ac641a19a0e6e746128af30dfaaa9e7627cc Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 8 Oct 2019 10:48:31 +0200 Subject: [PATCH] Prevent crash --- app/src/main/java/eu/faircode/email/ActivityBase.java | 4 ++-- app/src/main/java/eu/faircode/email/FragmentBase.java | 4 ++-- app/src/main/java/eu/faircode/email/FragmentDialogBase.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java index ed8a91519e..6ed5bc04c1 100644 --- a/app/src/main/java/eu/faircode/email/ActivityBase.java +++ b/app/src/main/java/eu/faircode/email/ActivityBase.java @@ -200,9 +200,9 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + String action = (data == null ? null : data.getAction()); Log.i("Result class=" + this.getClass().getSimpleName() + - " action=" + data.getAction() + - " request=" + requestCode + " result=" + resultCode); + " action=" + action + " request=" + requestCode + " result=" + resultCode); Log.logExtras(data); super.onActivityResult(requestCode, resultCode, data); } diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java index 16efe9449d..a5f07339d5 100644 --- a/app/src/main/java/eu/faircode/email/FragmentBase.java +++ b/app/src/main/java/eu/faircode/email/FragmentBase.java @@ -192,9 +192,9 @@ public class FragmentBase extends Fragment { @Override public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + String action = (data == null ? null : data.getAction()); Log.i("Result class=" + this.getClass().getSimpleName() + - " action=" + data.getAction() + - " request=" + requestCode + " result=" + resultCode); + " action=" + action + " request=" + requestCode + " result=" + resultCode); Log.logExtras(data); super.onActivityResult(requestCode, resultCode, data); diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogBase.java b/app/src/main/java/eu/faircode/email/FragmentDialogBase.java index 592c5a422b..1414ca07f4 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogBase.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogBase.java @@ -80,9 +80,9 @@ public class FragmentDialogBase extends DialogFragment { @Override public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + String action = (data == null ? null : data.getAction()); Log.i("Result class=" + this.getClass().getSimpleName() + - " action=" + data.getAction() + - " request=" + requestCode + " result=" + resultCode); + " action=" + action + " request=" + requestCode + " result=" + resultCode); Log.logExtras(data); super.onActivityResult(requestCode, resultCode, data); }