From 9040dca0861e4770e8195278c765d8bcfd58fd7b Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Mon, 27 Mar 2017 20:47:12 +0800
Subject: [PATCH] fixed wrong json parser condition

---
 .../twitter/model/ResponseList$$JsonObjectMapper.java       | 2 +-
 twidere/build.gradle                                        | 4 ++--
 .../kotlin/org/mariotaku/twidere/fragment/DraftsFragment.kt | 3 ++-
 .../mariotaku/twidere/loader/MicroBlogAPIStatusesLoader.kt  | 6 +-----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList$$JsonObjectMapper.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList$$JsonObjectMapper.java
index 419ca7c14..f1c1b8444 100644
--- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList$$JsonObjectMapper.java
+++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList$$JsonObjectMapper.java
@@ -55,7 +55,7 @@ public final class ResponseList$$JsonObjectMapper<T> extends JsonMapper<Response
                 jsonParser.skipChildren();
             }
             return instance;
-        } else if (jsonParser.getCurrentToken() != JsonToken.START_ARRAY) {
+        } else if (jsonParser.getCurrentToken() == JsonToken.START_ARRAY) {
             return new ResponseList<>(m84ClassJsonMapper.parseList(jsonParser));
         }
         jsonParser.skipChildren();
diff --git a/twidere/build.gradle b/twidere/build.gradle
index 4cbb4e7ae..2ce943721 100644
--- a/twidere/build.gradle
+++ b/twidere/build.gradle
@@ -36,8 +36,8 @@ android {
         applicationId "org.mariotaku.twidere"
         minSdkVersion project.properties['overrideMinSdkVersion'] ?: 14
         targetSdkVersion 25
-        versionCode 307
-        versionName '3.4.45'
+        versionCode 308
+        versionName '3.4.46'
         multiDexEnabled true
 
         buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")'
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DraftsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DraftsFragment.kt
index 9de086337..e950ddf46 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DraftsFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DraftsFragment.kt
@@ -47,6 +47,7 @@ import kotlinx.android.synthetic.main.fragment_drafts.*
 import org.mariotaku.kpreferences.get
 import org.mariotaku.ktextension.setItemAvailability
 import org.mariotaku.sqliteqb.library.Expression
+import org.mariotaku.sqliteqb.library.OrderBy
 import org.mariotaku.twidere.R
 import org.mariotaku.twidere.TwidereConstants.*
 import org.mariotaku.twidere.activity.iface.IBaseActivity
@@ -109,7 +110,7 @@ class DraftsFragment : BaseFragment(), LoaderCallbacks<Cursor?>, OnItemClickList
     override fun onCreateLoader(id: Int, args: Bundle?): Loader<Cursor?> {
         val uri = Drafts.CONTENT_URI_UNSENT
         val cols = Drafts.COLUMNS
-        val orderBy = Drafts.TIMESTAMP + " DESC"
+        val orderBy = OrderBy(Drafts.TIMESTAMP, false).sql
         return CursorLoader(activity, uri, cols, null, null, orderBy)
     }
 
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/MicroBlogAPIStatusesLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/MicroBlogAPIStatusesLoader.kt
index 82b7c9b5a..3c0246bf6 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/MicroBlogAPIStatusesLoader.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/MicroBlogAPIStatusesLoader.kt
@@ -23,13 +23,11 @@ import android.accounts.AccountManager
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
 import android.support.annotation.WorkerThread
-import android.util.Log
 import org.mariotaku.kpreferences.get
 import org.mariotaku.microblog.library.MicroBlog
 import org.mariotaku.microblog.library.MicroBlogException
 import org.mariotaku.microblog.library.twitter.model.Paging
 import org.mariotaku.microblog.library.twitter.model.Status
-import org.mariotaku.twidere.BuildConfig
 import org.mariotaku.twidere.R
 import org.mariotaku.twidere.TwidereConstants.*
 import org.mariotaku.twidere.app.TwidereApplication
@@ -121,9 +119,7 @@ abstract class MicroBlogAPIStatusesLoader(
         } catch (e: MicroBlogException) {
             // mHandler.post(new ShowErrorRunnable(e));
             exception = e
-            if (BuildConfig.DEBUG) {
-                Log.w(LOGTAG, e)
-            }
+            DebugLog.w(tr = e)
             return ListResponse.getListInstance(CopyOnWriteArrayList(data), e)
         }