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

code cleanup 

updated lib version
This commit is contained in:
Mariotaku Lee 2017-05-19 13:54:02 +08:00
parent d73acce91e
commit f10e216eb3
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -31,7 +31,7 @@ subprojects {
Kotlin : '1.1.2-3',
SupportLib : '25.3.1',
MariotakuCommons : '0.9.15',
RestFu : '0.9.54',
RestFu : '0.9.56',
ObjectCursor : '0.9.20',
PlayServices : '10.2.6',
MapsUtils : '0.4.4',

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt
View File

@ -114,7 +114,7 @@ class UserQrDialogFragment : BaseDialogFragment() {
}
private fun loadProfileImage(): Promise<GlideDrawable, Exception> {
if (context == null || isDetached || dialog == null || (activity.isFinishing ?: true)) {
if (context == null || isDetached || dialog == null || (activity?.isFinishing ?: true)) {
return Promise.ofFail(InterruptedException())
}
val profileImageSize = getString(R.string.profile_image_size)

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt
View File

@ -210,7 +210,7 @@ abstract class BaseFiltersImportFragment : AbsContentListRecyclerViewFragment<Se
val selectedUsers = rangeOfSize(adapter.userStartIndex, adapter.userCount)
.filter { adapter.isItemChecked(it) }
.mapNotNull {
val user = adapter.getUser(it) ?: return@mapNotNull null
val user = adapter.getUser(it)
// Skip if already filtered
if (user.is_filtered) return@mapNotNull null
return@mapNotNull user