From dc2e42e1f2aa84b6a6c00760f0775bd9dba6671e Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 10 Jun 2019 07:38:24 -0300 Subject: [PATCH] [android] don't check getIntent() for null as it should be non-null now --- .../briar/android/contact/add/remote/AddContactActivity.java | 2 +- .../briarproject/briar/android/navdrawer/NavDrawerActivity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java index 3bca5ce75..8650c8233 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java @@ -57,7 +57,7 @@ public class AddContactActivity extends BriarActivity implements }); Intent i = getIntent(); - if (state == null && i != null) { + if (state == null) { // do not react to the intent again when recreating the activity onNewIntent(i); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java index 1b8ea5c4e..78f5fbb17 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java @@ -143,7 +143,7 @@ public class NavDrawerActivity extends BriarActivity implements startFragment(ContactListFragment.newInstance(), R.id.nav_btn_contacts); } - if (state == null && getIntent() != null) { + if (state == null) { // do not call this again when there's existing state onNewIntent(getIntent()); }