From 34fa9545161298f9329095ae3e93e3ac4a0c514f Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Thu, 4 Dec 2014 22:57:58 +0000
Subject: [PATCH] Fixed NPE

---
 CHANGELOG                                                    | 3 +++
 .../i2p/bote/android/addressbook/EditContactActivity.java    | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 46e6dfd..7649b09 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+0.3.1
+ * Fixed crash when clicking "Create new contact" button
+
 0.3 / 2014-12-01 / ebba8aac78d50eda9d25f936e8bd348553966649
  * Migrated to new Material design from Android Lollipop
  * Overhauled password usability
diff --git a/app/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java b/app/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java
index 7202e9d..1c12577 100644
--- a/app/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java
+++ b/app/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java
@@ -33,7 +33,7 @@ public class EditContactActivity extends ActionBarActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         if (savedInstanceState == null) {
-            EditContactFragment f = null;
+            EditContactFragment f;
             Bundle args = getIntent().getExtras();
             if (args != null) {
                 String destination = args.getString(EditContactFragment.NEW_DESTINATION);
@@ -44,7 +44,8 @@ public class EditContactActivity extends ActionBarActivity {
                     destination = args.getString(EditContactFragment.CONTACT_DESTINATION);
                     f = EditContactFragment.newInstance(destination);
                 }
-            }
+            } else
+                f = EditContactFragment.newInstance(null);
             getSupportFragmentManager().beginTransaction()
                     .add(R.id.container, f).commit();
         }