Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-02-08 07:48:45 +01:00
Code Issues Releases Wiki Activity

trying to fix crashes

Browse Source
This commit is contained in:
Mariotaku Lee 2017-04-03 14:37:51 +08:00
parent 082c7840ea
commit b89b3d4963
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ import com.bumptech.glide.RequestManager
import org.apache.commons.lang3.ArrayUtils import org.apache.commons.lang3.ArrayUtils
import org.mariotaku.ktextension.contains import org.mariotaku.ktextension.contains
import org.mariotaku.ktextension.rangeOfSize import org.mariotaku.ktextension.rangeOfSize
import org.mariotaku.ktextension.safeGetLong
import org.mariotaku.ktextension.safeMoveToPosition import org.mariotaku.ktextension.safeMoveToPosition
import org.mariotaku.library.objectcursor.ObjectCursor import org.mariotaku.library.objectcursor.ObjectCursor
import org.mariotaku.microblog.library.twitter.model.Activity import org.mariotaku.microblog.library.twitter.model.Activity
@ -153,7 +154,7 @@ class ParcelableActivitiesAdapter(
val cursor = (data as ObjectCursor).cursor val cursor = (data as ObjectCursor).cursor
if (!cursor.safeMoveToPosition(dataPosition)) return -1 if (!cursor.safeMoveToPosition(dataPosition)) return -1
val indices = (data as ObjectCursor).indices val indices = (data as ObjectCursor).indices
return cursor.getLong(indices[Activities.TIMESTAMP]) return cursor.safeGetLong(indices[Activities.TIMESTAMP])
} }
return getActivity(adapterPosition, raw).timestamp return getActivity(adapterPosition, raw).timestamp
} }
@ -354,10 +355,10 @@ class ParcelableActivitiesAdapter(
if (timestamp <= 0) return RecyclerView.NO_POSITION if (timestamp <= 0) return RecyclerView.NO_POSITION
val range = rangeOfSize(activityStartIndex, getActivityCount(raw)) val range = rangeOfSize(activityStartIndex, getActivityCount(raw))
if (range.isEmpty()) return RecyclerView.NO_POSITION if (range.isEmpty()) return RecyclerView.NO_POSITION
if (timestamp < getTimestamp(range.last)) { if (timestamp < getTimestamp(range.last, raw)) {
return range.last return range.last
} }
return range.indexOfFirst { timestamp >= getTimestamp(it) } return range.indexOfFirst { timestamp >= getTimestamp(it, raw) }
} }
private fun updateItemCount() { private fun updateItemCount() {