Skip to content

Fix/automatic danger adjustments #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frakdp merged 2 commits into from
Dec 18, 2025
Merged

Fix/automatic danger adjustments #341

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dbd6d0
fix: update contact retrieval to use authenticated user ID
Valink16 Dec 18, 2025
ae9d71f
fix: reset movement service to safe state on orchestrator reset
Valink16 Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/src/main/java/com/github/warnastrophy/core/data/service/DangerModeOrchestrator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -411,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. */
Expand Down
Loading