From ec4c3c5dd8065aa5fc2ee6213a8202746bfde3c2 Mon Sep 17 00:00:00 2001 From: tateisu Date: Wed, 2 Oct 2019 18:51:11 +0900 Subject: [PATCH] =?UTF-8?q?Pixelfed=E3=81=8C=E7=84=A1=E5=8A=B9=E3=81=AA?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=ABPull=E9=80=9A=E7=9F=A5=E3=83=81?= =?UTF-8?q?=E3=82=A7=E3=83=83=E3=82=AF=E3=81=8C=E8=AA=A4=E5=8B=95=E4=BD=9C?= =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/jp/juggler/subwaytooter/PollingWorker.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/PollingWorker.kt b/app/src/main/java/jp/juggler/subwaytooter/PollingWorker.kt index 20a7641c..20963140 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/PollingWorker.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/PollingWorker.kt @@ -25,6 +25,7 @@ import jp.juggler.subwaytooter.api.TootApiCallback import jp.juggler.subwaytooter.api.TootApiClient import jp.juggler.subwaytooter.api.TootParser import jp.juggler.subwaytooter.api.entity.EntityId +import jp.juggler.subwaytooter.api.entity.TootInstance import jp.juggler.subwaytooter.api.entity.TootNotification import jp.juggler.subwaytooter.api.entity.TootStatus import jp.juggler.subwaytooter.table.* @@ -725,9 +726,9 @@ class PollingWorker private constructor(contextArg : Context) { job_status.set("check network status..") val net_wait_start = SystemClock.elapsedRealtime() - while(true){ + while(true) { val connectionState = App1.getAppState(context).networkTracker.connectionState - ?: break + ?: break if(isJobCancelled) throw JobCancelledException() val now = SystemClock.elapsedRealtime() val delta = now - net_wait_start @@ -806,7 +807,6 @@ class PollingWorker private constructor(contextArg : Context) { log.d(")JobItem.run jobId=${jobId}, cancel=${isJobCancelled}") } - } internal inner class TaskRunner { @@ -1082,6 +1082,9 @@ class PollingWorker private constructor(contextArg : Context) { // 未確認アカウントはチェック対象外 if(! account.isConfirmed) return + val (_, instance) = TootInstance.get(client) + if(instance == null) return + client.account = account val wps = PushSubscriptionHelper(context, account)