From 70fdc2fe27408b43675aa075ecf785bc6b4eb626 Mon Sep 17 00:00:00 2001 From: tateisu Date: Sun, 11 Mar 2018 12:53:34 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E3=81=AE=E5=90=8D?= =?UTF-8?q?=E5=89=8D=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=9F=E6=99=82?= =?UTF-8?q?=E3=81=AB=E7=84=A1=E9=96=A2=E4=BF=82=E3=81=AA=E3=83=AA=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=82=AB=E3=83=A9=E3=83=A0=E3=81=AE=E3=83=98=E3=83=83?= =?UTF-8?q?=E3=83=80=E8=A1=A8=E8=A8=98=E3=81=BE=E3=81=A7=E5=A4=89=E3=82=8F?= =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=E3=83=90=E3=82=B0?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jp/juggler/subwaytooter/Column.kt | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/Column.kt b/app/src/main/java/jp/juggler/subwaytooter/Column.kt index af3c727d..71c5e9e3 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/Column.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/Column.kt @@ -45,36 +45,36 @@ class Column( private const val ACCT_DB_STEP = 100 // ステータスのリストを返すAPI - private const val PATH_HOME = "/api/v1/timelines/home?limit=" + READ_LIMIT + private const val PATH_HOME = "/api/v1/timelines/home?limit=$READ_LIMIT" private const val PATH_LOCAL = "/api/v1/timelines/public?limit=$READ_LIMIT&local=true" - private const val PATH_FEDERATE = "/api/v1/timelines/public?limit=" + READ_LIMIT - private const val PATH_FAVOURITES = "/api/v1/favourites?limit=" + READ_LIMIT + private const val PATH_FEDERATE = "/api/v1/timelines/public?limit=$READ_LIMIT" + private const val PATH_FAVOURITES = "/api/v1/favourites?limit=$READ_LIMIT" private const val PATH_ACCOUNT_STATUSES = - "/api/v1/accounts/%d/statuses?limit=" + READ_LIMIT // 1:account_id + "/api/v1/accounts/%d/statuses?limit=$READ_LIMIT" // 1:account_id private const val PATH_HASHTAG = - "/api/v1/timelines/tag/%s?limit=" + READ_LIMIT // 1: hashtag(url encoded) - private const val PATH_LIST_TL = "/api/v1/timelines/list/%s?limit=" + READ_LIMIT + "/api/v1/timelines/tag/%s?limit=$READ_LIMIT" // 1: hashtag(url encoded) + private const val PATH_LIST_TL = "/api/v1/timelines/list/%s?limit=$READ_LIMIT" // アカウントのリストを返すAPI private const val PATH_ACCOUNT_FOLLOWING = - "/api/v1/accounts/%d/following?limit=" + READ_LIMIT // 1:account_id + "/api/v1/accounts/%d/following?limit=$READ_LIMIT" // 1:account_id private const val PATH_ACCOUNT_FOLLOWERS = - "/api/v1/accounts/%d/followers?limit=" + READ_LIMIT // 1:account_id - private const val PATH_MUTES = "/api/v1/mutes?limit=" + READ_LIMIT // 1:account_id - private const val PATH_BLOCKS = "/api/v1/blocks?limit=" + READ_LIMIT // 1:account_id + "/api/v1/accounts/%d/followers?limit=$READ_LIMIT" // 1:account_id + private const val PATH_MUTES = "/api/v1/mutes?limit=$READ_LIMIT" // 1:account_id + private const val PATH_BLOCKS = "/api/v1/blocks?limit=$READ_LIMIT" // 1:account_id private const val PATH_FOLLOW_REQUESTS = - "/api/v1/follow_requests?limit=" + READ_LIMIT // 1:account_id + "/api/v1/follow_requests?limit=$READ_LIMIT" // 1:account_id private const val PATH_BOOSTED_BY = - "/api/v1/statuses/%s/reblogged_by?limit=" + READ_LIMIT // 1:status_id + "/api/v1/statuses/%s/reblogged_by?limit=$READ_LIMIT" // 1:status_id private const val PATH_FAVOURITED_BY = - "/api/v1/statuses/%s/favourited_by?limit=" + READ_LIMIT // 1:status_id - private const val PATH_LIST_MEMBER = "/api/v1/lists/%s/accounts?limit=" + READ_LIMIT + "/api/v1/statuses/%s/favourited_by?limit=$READ_LIMIT" // 1:status_id + private const val PATH_LIST_MEMBER = "/api/v1/lists/%s/accounts?limit=$READ_LIMIT" // 他のリストを返すAPI - private const val PATH_REPORTS = "/api/v1/reports?limit=" + READ_LIMIT - private const val PATH_NOTIFICATIONS = "/api/v1/notifications?limit=" + READ_LIMIT - private const val PATH_DOMAIN_BLOCK = "/api/v1/domain_blocks?limit=" + READ_LIMIT - private const val PATH_LIST_LIST = "/api/v1/lists?limit=" + READ_LIMIT + private const val PATH_REPORTS = "/api/v1/reports?limit=$READ_LIMIT" + private const val PATH_NOTIFICATIONS = "/api/v1/notifications?limit=$READ_LIMIT" + private const val PATH_DOMAIN_BLOCK = "/api/v1/domain_blocks?limit=$READ_LIMIT" + private const val PATH_LIST_LIST = "/api/v1/lists?limit=$READ_LIMIT" // リストではなくオブジェクトを返すAPI private const val PATH_ACCOUNT = "/api/v1/accounts/%d" // 1:account_id @@ -931,8 +931,10 @@ class Column( } TYPE_LIST_TL, TYPE_LIST_MEMBER -> { - this.list_info = item - fireShowColumnHeader() + if( item.id == profile_id) { + this.list_info = item + fireShowColumnHeader() + } } } } @@ -1612,18 +1614,18 @@ class Column( if(access_info.isPseudo) return r2 } - var s = String.format( + var path = String.format( Locale.JAPAN, PATH_ACCOUNT_STATUSES, profile_id ) - if(with_attachment && ! with_highlight) s += "&only_media=1" + if(with_attachment && ! with_highlight) path += "&only_media=1" if(instance?.isEnoughVersion(version_1_6) == true) { - getStatusesPinned(client, s + "&pinned=1") + getStatusesPinned(client, "$path&pinned=1") } - return getStatuses(client, s) + return getStatuses(client, path) } else -> throw RuntimeException("profile_tab : invalid value.")