From a1fb11357bbd9eb614075f57f89274f5069ea2ea Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 7 Oct 2016 23:06:47 +0200
Subject: [PATCH] Fixed NPEs in identity creation dialogs

---
 .../abit/dialog/AddIdentityDialogFragment.java | 18 +++++++++++-------
 app/src/main/res/values-de/strings.xml         |  1 +
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/ch/dissem/apps/abit/dialog/AddIdentityDialogFragment.java b/app/src/main/java/ch/dissem/apps/abit/dialog/AddIdentityDialogFragment.java
index f404c9c..710ead0 100644
--- a/app/src/main/java/ch/dissem/apps/abit/dialog/AddIdentityDialogFragment.java
+++ b/app/src/main/java/ch/dissem/apps/abit/dialog/AddIdentityDialogFragment.java
@@ -24,6 +24,7 @@ import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentActivity;
 import android.support.v7.app.AppCompatDialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -63,9 +64,10 @@ public class AddIdentityDialogFragment extends AppCompatDialogFragment {
         view.findViewById(R.id.ok).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                final Context ctx = getActivity().getBaseContext();
                 switch (radioGroup.getCheckedRadioButtonId()) {
                     case R.id.create_identity:
-                        Toast.makeText(getActivity(),
+                        Toast.makeText(ctx,
                             R.string.toast_long_running_operation,
                             Toast.LENGTH_SHORT).show();
                         new AsyncTask<Void, Void, BitmessageAddress>() {
@@ -76,7 +78,7 @@ public class AddIdentityDialogFragment extends AppCompatDialogFragment {
 
                             @Override
                             protected void onPostExecute(BitmessageAddress chan) {
-                                Toast.makeText(getActivity(),
+                                Toast.makeText(ctx,
                                     R.string.toast_identity_created,
                                     Toast.LENGTH_SHORT).show();
                                 MainActivity mainActivity = MainActivity.getInstance();
@@ -87,7 +89,7 @@ public class AddIdentityDialogFragment extends AppCompatDialogFragment {
                         }.execute();
                         break;
                     case R.id.import_identity:
-                        startActivity(new Intent(getActivity(), ImportIdentityActivity.class));
+                        startActivity(new Intent(ctx, ImportIdentityActivity.class));
                         break;
                     case R.id.add_chan:
                         addChanDialog();
@@ -113,17 +115,19 @@ public class AddIdentityDialogFragment extends AppCompatDialogFragment {
     }
 
     private void addChanDialog() {
+        FragmentActivity activity = getActivity();
+        final Context ctx = activity.getBaseContext();
         @SuppressLint("InflateParams")
-        final View dialogView = getActivity().getLayoutInflater()
+        final View dialogView = activity.getLayoutInflater()
             .inflate(R.layout.dialog_input_passphrase, null);
-        new AlertDialog.Builder(getActivity())
+        new AlertDialog.Builder(activity)
             .setTitle(R.string.add_chan)
             .setView(dialogView)
             .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialogInterface, int i) {
                     TextView passphrase = (TextView) dialogView.findViewById(R.id.passphrase);
-                    Toast.makeText(getActivity(), R.string.toast_long_running_operation,
+                    Toast.makeText(ctx, R.string.toast_long_running_operation,
                         Toast.LENGTH_SHORT).show();
                     new AsyncTask<String, Void, BitmessageAddress>() {
                         @Override
@@ -137,7 +141,7 @@ public class AddIdentityDialogFragment extends AppCompatDialogFragment {
 
                         @Override
                         protected void onPostExecute(BitmessageAddress chan) {
-                            Toast.makeText(getActivity(),
+                            Toast.makeText(ctx,
                                 R.string.toast_chan_created,
                                 Toast.LENGTH_SHORT).show();
                             MainActivity mainActivity = MainActivity.getInstance();
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 89dec00..f5b3f69 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -103,4 +103,5 @@ Als Alternative kann in den Einstellungen ein vertrauenswürdiger Knoten konfigu
     <string name="select_file_title">Datei auswählen</string>
     <string name="select_identities_to_import">Bitte wähle die zu importierenden Identitäten:</string>
     <string name="import_input_description">Du kannst einfach den Inhalt eines Exports oder einer ‘keys.dat’-Datei einfügen</string>
+    <string name="name">Name</string>
 </resources>