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

fixed crashes

This commit is contained in:
Mariotaku Lee 2016-07-10 21:27:16 +08:00
parent 8abb62be16
commit dc8d7bd891
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
twidere/src/main/kotlin/org/mariotaku/twidere/activity/AccountSelectorActivity.kt
View File

@ -48,7 +48,7 @@ import org.mariotaku.twidere.model.ParcelableCredentials
import org.mariotaku.twidere.provider.TwidereDataStore.Accounts
import java.util.*
class AccountSelectorActivity : BaseActivity(), LoaderCallbacks<Cursor>, OnClickListener, OnItemClickListener {
class AccountSelectorActivity : BaseActivity(), LoaderCallbacks<Cursor?>, OnClickListener, OnItemClickListener {
private val mContentObserver = object : ContentObserver(null) {
@ -85,7 +85,7 @@ class AccountSelectorActivity : BaseActivity(), LoaderCallbacks<Cursor>, OnClick
}
}
override fun onCreateLoader(id: Int, args: Bundle): Loader<Cursor> {
override fun onCreateLoader(id: Int, args: Bundle?): Loader<Cursor?> {
val conditions = ArrayList<Expression>()
val conditionArgs = ArrayList<String>()
if (isOAuthOnly) {
@ -120,7 +120,7 @@ class AccountSelectorActivity : BaseActivity(), LoaderCallbacks<Cursor>, OnClick
Accounts.SORT_POSITION)
}
override fun onLoadFinished(loader: Loader<Cursor>, cursor: Cursor?) {
override fun onLoadFinished(loader: Loader<Cursor?>, cursor: Cursor?) {
val adapter = adapter!!
adapter.swapCursor(cursor)
if (cursor != null && firstCreated) {
@ -140,7 +140,7 @@ class AccountSelectorActivity : BaseActivity(), LoaderCallbacks<Cursor>, OnClick
}
}
override fun onLoaderReset(loader: Loader<Cursor>) {
override fun onLoaderReset(loader: Loader<Cursor?>) {
adapter!!.swapCursor(null)
}

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

@ -1439,9 +1439,9 @@ class StatusFragment : BaseSupportFragment(), LoaderCallbacks<SingleResponse<Par
var translationResult: TranslationResult? = null
set(translation) {
if (status == null || translation == null || !TextUtils.equals(InternalTwitterContentUtils.getOriginalId(status!!), translation.id)) {
translationResult = null
field = null
} else {
translationResult = translation
field = translation
}
notifyDataSetChanged()
}