From a3c6dcd7be072fec36a53035e1befb421477ca52 Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Tue, 13 Jun 2017 12:05:36 +0800
Subject: [PATCH] fixed NPE

---
 .../mariotaku/twidere/util/InternalTwitterContentUtils.java | 6 +++++-
 .../kotlin/org/mariotaku/twidere/activity/SignInActivity.kt | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java
index 56c7862ace..ca4aea5ddb 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java
@@ -136,7 +136,11 @@ public static Pair<String, SpanItem[]> formatDirectMessageText(@NonNull final Di
 
     @NonNull
     public static Pair<String, SpanItem[]> formatDirectMessageText(@NonNull final DMResponse.Entry.Message.Data message) {
-        final HtmlBuilder builder = new HtmlBuilder(message.getText(), false, true, false);
+        String text = message.getText();
+        if (text == null) {
+            text = "";
+        }
+        final HtmlBuilder builder = new HtmlBuilder(text, false, true, false);
         StatusExtensionsKt.addEntities(builder, message);
         return builder.buildWithIndices();
     }
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt
index 3b54f8d083..cad3ffd6ba 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt
@@ -460,7 +460,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher,
     private fun showLoginTypeChooser() {
         executeAfterFragmentResumed {
             val fm = it.supportFragmentManager
-            val df = LoginTypeChooserDialogFragment()
+            val df = SignInTypeChooserDialogFragment()
             df.show(fm, "login_type_chooser")
         }
     }
@@ -557,7 +557,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher,
         finish()
     }
 
-    class LoginTypeChooserDialogFragment : BaseDialogFragment(),
+    class SignInTypeChooserDialogFragment : BaseDialogFragment(),
             LoaderManager.LoaderCallbacks<List<CustomAPIConfig>> {
         override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
             val builder = AlertDialog.Builder(context)