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

fixed wrong json parser condition

This commit is contained in:
Mariotaku Lee 2017-03-27 20:47:12 +08:00
parent 0c197cabe6
commit 9040dca086
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList$$JsonObjectMapper.java
View File

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

4
twidere/build.gradle
View File

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

3
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DraftsFragment.kt
View File

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

6
twidere/src/main/kotlin/org/mariotaku/twidere/loader/MicroBlogAPIStatusesLoader.kt
View File

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