Mastodon/SubwayTooter-Android-App
1
0
Fork 0
mirror of https://github.com/tateisu/SubwayTooter synced 2025-01-27 09:11:23 +01:00
Code Issues Releases Wiki Activity

予約投稿一覧のページング

Browse Source
This commit is contained in:
tateisu 2019-01-22 10:09:26 +09:00
parent 408034753d
commit b9c4f385b4
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/jp/juggler/subwaytooter/Column.kt
View File

@ -110,6 +110,7 @@ class Column(
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_SCHEDULED_STATUSES = "/api/v1/scheduled_statuses?limit=$READ_LIMIT"
// リストではなくオブジェクトを返すAPI
private const val PATH_ACCOUNT = "/api/v1/accounts/%s" // 1:account_id
@ -2644,15 +2645,12 @@ class Column(
return result
}
private fun getScheduledStatuses(client : TootApiClient) : TootApiResult? {
val result = client.request("/api/v1/scheduled_statuses")
val result = client.request(PATH_SCHEDULED_STATUSES)
val src = parseList(::TootScheduled, parser, result?.jsonArray)
list_tmp = addAll(list_tmp, src)
// ページングはないっぽい
idOld = null
idRecent = null
saveRange(true, true, result, src)
return result
}
@ -4453,6 +4451,14 @@ class Column(
return firstResult
}
private fun getScheduledStatuses(client : TootApiClient) : TootApiResult? {
val result = client.request(addRange(bBottom, PATH_SCHEDULED_STATUSES))
val src = parseList(::TootScheduled, parser, result?.jsonArray)
list_tmp = addAll(list_tmp, src)
saveRange(bBottom, ! bBottom, result, src)
return result
}
fun getStatusList(
client : TootApiClient,
path_base : String,
@ -5014,6 +5020,8 @@ class Column(
result
}
TYPE_SCHEDULED_STATUS -> getScheduledStatuses(client)
else -> getStatusList(client, makeHomeTlUrl())
}
} finally {
@ -5966,6 +5974,9 @@ class Column(
getStatusList(client, PATH_DIRECT_MESSAGES)
}
// TYPE_SCHEDULED_STATUS -> getScheduledStatuses(client)
else -> getStatusList(client, makeHomeTlUrl())
}
} finally {
@ -6259,7 +6270,6 @@ class Column(
TYPE_CONVERSATION,
TYPE_LIST_LIST,
TYPE_TREND_TAG,
TYPE_SCHEDULED_STATUS,
TYPE_FOLLOW_SUGGESTION -> true
TYPE_LIST_MEMBER,

2
app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt
View File

@ -1811,7 +1811,7 @@ internal class ItemViewHolder(
is TootScheduled -> {
ActionsDialog()
.addAction(activity.getString(R.string.delete)) {
.addAction(activity.getString(R.string.redraft_and_delete)) {
Action_Toot.deleteScheduledPost(activity, access_info, item) {
column.onScheduleDeleted(item)
showToast(activity, false, R.string.scheduled_post_deleted)