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

fixed conversation load

This commit is contained in:
Mariotaku Lee 2017-02-15 01:09:56 +08:00
parent 42db9325c8
commit 177b682d84
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
5 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/Status.java
View File

@ -174,6 +174,9 @@ public class Status extends TwitterResponseObject implements Comparable<Status>,
@JsonField(name = "statusnet_conversation_id")
String statusnetConversationId;
@JsonField(name = "conversation_id")
String conversationId;
/**
* For GNU social
@ -414,6 +417,10 @@ public class Status extends TwitterResponseObject implements Comparable<Status>,
return attentions;
}
public String getConversationId() {
return conversationId;
}
public String getLang() {
return lang;
}

4
twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java
View File

@ -520,6 +520,10 @@ public class ParcelableStatus implements Parcelable, Comparable<ParcelableStatus
@ParcelableThisPlease
@Nullable
public int[] quoted_display_text_range;
@JsonField(name = "conversation_id")
@ParcelableThisPlease
@Nullable
public String conversation_id;
@Override
public int describeContents() {

17
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StatusFragment.kt
View File

@ -157,9 +157,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
val loader = ConversationLoader(activity, status, sinceId, maxId, sinceSortId, maxSortId,
adapter.getData(), true, loadingMore)
// Setting comparator to null lets statuses sort ascending
loader.comparator = Comparator { l, r ->
(r.sort_id - l.sort_id).toInt()
}
loader.comparator = null
return loader
}
@ -1557,13 +1555,12 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
val itemType = getItemType(position)
when (itemType) {
ITEM_IDX_CONVERSATION -> {
if (data == null) return null
return data!![position - getIndexStart(ITEM_IDX_CONVERSATION)]
return data?.get(position - getIndexStart(ITEM_IDX_CONVERSATION))
}
ITEM_IDX_REPLY -> {
if (data == null || replyStart < 0) return null
return data!![position - getIndexStart(ITEM_IDX_CONVERSATION)
- getTypeCount(ITEM_IDX_CONVERSATION) - getTypeCount(ITEM_IDX_STATUS) + replyStart]
if (replyStart < 0) return null
return data?.get(position - getIndexStart(ITEM_IDX_CONVERSATION)
- getTypeCount(ITEM_IDX_CONVERSATION) - getTypeCount(ITEM_IDX_STATUS) + replyStart)
}
ITEM_IDX_STATUS -> {
return status
@ -1651,7 +1648,9 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
data.forEachIndexed { i, item ->
if (item.sort_id < sortId) {
conversationCount++
} else if (item.sort_id > sortId && status.id != item.id) {
} else if (status.id == item.id) {
this.status = item
} else if (item.sort_id > sortId) {
if (replyStart < 0) {
replyStart = i
}

10
twidere/src/main/kotlin/org/mariotaku/twidere/loader/ConversationLoader.kt
View File

@ -66,16 +66,14 @@ class ConversationLoader(
canLoadAllReplies = isOfficial
if (isOfficial) {
return microBlog.showConversation(status.id, paging)
} else {
return showConversationCompat(microBlog, details, status, true)
}
return showConversationCompat(microBlog, details, status, true)
}
AccountType.STATUSNET -> {
canLoadAllReplies = true
if (status.extras != null && status.extras.statusnet_conversation_id != null) {
return microBlog.getStatusNetConversation(status.extras.statusnet_conversation_id, paging)
}
return microBlog.showConversation(status.id, paging)
}
AccountType.FANFOU -> {
canLoadAllReplies = true
@ -88,10 +86,8 @@ class ConversationLoader(
}
@Throws(MicroBlogException::class)
private fun showConversationCompat(twitter: MicroBlog,
details: AccountDetails,
status: ParcelableStatus,
loadReplies: Boolean): List<Status> {
private fun showConversationCompat(twitter: MicroBlog, details: AccountDetails,
status: ParcelableStatus, loadReplies: Boolean): List<Status> {
val statuses = ArrayList<Status>()
val noSinceMaxId = maxId == null && sinceId == null
// Load conversations

6
twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableStatusUtils.kt
View File

@ -1,10 +1,8 @@
package org.mariotaku.twidere.model.util
import android.text.Spannable
import android.text.Spanned
import android.text.style.URLSpan
import org.mariotaku.microblog.library.twitter.model.Status
import org.mariotaku.twidere.extension.model.applyTo
import org.mariotaku.twidere.model.*
import org.mariotaku.twidere.model.ParcelableStatus.FilterFlags
import org.mariotaku.twidere.util.HtmlSpanBuilder
@ -28,8 +26,7 @@ object ParcelableStatusUtils {
status.retweet_id = null
}
fun fromStatus(orig: Status, accountKey: UserKey,
isGap: Boolean): ParcelableStatus {
fun fromStatus(orig: Status, accountKey: UserKey, isGap: Boolean): ParcelableStatus {
val result = ParcelableStatus()
result.is_gap = isGap
result.account_key = accountKey
@ -41,6 +38,7 @@ object ParcelableStatusUtils {
result.extras.external_url = orig.inferExternalUrl()
result.extras.support_entities = orig.entities != null
result.extras.statusnet_conversation_id = orig.statusnetConversationId
result.extras.conversation_id = orig.conversationId
result.is_pinned_status = orig.user.pinnedTweetIds?.contains(orig.id) ?: false
val retweetedStatus = orig.retweetedStatus