diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootInstance.kt b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootInstance.kt index 5dd8b4cf..a1f206de 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootInstance.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootInstance.kt @@ -15,14 +15,13 @@ class TootInstance(parser : TootParser, src : JSONObject) { private val rePleroma = Pattern.compile("\\bpleroma\\b", Pattern.CASE_INSENSITIVE) val VERSION_1_6 = VersionString("1.6") - val VERSION_2_7_0_rc1 = VersionString("2.6.5") // FIXME: 2.7rcが出たら変更する val VERSION_2_4_0_rc1 = VersionString("2.4.0rc1") val VERSION_2_4_0_rc2 = VersionString("2.4.0rc2") val VERSION_2_4_0 = VersionString("2.4.0") val VERSION_2_4_1_rc1 = VersionString("2.4.1rc1") val VERSION_2_4_1 = VersionString("2.4.1") val VERSION_2_6_0 = VersionString("2.6.0") - + val VERSION_2_7_0_rc1 = VersionString("2.7.0rc1") } // いつ取得したか(内部利用) diff --git a/app/src/main/java/jp/juggler/subwaytooter/util/PostHelper.kt b/app/src/main/java/jp/juggler/subwaytooter/util/PostHelper.kt index 8fc7343e..3e75ec0b 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/util/PostHelper.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/util/PostHelper.kt @@ -494,8 +494,8 @@ class PostHelper( } if(scheduledAt != 0L) { - if(! instance.versionGE(TootInstance.VERSION_2_7_0_rc1)) { - return TootApiResult("Mastodon pre-2.7.0 has no scheduled status API") + if( ! instance.versionGE(TootInstance.VERSION_2_7_0_rc1) ) { + return TootApiResult(activity.getString(R.string.scheduled_status_requires_mastodon_2_7_0)) } // UTCの日時を渡す val c = GregorianCalendar.getInstance(TimeZone.getTimeZone("UTC")) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d21015e7..612b984b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -844,5 +844,6 @@ 返信アイコンの大きさ(単位:dp。デフォルト:24。アプリ再起動が必要) All 本文中のリンクをコンテキストメニューに表示する + 予約投稿はマストドン2.7.0以降で使えます diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b928d8f1..7a184486 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -865,5 +865,6 @@ Reply icon size(Unit:dp. default:24. app restart required) All Show links in context menu + Scheduled status requires Mastodon 2.7.0 or later. \ No newline at end of file