From fbe7c7d02a7ca8689acc0e5d7eed13a9c041d30d Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Thu, 7 Jul 2022 23:47:00 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=83=97=E3=83=AA=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=99=E3=82=8B=E3=81=BE=E3=81=A7?=
 =?UTF-8?q?Misskey=E3=82=B5=E3=83=BC=E3=83=90=E3=81=B8=E3=81=AE=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=82=92=E8=A1=8C?=
 =?UTF-8?q?=E3=82=8F=E3=81=AA=E3=81=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subwaytooter/appsetting/AppSettingItem.kt |  2 ++
 .../notification/PollingChecker.kt            | 24 +++++++++++--------
 .../jp/juggler/subwaytooter/pref/PrefB.kt     |  4 ++++
 app/src/main/res/values-ja/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 22 insertions(+), 10 deletions(-)

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 ea76cee4..23e7c7c6 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt
@@ -239,6 +239,8 @@ val appSettingRoot = AppSettingItem(null, SettingType.Section, R.string.app_sett
         }
 
         sw(PrefB.bpDivideNotification, R.string.divide_notification)
+
+        sw(PrefB.bpMisskeyNotificationCheck, R.string.enable_misskey_notification_check)
     }
 
     section(R.string.behavior) {
diff --git a/app/src/main/java/jp/juggler/subwaytooter/notification/PollingChecker.kt b/app/src/main/java/jp/juggler/subwaytooter/notification/PollingChecker.kt
index 496b3783..d45888b5 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/notification/PollingChecker.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/notification/PollingChecker.kt
@@ -294,16 +294,20 @@ class PollingChecker(
 
                     cache = NotificationCache(account.db_id).apply {
                         load()
-                        requestAsync(
-                            client,
-                            account,
-                            wps.flags,
-                        ) { result ->
-                            account.updateNotificationError("${result.error} ${result.requestInfo}".trim())
-                            if (result.error?.contains("Timeout") == true &&
-                                !account.dont_show_timeout
-                            ) {
-                                progress(account, PollingState.Timeout)
+                        if( account.isMisskey && ! PrefB.bpMisskeyNotificationCheck() ){
+                            log.d("skip misskey server. ${account.acct}")
+                        }else{
+                            requestAsync(
+                                client,
+                                account,
+                                wps.flags,
+                            ) { result ->
+                                account.updateNotificationError("${result.error} ${result.requestInfo}".trim())
+                                if (result.error?.contains("Timeout") == true &&
+                                    !account.dont_show_timeout
+                                ) {
+                                    progress(account, PollingState.Timeout)
+                                }
                             }
                         }
                     }
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 fa8378de..9f312cae 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/pref/PrefB.kt
@@ -347,4 +347,8 @@ object PrefB {
         "MfmDecorationShowUnsupportedMarkup",
         true
     )
+    val bpMisskeyNotificationCheck = BooleanPref(
+        "MisskeyNotificationCheck",
+        false
+    )
 }
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index bcbba74c..4d9659a8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1149,4 +1149,5 @@
     <string name="post_error_attachments_duplicated">Misskeyは添付データの重複を許可していません。</string>
     <string name="use_web_settings">Web設定を使う</string>
     <string name="content">本文</string>
+    <string name="enable_misskey_notification_check">Misskeyサーバで通知チェックを行う(不安定)</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dcb17fdd..1e05ad51 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1158,4 +1158,5 @@
     <string name="post_error_attachments_duplicated">Misskey does not allow duplicate in attachments.</string>
     <string name="use_web_settings">(Use web setting)</string>
     <string name="content">Content</string>
+    <string name="enable_misskey_notification_check">Enable notification check for Misskey server (unstable)</string>
 </resources>