diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/UserListMembersLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/UserListMembersLoader.kt index 2e6e546f4..d02f53698 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/UserListMembersLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/UserListMembersLoader.kt @@ -36,19 +36,22 @@ class UserListMembersLoader( private val listId: String?, private val userKey: UserKey?, private val screenName: String?, - private val listName: String, + private val listName: String?, data: List?, fromUser: Boolean ) : CursorSupportUsersLoader(context, accountKey, data, fromUser) { @Throws(MicroBlogException::class) public override fun getCursoredUsers(twitter: MicroBlog, details: AccountDetails, paging: Paging): PageableResponseList { - if (listId != null) + if (listId != null) { return twitter.getUserListMembers(listId, paging) - else if (userKey != null) - return twitter.getUserListMembers(listName.replace(' ', '-'), userKey.id, paging) - else if (screenName != null) - return twitter.getUserListMembersByScreenName(listName.replace(' ', '-'), screenName, paging) + } else if (listName != null) { + if (userKey != null) { + return twitter.getUserListMembers(listName.replace(' ', '-'), userKey.id, paging) + } else if (screenName != null) { + return twitter.getUserListMembersByScreenName(listName.replace(' ', '-'), screenName, paging) + } + } throw MicroBlogException("list_id or list_name and user_id (or screen_name) required") } diff --git a/twidere/src/main/res/xml/preferences_about.xml b/twidere/src/main/res/xml/preferences_about.xml index 0f8df136d..67c5b4dc8 100644 --- a/twidere/src/main/res/xml/preferences_about.xml +++ b/twidere/src/main/res/xml/preferences_about.xml @@ -14,14 +14,14 @@ android:title="@string/project_account"> + android:data="twidere://user?user_key=583328497@twitter.com&account_host=twitter.com&finish_only=true"/> + android:data="twidere://user?user_key=57610574@twitter.com&account_host=twitter.com&finish_only=true"/> + android:data="twidere://user_list_members?list_id=99024901&user_key=583328497@twitter.com&account_host=twitter.com&finish_only=true"/> @@ -53,49 +53,49 @@ android:title="ilovinheart"> + android:data="twidere://user?user_key=144878723@twitter.com&account_host=twitter.com&finish_only=true"/> + android:data="twidere://user?user_key=450691326@twitter.com&account_host=twitter.com&finish_only=true"/> + android:data="twidere://user?user_key=12630242@twitter.com&account_host=twitter.com&finish_only=true"/> + android:data="twidere://user?user_key=332135263@twitter.com&account_host=twitter.com&finish_only=true"/> + android:data="twidere://user?user_key=218536728@twitter.com&account_host=twitter.com&finish_only=true"/> + android:data="twidere://user?user_key=1062473329@twitter.com&account_host=twitter.com&finish_only=true"/> + android:data="twidere://user?user_key=7758552@twitter.com&account_host=twitter.com&finish_only=true"/> @@ -104,7 +104,7 @@ android:title="@string/kuma_union"> + android:data="twidere://user?user_key=514378421@twitter.com&account_host=twitter.com&finish_only=true"/>