From 600e7f709ddfb1ce088e49affd50cafbeb3f8838 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Mon, 20 Feb 2023 14:02:02 +0900
Subject: [PATCH] Misskey support has ended

---
 .../main/java/jp/juggler/subwaytooter/api/TootApiClient.kt  | 5 +++++
 .../java/jp/juggler/subwaytooter/api/auth/AuthMisskey10.kt  | 5 +++++
 .../java/jp/juggler/subwaytooter/api/auth/AuthMisskey13.kt  | 6 ++++++
 .../java/jp/juggler/subwaytooter/api/entity/TootInstance.kt | 5 +++++
 .../jp/juggler/subwaytooter/appsetting/AppSettingItem.kt    | 2 ++
 app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt     | 4 ++++
 app/src/main/java/jp/juggler/subwaytooter/push/PushRepo.kt  | 5 +++++
 app/src/main/res/values-ja/strings.xml                      | 2 ++
 app/src/main/res/values/strings.xml                         | 2 ++
 9 files changed, 36 insertions(+)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/TootApiClient.kt b/app/src/main/java/jp/juggler/subwaytooter/api/TootApiClient.kt
index bb696fa9..e2b73cf1 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/api/TootApiClient.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/api/TootApiClient.kt
@@ -7,6 +7,7 @@ import jp.juggler.subwaytooter.R
 import jp.juggler.subwaytooter.api.auth.AuthBase
 import jp.juggler.subwaytooter.api.entity.*
 import jp.juggler.subwaytooter.api.entity.TootAccountRef.Companion.tootAccountRefOrNull
+import jp.juggler.subwaytooter.pref.PrefB
 import jp.juggler.subwaytooter.table.SavedAccount
 import jp.juggler.subwaytooter.util.*
 import jp.juggler.util.data.*
@@ -400,6 +401,10 @@ class TootApiClient(
 
         val account = this.account // may null
 
+        if( account?.isMisskey == true && !PrefB.bpEnableDeprecatedSomething.value){
+            return result.setError(context.getString(R.string.misskey_support_end))
+        }
+
         try {
             if (!sendRequest(result) {
                     val url = "https://${apiHost?.ascii}$path"
diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/auth/AuthMisskey10.kt b/app/src/main/java/jp/juggler/subwaytooter/api/auth/AuthMisskey10.kt
index b5dcc3d0..4efb07ec 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/api/auth/AuthMisskey10.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/api/auth/AuthMisskey10.kt
@@ -9,6 +9,7 @@ import jp.juggler.subwaytooter.api.TootParser
 import jp.juggler.subwaytooter.api.entity.EntityId
 import jp.juggler.subwaytooter.api.entity.Host
 import jp.juggler.subwaytooter.api.entity.TootInstance
+import jp.juggler.subwaytooter.pref.PrefB
 import jp.juggler.subwaytooter.pref.prefDevice
 import jp.juggler.subwaytooter.table.daoClientInfo
 import jp.juggler.subwaytooter.table.daoSavedAccount
@@ -119,6 +120,10 @@ class AuthMisskey10(override val client: TootApiClient) : AuthBase() {
         ti: TootInstance?,
         forceUpdateClient: Boolean,
     ): Uri {
+        if(!PrefB.bpEnableDeprecatedSomething.value){
+            error(context.getString(R.string.misskey_support_end))
+        }
+
         val apiHost = apiHost ?: error("missing apiHost")
 
         val clientInfo = daoClientInfo.load(apiHost, clientName)
diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/auth/AuthMisskey13.kt b/app/src/main/java/jp/juggler/subwaytooter/api/auth/AuthMisskey13.kt
index 0b53e059..731cf946 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/api/auth/AuthMisskey13.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/api/auth/AuthMisskey13.kt
@@ -2,12 +2,14 @@ package jp.juggler.subwaytooter.api.auth
 
 import android.net.Uri
 import jp.juggler.subwaytooter.BuildConfig
+import jp.juggler.subwaytooter.R
 import jp.juggler.subwaytooter.api.TootApiClient
 import jp.juggler.subwaytooter.api.TootParser
 import jp.juggler.subwaytooter.api.auth.AuthMisskey10.Companion.encodeScopeArray
 import jp.juggler.subwaytooter.api.auth.AuthMisskey10.Companion.getScopeArrayMisskey
 import jp.juggler.subwaytooter.api.entity.Host
 import jp.juggler.subwaytooter.api.entity.TootInstance
+import jp.juggler.subwaytooter.pref.PrefB
 import jp.juggler.subwaytooter.pref.prefDevice
 import jp.juggler.subwaytooter.table.daoSavedAccount
 import jp.juggler.subwaytooter.util.LinkHelper
@@ -57,6 +59,10 @@ class AuthMisskey13(override val client: TootApiClient) : AuthBase() {
         ti: TootInstance?,
         forceUpdateClient: Boolean,
     ): Uri {
+        if(!PrefB.bpEnableDeprecatedSomething.value){
+            error(context.getString(R.string.misskey_support_end))
+        }
+
         val apiHost = apiHost ?: error("missing apiHost")
 
         val sessionId = UUID.randomUUID().toString()
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 0b097601..742fcb48 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
@@ -1,6 +1,7 @@
 package jp.juggler.subwaytooter.api.entity
 
 import android.os.SystemClock
+import jp.juggler.subwaytooter.R
 import jp.juggler.subwaytooter.api.TootApiClient
 import jp.juggler.subwaytooter.api.TootApiResult
 import jp.juggler.subwaytooter.api.TootParser
@@ -366,6 +367,10 @@ class TootInstance(parser: TootParser, src: JsonObject) {
             val result = TootApiResult.makeWithCaption(apiHost)
             if (result.error != null) return result
 
+            if(!PrefB.bpEnableDeprecatedSomething.value){
+                return result.setError(context.getString(R.string.misskey_support_end))
+            }
+
             if (sendRequest(result) {
                     buildJsonObject {
                         put("dummy", 1)
diff --git a/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt b/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt
index 1de83290..b17e67f2 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt
@@ -1030,6 +1030,8 @@ val appSettingRoot = AppSettingItem(null, SettingType.Section, R.string.app_sett
     section(R.string.developer_options) {
         sw(PrefB.bpCheckBetaVersion, R.string.check_beta_release)
 
+        sw(PrefB.bpEnableDeprecatedSomething,R.string.enable_deprecated_something)
+
         sw(PrefB.bpEmojiPickerCategoryOther, R.string.show_emoji_picker_other_category)
         action(R.string.drawable_list) {
             action = { startActivity(Intent(this, ActDrawableList::class.java)) }
diff --git a/app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt b/app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt
index 6f461d2b..94484425 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt
@@ -360,4 +360,8 @@ object PrefB {
         "ShowUsernameFilteredPost",
         false
     )
+    val bpEnableDeprecatedSomething = BooleanPref(
+        "EnableDeprecatedSomething",
+        false
+    )
 }
diff --git a/app/src/main/java/jp/juggler/subwaytooter/push/PushRepo.kt b/app/src/main/java/jp/juggler/subwaytooter/push/PushRepo.kt
index 8a9d5e33..cf2b2e10 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/push/PushRepo.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/push/PushRepo.kt
@@ -20,6 +20,7 @@ import jp.juggler.subwaytooter.api.push.ApiPushMisskey
 import jp.juggler.subwaytooter.dialog.SuspendProgress
 import jp.juggler.subwaytooter.notification.NotificationChannels
 import jp.juggler.subwaytooter.notification.NotificationDeleteReceiver.Companion.intentNotificationDelete
+import jp.juggler.subwaytooter.pref.PrefB
 import jp.juggler.subwaytooter.pref.PrefDevice
 import jp.juggler.subwaytooter.pref.prefDevice
 import jp.juggler.subwaytooter.push.*
@@ -590,6 +591,10 @@ class PushRepo(
             val account = daoSavedAccount.loadAccountByAcct(acct)
                 ?: error("missing account for acct ${status.acct}")
 
+            if(account.isMisskey && !PrefB.bpEnableDeprecatedSomething.value){
+                error(context.getString(R.string.misskey_support_end))
+            }
+
             decodeMessageContent(status, pm, map)
             val messageJson = pm.messageJson
 
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index b85b951b..d258f243 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1259,4 +1259,6 @@
     <string name="bug_report_desc">アプリは過去数日間のログを保持していますが、勝手に外部に送信することはありません。ユーザが明示的にログを送信する操作した時だけ参照されます。</string>
     <string name="log_save_level_desc">ログの重要度。 この設定より重要度が低いログは収集されません。</string>
     <string name="image_alpha_too_low">背景画像のアルファが低すぎます。 画像を見ることができますか？</string>
+    <string name="enable_deprecated_something">陳腐化した何かを有効にする</string>
+    <string name="misskey_support_end">Misskeyサポートは終了しました</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fcd76321..23363e85 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1267,4 +1267,6 @@
     <string name="bug_report_desc">The app keeps logs for the past few days, but does not send them outside without permission. It is only referenced when the user explicitly sends logs.</string>
     <string name="log_save_level_desc">Log severity level. Logs with a severity less than this setting will not be collected.</string>
     <string name="image_alpha_too_low">background image alpha is too low. can you view the image?</string>
+    <string name="enable_deprecated_something">Enable deprecated something</string>
+    <string name="misskey_support_end">Misskey support has ended</string>
 </resources>