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

bug fixes

This commit is contained in:
Mariotaku Lee 2016-09-01 10:43:59 +08:00
parent 4b6d698132
commit 752c13c777
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt
View File

@ -73,7 +73,6 @@ import org.mariotaku.twidere.model.ParcelableCredentials.AuthType
import org.mariotaku.twidere.model.util.ParcelableAccountUtils import org.mariotaku.twidere.model.util.ParcelableAccountUtils
import org.mariotaku.twidere.model.util.ParcelableUserUtils import org.mariotaku.twidere.model.util.ParcelableUserUtils
import org.mariotaku.twidere.model.util.UserKeyUtils import org.mariotaku.twidere.model.util.UserKeyUtils
import org.mariotaku.twidere.provider.TwidereDataStore
import org.mariotaku.twidere.provider.TwidereDataStore.Accounts import org.mariotaku.twidere.provider.TwidereDataStore.Accounts
import org.mariotaku.twidere.util.* import org.mariotaku.twidere.util.*
import org.mariotaku.twidere.util.OAuthPasswordAuthenticator.* import org.mariotaku.twidere.util.OAuthPasswordAuthenticator.*
@ -378,16 +377,16 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher {
if (values != null) { if (values != null) {
val where = Expression.equalsArgs(Accounts.ACCOUNT_KEY).sql val where = Expression.equalsArgs(Accounts.ACCOUNT_KEY).sql
val whereArgs = arrayOf(values.getAsString(Accounts.ACCOUNT_KEY)) val whereArgs = arrayOf(values.getAsString(Accounts.ACCOUNT_KEY))
contentResolver!!.update(Accounts.CONTENT_URI, values, where, whereArgs) contentResolver.update(Accounts.CONTENT_URI, values, where, whereArgs)
} }
Toast.makeText(this, R.string.error_already_logged_in, Toast.LENGTH_SHORT).show() Toast.makeText(this, R.string.error_already_logged_in, Toast.LENGTH_SHORT).show()
} else if (result.succeed) { } else if (result.succeed) {
val values = result.toContentValues() val values = result.toContentValues()
if (values != null) { if (values != null) {
contentResolver!!.insert(Accounts.CONTENT_URI, values) contentResolver.insert(Accounts.CONTENT_URI, values)
} }
val intent = Intent(this, HomeActivity::class.java) val intent = Intent(this, HomeActivity::class.java)
//TODO refresh timelines //TODO refresh time lines
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT) intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
startActivity(intent) startActivity(intent)
finish() finish()
@ -433,13 +432,12 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher {
internal fun showSignInProgressDialog() { internal fun showSignInProgressDialog() {
executeAfterFragmentResumed { executeAfterFragmentResumed {
if (isFinishing) return@executeAfterFragmentResumed Unit if (isFinishing) return@executeAfterFragmentResumed
val fm = supportFragmentManager val fm = supportFragmentManager
val ft = fm.beginTransaction() val ft = fm.beginTransaction()
val fragment = ProgressDialogFragment() val fragment = ProgressDialogFragment()
fragment.isCancelable = false fragment.isCancelable = false
fragment.show(ft, FRAGMENT_TAG_SIGN_IN_PROGRESS) fragment.show(ft, FRAGMENT_TAG_SIGN_IN_PROGRESS)
Unit
} }
} }

11
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt
View File

@ -113,6 +113,15 @@ abstract class AbsActivitiesFragment protected constructor() : AbsContentListRec
} }
} }
private val onScrollListener = object : OnScrollListener() {
override fun onScrollStateChanged(recyclerView: RecyclerView?, newState: Int) {
if (newState == RecyclerView.SCROLL_STATE_IDLE) {
val layoutManager = layoutManager ?: return
saveReadPosition(layoutManager.findFirstVisibleItemPosition())
}
}
}
private var navigationHelper: RecyclerViewNavigationHelper? = null private var navigationHelper: RecyclerViewNavigationHelper? = null
private var pauseOnScrollListener: OnScrollListener? = null private var pauseOnScrollListener: OnScrollListener? = null
private var activeHotMobiScrollTracker: OnScrollListener? = null private var activeHotMobiScrollTracker: OnScrollListener? = null
@ -373,6 +382,7 @@ abstract class AbsActivitiesFragment protected constructor() : AbsContentListRec
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
recyclerView.addOnScrollListener(onScrollListener)
recyclerView.addOnScrollListener(pauseOnScrollListener) recyclerView.addOnScrollListener(pauseOnScrollListener)
val task = object : AbstractTask<Any?, Boolean, RecyclerView>() { val task = object : AbstractTask<Any?, Boolean, RecyclerView>() {
public override fun doLongOperation(params: Any?): Boolean { public override fun doLongOperation(params: Any?): Boolean {
@ -403,6 +413,7 @@ abstract class AbsActivitiesFragment protected constructor() : AbsContentListRec
} }
activeHotMobiScrollTracker = null activeHotMobiScrollTracker = null
recyclerView.removeOnScrollListener(pauseOnScrollListener) recyclerView.removeOnScrollListener(pauseOnScrollListener)
recyclerView.removeOnScrollListener(onScrollListener)
if (userVisibleHint) { if (userVisibleHint) {
saveReadPosition() saveReadPosition()
} }

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

@ -117,8 +117,8 @@ abstract class AbsStatusesFragment protected constructor() :
private val onScrollListener = object : OnScrollListener() { private val onScrollListener = object : OnScrollListener() {
override fun onScrollStateChanged(recyclerView: RecyclerView?, newState: Int) { override fun onScrollStateChanged(recyclerView: RecyclerView?, newState: Int) {
if (newState == RecyclerView.SCROLL_STATE_IDLE) { if (newState == RecyclerView.SCROLL_STATE_IDLE) {
val layoutManager = layoutManager val layoutManager = layoutManager ?: return
saveReadPosition(layoutManager!!.findFirstVisibleItemPosition()) saveReadPosition(layoutManager.findFirstVisibleItemPosition())
} }
} }
} }