From adbfcd956cb5cba9591396aea0e0ad4efd4207ad Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 23 Dec 2014 21:57:58 +0000
Subject: [PATCH] NPE fix

---
 .../i2p/bote/android/addressbook/ViewContactActivity.java  | 7 +++++++
 .../java/i2p/bote/android/config/ViewIdentityActivity.java | 7 +++++++
 .../java/i2p/bote/android/util/ViewAddressFragment.java    | 6 ++++++
 3 files changed, 20 insertions(+)

diff --git a/app/src/main/java/i2p/bote/android/addressbook/ViewContactActivity.java b/app/src/main/java/i2p/bote/android/addressbook/ViewContactActivity.java
index 42975fe..879cdfe 100644
--- a/app/src/main/java/i2p/bote/android/addressbook/ViewContactActivity.java
+++ b/app/src/main/java/i2p/bote/android/addressbook/ViewContactActivity.java
@@ -27,6 +27,13 @@ public class ViewContactActivity extends ActionBarActivity {
             Bundle args = getIntent().getExtras();
             if (args != null)
                 destination = args.getString(ViewContactFragment.ADDRESS);
+
+            if (destination == null) {
+                setResult(RESULT_CANCELED);
+                finish();
+                return;
+            }
+
             ViewContactFragment f = ViewContactFragment.newInstance(destination);
             getSupportFragmentManager().beginTransaction()
                     .add(android.R.id.content, f).commit();
diff --git a/app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java b/app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java
index fd30eb0..cc698dc 100644
--- a/app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java
+++ b/app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java
@@ -27,6 +27,13 @@ public class ViewIdentityActivity extends ActionBarActivity {
             Bundle args = getIntent().getExtras();
             if (args != null)
                 key = args.getString(ViewIdentityFragment.ADDRESS);
+
+            if (key == null) {
+                setResult(RESULT_CANCELED);
+                finish();
+                return;
+            }
+
             ViewIdentityFragment f = ViewIdentityFragment.newInstance(key);
             getSupportFragmentManager().beginTransaction()
                 .add(android.R.id.content, f).commit();
diff --git a/app/src/main/java/i2p/bote/android/util/ViewAddressFragment.java b/app/src/main/java/i2p/bote/android/util/ViewAddressFragment.java
index 111b27f..00f7f29 100644
--- a/app/src/main/java/i2p/bote/android/util/ViewAddressFragment.java
+++ b/app/src/main/java/i2p/bote/android/util/ViewAddressFragment.java
@@ -1,5 +1,6 @@
 package i2p.bote.android.util;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
@@ -111,6 +112,11 @@ public abstract class ViewAddressFragment extends Fragment {
 
         if (mAddress != null) {
             loadAddress();
+        } else {
+            // No address provided, finish
+            // Should not happen
+            getActivity().setResult(Activity.RESULT_CANCELED);
+            getActivity().finish();
         }
     }