Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47aca395 authored by Ellen Poe's avatar Ellen Poe
Browse files

Merge branch 'ellenhp/start_continuous_location_on_grant' into 'main' 

Start location updates on permission grant

Closes #21

See merge request e/os/cardinal!20
parents f89956ae c07ab607

cardinal-android/app/src/main/java/earth/maps/cardinal/MainActivity.kt

+4 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ class MainActivity : ComponentActivity() { 
    ) { isGranted ->

        hasLocationPermission = isGranted

        if (isGranted) {

            locationRepository.startContinuousLocationUpdates(this@MainActivity)

            Log.d(TAG, "Location permission granted")

            // Request fresh location and animate camera to user's location

            lifecycleScope.launch {
@@ -201,6 +202,9 @@ class MainActivity : ComponentActivity() { 


        hasNotificationPermission = checkNotificationPermission()

        hasLocationPermission = checkLocationPermission()

        if (hasLocationPermission) {

            locationRepository.startContinuousLocationUpdates(this@MainActivity)

        }



        // Check if we should show the location permission dialog on first startup

        if (!appPreferenceRepository.hasPromptedLocation.value && !hasLocationPermission) {

cardinal-android/app/src/main/java/earth/maps/cardinal/ui/core/MapViewModel.kt

+0 −4
Original line number Diff line number Diff line
@@ -94,10 +94,6 @@ class MapViewModel @Inject constructor( 
        FeatureCollection(placeList.map { createFeatureFromSavedPlace(it) })

    }



    init {

        locationRepository.startContinuousLocationUpdates(context)

    }



    /**

     * Creates a Feature from a Place with proper JSON escaping.

     */

cardinal-android/app/src/main/java/earth/maps/cardinal/ui/home/NearbyViewModel.kt

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ class NearbyViewModel @Inject constructor( 


    init {

        // Start observing location updates

        locationRepository.startContinuousLocationUpdates(context)

        observeLocationUpdates()

    }

cardinal-android/app/src/main/java/earth/maps/cardinal/ui/home/TransitScreenViewModel.kt

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ class TransitScreenViewModel @Inject constructor( 


    init {

        // Start observing location updates

        locationRepository.startContinuousLocationUpdates(context)

        observeLocationUpdates()

    }