Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed NPE and a non-fatal

This commit is contained in:
Mariotaku Lee 2017-01-28 18:37:41 +08:00
parent a02e9623ac
commit 58f43471b4
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
twidere/src/main/java/org/mariotaku/twidere/util/AsyncTwitterWrapper.java
View File

@ -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())) {

7
twidere/src/main/kotlin/org/mariotaku/twidere/adapter/UserAutoCompleteAdapter.kt
View File

@ -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)