From 4dbd6d02d963e036b12b0a0833aa3ede2368ff77 Mon Sep 17 00:00:00 2001 From: Valink16 Date: Thu, 18 Dec 2025 02:45:45 +0100 Subject: [PATCH 1/2] fix: update contact retrieval to use authenticated user ID --- .../warnastrophy/core/data/service/DangerModeOrchestrator.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/github/warnastrophy/core/data/service/DangerModeOrchestrator.kt b/app/src/main/java/com/github/warnastrophy/core/data/service/DangerModeOrchestrator.kt index 5eb02b24b..dd978f986 100644 --- a/app/src/main/java/com/github/warnastrophy/core/data/service/DangerModeOrchestrator.kt +++ b/app/src/main/java/com/github/warnastrophy/core/data/service/DangerModeOrchestrator.kt @@ -12,6 +12,8 @@ import com.github.warnastrophy.core.permissions.AppPermissions import com.github.warnastrophy.core.ui.common.ErrorHandler import com.github.warnastrophy.core.ui.common.ErrorType import com.github.warnastrophy.core.ui.navigation.Screen +import com.github.warnastrophy.core.util.AppConfig +import com.google.firebase.auth.FirebaseAuth import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -185,7 +187,8 @@ class DangerModeOrchestrator( } } - val contacts = contactsRepo?.getAllContacts()?.getOrNull() + val uid = FirebaseAuth.getInstance().uid ?: AppConfig.defaultUserId + val contacts = contactsRepo?.getAllContacts(uid)?.getOrNull() if (!contacts.isNullOrEmpty()) { emergencyPhoneNumber = contacts.first().phoneNumber } else { From ae9d71f28a377483470d0bbe94223b1682e13394 Mon Sep 17 00:00:00 2001 From: Valink16 Date: Thu, 18 Dec 2025 03:25:59 +0100 Subject: [PATCH 2/2] fix: reset movement service to safe state on orchestrator reset --- .../warnastrophy/core/data/service/DangerModeOrchestrator.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/github/warnastrophy/core/data/service/DangerModeOrchestrator.kt b/app/src/main/java/com/github/warnastrophy/core/data/service/DangerModeOrchestrator.kt index dd978f986..26f790535 100644 --- a/app/src/main/java/com/github/warnastrophy/core/data/service/DangerModeOrchestrator.kt +++ b/app/src/main/java/com/github/warnastrophy/core/data/service/DangerModeOrchestrator.kt @@ -414,6 +414,7 @@ class DangerModeOrchestrator( _state.value = OrchestratorState() _showVoiceConfirmationScreen.value = false _permissionRequests.value = null + movementService.setSafe() } /** Gets the current emergency phone number. This could be fetched from contacts in the future. */