From 58f43471b4cd939f2394a3d1a18e8ff1c99916f3 Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Sat, 28 Jan 2017 18:37:41 +0800
Subject: [PATCH] fixed NPE and a non-fatal

---
 .../twidere/util/AsyncTwitterWrapper.java          | 14 +++++++-------
 .../twidere/adapter/UserAutoCompleteAdapter.kt     |  7 +------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/AsyncTwitterWrapper.java b/twidere/src/main/java/org/mariotaku/twidere/util/AsyncTwitterWrapper.java
index 7eaa51247..efe5475d9 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/util/AsyncTwitterWrapper.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/util/AsyncTwitterWrapper.java
@@ -1030,12 +1030,12 @@ public class AsyncTwitterWrapper extends TwitterWrapper {
     }
 
 
-    class DestroyMessageConversationTask extends ManagedAsyncTask<Object, Object, SingleResponse<Void>> {
+    class DestroyMessageConversationTask extends ManagedAsyncTask<Object, Object, SingleResponse<Boolean>> {
 
         private final String mUserId;
         private final UserKey mAccountKey;
 
-        public DestroyMessageConversationTask(final UserKey accountKey, final String userId) {
+        DestroyMessageConversationTask(final UserKey accountKey, final String userId) {
             super(context);
             mAccountKey = accountKey;
             mUserId = userId;
@@ -1061,24 +1061,24 @@ public class AsyncTwitterWrapper extends TwitterWrapper {
         }
 
         @Override
-        protected SingleResponse<Void> doInBackground(final Object... args) {
+        protected SingleResponse<Boolean> doInBackground(final Object... args) {
             final MicroBlog microBlog = MicroBlogAPIFactory.getInstance(context, mAccountKey);
-            if (microBlog == null) return SingleResponse.Companion.getInstance();
+            if (microBlog == null) return new SingleResponse<>(new MicroBlogException("No account"));
             try {
                 microBlog.destroyDirectMessagesConversation(mAccountKey.getId(), mUserId);
                 deleteMessages(mAccountKey, mUserId);
-                return SingleResponse.Companion.getInstance();
+                return new SingleResponse<>(true);
             } catch (final MicroBlogException e) {
                 if (isMessageNotFound(e)) {
                     deleteMessages(mAccountKey, mUserId);
                 }
-                return SingleResponse.Companion.getInstance(e);
+                return new SingleResponse<>(e);
             }
         }
 
 
         @Override
-        protected void onPostExecute(final SingleResponse<Void> result) {
+        protected void onPostExecute(final SingleResponse<Boolean> result) {
             super.onPostExecute(result);
             if (result == null) return;
             if (result.hasData() || isMessageNotFound(result.getException())) {
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/UserAutoCompleteAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/UserAutoCompleteAdapter.kt
index 34be86dec..cab817c36 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/UserAutoCompleteAdapter.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/UserAutoCompleteAdapter.kt
@@ -62,7 +62,7 @@ class UserAutoCompleteAdapter(val context: Context) : SimpleCursorAdapter(contex
 
     private var indices: ParcelableUserCursorIndices? = null
 
-    private var accountKey: UserKey? = null
+    var accountKey: UserKey? = null
 
     init {
         GeneralComponentHelper.build(context).inject(this)
@@ -125,11 +125,6 @@ class UserAutoCompleteAdapter(val context: Context) : SimpleCursorAdapter(contex
         return cursor
     }
 
-
-    fun setAccountKey(accountKey: UserKey) {
-        this.accountKey = accountKey
-    }
-
     override fun swapCursor(cursor: Cursor?): Cursor? {
         if (cursor != null) {
             indices = ParcelableUserCursorIndices(cursor)