From 9b46a53da85bbb3565dc380de425a90039e45bb8 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Wed, 19 May 2021 14:38:19 +0900
Subject: [PATCH] =?UTF-8?q?(Nightly=20Fedibird)=E4=BB=96=E4=BA=BA=E3=81=8C?=
 =?UTF-8?q?=E8=A1=8C=E3=81=A3=E3=81=9F=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AE=E3=82=B9=E3=83=88=E3=83=AA=E3=83=BC?=
 =?UTF-8?q?=E3=83=9F=E3=83=B3=E3=82=B0=E3=82=A4=E3=83=99=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=AB=E5=8F=8D=E6=98=A0=E3=81=95?=
 =?UTF-8?q?=E3=81=9B=E3=82=8B=E3=80=82=E8=87=AA=E5=88=86=E3=81=AE=E6=8A=95?=
 =?UTF-8?q?=E7=A8=BF=E3=81=B8=E3=81=AE=E9=80=9A=E7=9F=A5=E3=82=92WebPush?=
 =?UTF-8?q?=E3=81=A7=E5=8F=97=E3=81=91=E5=8F=96=E3=82=8B=E3=80=82(?=
 =?UTF-8?q?=E8=B3=BC=E8=AA=AD=E3=81=AE=E6=9B=B4=E6=96=B0=E3=81=8C=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/jp/juggler/subwaytooter/ActAccountSetting.kt    | 1 +
 app/src/main/java/jp/juggler/subwaytooter/ActMain.kt          | 1 +
 .../{util => notification}/PushSubscriptionHelper.kt          | 4 ++--
 .../java/jp/juggler/subwaytooter/notification/TaskRunner.kt   | 1 -
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename app/src/main/java/jp/juggler/subwaytooter/{util => notification}/PushSubscriptionHelper.kt (96%)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt b/app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt
index 95c51358..6ed3f480 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt
@@ -28,6 +28,7 @@ import jp.juggler.subwaytooter.api.entity.*
 import jp.juggler.subwaytooter.dialog.ActionsDialog
 import jp.juggler.subwaytooter.notification.NotificationHelper
 import jp.juggler.subwaytooter.notification.PollingWorker
+import jp.juggler.subwaytooter.notification.PushSubscriptionHelper
 import jp.juggler.subwaytooter.table.AcctColor
 import jp.juggler.subwaytooter.table.SavedAccount
 import jp.juggler.subwaytooter.util.*
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt
index e9042f93..869121e8 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt
@@ -33,6 +33,7 @@ import jp.juggler.subwaytooter.dialog.ActionsDialog
 import jp.juggler.subwaytooter.dialog.DlgQuickTootMenu
 import jp.juggler.subwaytooter.dialog.DlgTextInput
 import jp.juggler.subwaytooter.notification.PollingWorker
+import jp.juggler.subwaytooter.notification.PushSubscriptionHelper
 import jp.juggler.subwaytooter.span.MyClickableSpan
 import jp.juggler.subwaytooter.table.AcctColor
 import jp.juggler.subwaytooter.table.SavedAccount
diff --git a/app/src/main/java/jp/juggler/subwaytooter/util/PushSubscriptionHelper.kt b/app/src/main/java/jp/juggler/subwaytooter/notification/PushSubscriptionHelper.kt
similarity index 96%
rename from app/src/main/java/jp/juggler/subwaytooter/util/PushSubscriptionHelper.kt
rename to app/src/main/java/jp/juggler/subwaytooter/notification/PushSubscriptionHelper.kt
index 7e0edff1..36d03e11 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/util/PushSubscriptionHelper.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/notification/PushSubscriptionHelper.kt
@@ -1,7 +1,6 @@
-package jp.juggler.subwaytooter.util
+package jp.juggler.subwaytooter.notification
 
 import android.content.Context
-import jp.juggler.subwaytooter.notification.PollingWorker
 import jp.juggler.subwaytooter.R
 import jp.juggler.subwaytooter.api.TootApiClient
 import jp.juggler.subwaytooter.api.TootApiResult
@@ -329,6 +328,7 @@ class PushSubscriptionHelper(
             put("poll", account.notification_vote)
             put("follow_request", account.notification_follow_request)
             put("status", account.notification_post)
+            put("emoji_reaction", account.notification_reaction) // fedibird拡張
         }
 
         suspend fun canSkipSubscription(): TootApiResult? {
diff --git a/app/src/main/java/jp/juggler/subwaytooter/notification/TaskRunner.kt b/app/src/main/java/jp/juggler/subwaytooter/notification/TaskRunner.kt
index bccde931..15418c36 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/notification/TaskRunner.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/notification/TaskRunner.kt
@@ -17,7 +17,6 @@ import jp.juggler.subwaytooter.api.TootApiResult
 import jp.juggler.subwaytooter.api.TootParser
 import jp.juggler.subwaytooter.api.entity.*
 import jp.juggler.subwaytooter.table.*
-import jp.juggler.subwaytooter.util.PushSubscriptionHelper
 import jp.juggler.util.*
 import kotlinx.coroutines.*
 import okhttp3.Call