fixed NPE

TwidereProject · Jun 13, 2017 · a3c6dcd · a3c6dcd
1 parent d71407f
commit a3c6dcd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 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
@@ -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
@@ -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)