caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

NSCv3: resolve starting service

Browse source
This commit is contained in:
Milos Kozak 2023-10-20 22:59:11 +02:00
parent 0c36f3f567
commit 2b89a78102
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclientV3/NSClientV3Plugin.kt
View file

@ -204,7 +204,7 @@ class NSClientV3Plugin @Inject constructor(
if (ev.connected) { if (ev.connected) {
when { when {
isAllowed && nsClientV3Service?.storageSocket == null -> setClient("CONNECTIVITY") // socket must be created isAllowed && nsClientV3Service?.storageSocket == null -> setClient("CONNECTIVITY") // socket must be created
!isAllowed && nsClientV3Service?.storageSocket != null -> shutdownWebsockets() !isAllowed && nsClientV3Service?.storageSocket != null -> stopService()
} }
if (isAllowed) executeLoop("CONNECTIVITY", forceNew = false) if (isAllowed) executeLoop("CONNECTIVITY", forceNew = false)
} }
@ -221,7 +221,7 @@ class NSClientV3Plugin @Inject constructor(
ev.isChanged(rh.gs(app.aaps.core.utils.R.string.key_ns_alarms)) || ev.isChanged(rh.gs(app.aaps.core.utils.R.string.key_ns_alarms)) ||
ev.isChanged(rh.gs(app.aaps.core.utils.R.string.key_ns_announcements)) ev.isChanged(rh.gs(app.aaps.core.utils.R.string.key_ns_announcements))
) { ) {
shutdownWebsockets() stopService()
setClient("SETTING CHANGE") setClient("SETTING CHANGE")
} }
if (ev.isChanged(rh.gs(app.aaps.core.utils.R.string.key_local_profile_last_change))) if (ev.isChanged(rh.gs(app.aaps.core.utils.R.string.key_local_profile_last_change)))
@ -310,7 +310,7 @@ class NSClientV3Plugin @Inject constructor(
override fun onStop() { override fun onStop() {
handler.removeCallbacksAndMessages(null) handler.removeCallbacksAndMessages(null)
disposable.clear() disposable.clear()
shutdownWebsockets() stopService()
super.onStop() super.onStop()
} }
@ -348,24 +348,18 @@ class NSClientV3Plugin @Inject constructor(
logger = { msg -> aapsLogger.debug(LTag.HTTP, msg) } logger = { msg -> aapsLogger.debug(LTag.HTTP, msg) }
) )
SystemClock.sleep(2000) SystemClock.sleep(2000)
initializeWebSockets(reason) startService(reason)
rxBus.send(EventSWSyncStatus(status)) rxBus.send(EventSWSyncStatus(status))
} }
private fun initializeWebSockets(reason: String) { private fun startService(reason: String) {
if (sp.getBoolean(app.aaps.core.utils.R.string.key_ns_use_ws, true)) { if (sp.getBoolean(app.aaps.core.utils.R.string.key_ns_use_ws, true)) {
context.bindService(Intent(context, NSClientV3Service::class.java), serviceConnection, Context.BIND_AUTO_CREATE) context.bindService(Intent(context, NSClientV3Service::class.java), serviceConnection, Context.BIND_AUTO_CREATE)
while (nsClientV3Service == null) {
aapsLogger.debug(LTag.NSCLIENT, "Waiting for service start")
SystemClock.sleep(100)
}
nsClientV3Service?.initializeWebSockets(reason)
} }
} }
private fun shutdownWebsockets() { private fun stopService() {
if (nsClientV3Service != null) context.unbindService(serviceConnection) if (nsClientV3Service != null) context.unbindService(serviceConnection)
nsClientV3Service?.shutdownWebsockets()
} }
override fun resend(reason: String) { override fun resend(reason: String) {

2
plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclientV3/services/NSClientV3Service.kt
View file

@ -70,10 +70,12 @@ class NSClientV3Service : DaggerService() {
super.onCreate() super.onCreate()
wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:NSClientService") wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:NSClientService")
wakeLock?.acquire() wakeLock?.acquire()
initializeWebSockets("onCreate")
} }
override fun onDestroy() { override fun onDestroy() {
super.onDestroy() super.onDestroy()
shutdownWebsockets()
disposable.clear() disposable.clear()
if (wakeLock?.isHeld == true) wakeLock?.release() if (wakeLock?.isHeld == true) wakeLock?.release()
} }