From 1c292ed087d9ebb432cffb08c97694c6ab14a5f2 Mon Sep 17 00:00:00 2001 From: Pierre Nicolas <pierre.nicolas@savoirfairelinux.com> Date: Fri, 14 Jul 2023 13:55:39 -0400 Subject: [PATCH] logs: queue start logs on daemon executor To be sure deamon services have been loaded before using them. GitLab: #1321 Change-Id: Ib27ab4d92978cbc1f43c882a55aec30043094356 --- .../src/main/kotlin/net/jami/services/HardwareService.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/HardwareService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/HardwareService.kt index 3de30767f..e53e38a24 100644 --- a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/HardwareService.kt +++ b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/HardwareService.kt @@ -163,10 +163,11 @@ abstract class HardwareService( fun startLogs(): Observable<String> { return logs ?: Observable.create { emitter: ObservableEmitter<String> -> logEmitter = emitter - JamiService.monitor(true) + // Queue the service call on daemon executor to be sure it has been initialized. + mExecutor.execute { JamiService.monitor(true) } emitter.setCancellable { synchronized(this@HardwareService) { - JamiService.monitor(false) + mExecutor.execute { JamiService.monitor(false) } logEmitter = null logs = null } -- GitLab