From b98f9a872610191a3981c47f1b61ee0f7df18c47 Mon Sep 17 00:00:00 2001
From: cp-megh <megh.l@canopas.com>
Date: Tue, 24 Sep 2024 15:33:04 +0530
Subject: [PATCH] update-user-journey-algorithm

---
 .github/workflows/build.yaml                  |   2 +-
 .idea/inspectionProfiles/Project_Default.xml  |  28 +
 .../canopas/yourspace/YourSpaceApplication.kt |   2 +-
 .../journey/components/LocationHistory.kt     |   9 +
 .../timeline/JourneyTimelineViewModel.kt      |  19 +
 .../settings/profile/EditProfileViewModel.kt  |   6 +-
 build.gradle.kts                              |   4 +-
 .../yourspace/data/di/AppDataProvider.kt      |   6 -
 .../data/models/location/ApiLocation.kt       |  11 +-
 .../data/models/location/LocationJourney.kt   |   7 +
 .../data/models/location/LocationTable.kt     |   4 +-
 .../location/LocationUpdateReceiver.kt        |  34 +-
 .../data/repository/JourneyRepository.kt      | 553 ++++++++++--------
 .../data/service/auth/AuthService.kt          |   6 +-
 .../service/location/ApiJourneyService.kt     |  42 +-
 .../service/location/ApiLocationService.kt    |  10 +-
 .../data/service/location/LocationManager.kt  |   4 +-
 .../yourspace/data/storage/LocationCache.kt   |  44 ++
 .../yourspace/data/storage/UserPreferences.kt |   4 +-
 .../data/storage/room/LocationTableDao.kt     |  26 -
 .../storage/room/LocationTableDatabase.kt     |  31 -
 .../yourspace/data/utils/FirestoreExts.kt     |   3 +-
 .../data/utils/LocationConverters.kt          |  77 ---
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 24 files changed, 474 insertions(+), 460 deletions(-)
 create mode 100644 data/src/main/java/com/canopas/yourspace/data/storage/LocationCache.kt
 delete mode 100644 data/src/main/java/com/canopas/yourspace/data/storage/room/LocationTableDao.kt
 delete mode 100644 data/src/main/java/com/canopas/yourspace/data/storage/room/LocationTableDatabase.kt
 delete mode 100644 data/src/main/java/com/canopas/yourspace/data/utils/LocationConverters.kt

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d411c5f7..accf8170 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -47,7 +47,7 @@ jobs:
           mv app/build/outputs/apk/release/*.apk .
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: YourSpace APK
           path: YourSpace*.apk
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 44ca2d9b..fb93d254 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,34 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/app/src/main/java/com/canopas/yourspace/YourSpaceApplication.kt b/app/src/main/java/com/canopas/yourspace/YourSpaceApplication.kt
index 419682c9..e7424f94 100644
--- a/app/src/main/java/com/canopas/yourspace/YourSpaceApplication.kt
+++ b/app/src/main/java/com/canopas/yourspace/YourSpaceApplication.kt
@@ -53,7 +53,7 @@ class YourSpaceApplication :
 
         super<Application>.onCreate()
         Timber.plant(Timber.DebugTree())
-        FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(!BuildConfig.DEBUG)
+        FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false)
         ProcessLifecycleOwner.get().lifecycle.addObserver(this)
         authService.addListener(this)
         setNotificationChannel()
diff --git a/app/src/main/java/com/canopas/yourspace/ui/flow/journey/components/LocationHistory.kt b/app/src/main/java/com/canopas/yourspace/ui/flow/journey/components/LocationHistory.kt
index 1308537d..b4f50f97 100644
--- a/app/src/main/java/com/canopas/yourspace/ui/flow/journey/components/LocationHistory.kt
+++ b/app/src/main/java/com/canopas/yourspace/ui/flow/journey/components/LocationHistory.kt
@@ -354,8 +354,17 @@ fun Address.formattedTitle(toAddress: Address?): String {
     val fromState = this.adminArea ?: this.countryName ?: "Unknown"
     val toState = toAddress?.adminArea ?: toAddress?.countryName ?: "Unknown"
 
+    val fromAddressLine = this.getAddressLine(0).split(",").firstOrNull {
+        it.matches(Regex("^[a-zA-Z ]+\$"))
+    }?.trim()
+
+    val toAddressLine = toAddress?.getAddressLine(0)?.split(",")?.firstOrNull {
+        it.matches(Regex("^[a-zA-Z ]+\$"))
+    }?.trim()
+
     return when {
         toAddress == null -> "$fromArea, $fromCity"
+        fromArea == toArea && !fromAddressLine.isNullOrEmpty() && !toAddressLine.isNullOrEmpty() -> "$fromAddressLine to $toAddressLine, $fromCity"
         fromArea == toArea -> "$fromArea, $fromCity"
         fromCity == toCity -> "$fromArea to $toArea, $fromCity"
         fromState == toState -> "$fromArea, $fromCity to $toArea, $toCity"
diff --git a/app/src/main/java/com/canopas/yourspace/ui/flow/journey/timeline/JourneyTimelineViewModel.kt b/app/src/main/java/com/canopas/yourspace/ui/flow/journey/timeline/JourneyTimelineViewModel.kt
index d1ac06f1..d3e9dcbb 100644
--- a/app/src/main/java/com/canopas/yourspace/ui/flow/journey/timeline/JourneyTimelineViewModel.kt
+++ b/app/src/main/java/com/canopas/yourspace/ui/flow/journey/timeline/JourneyTimelineViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.canopas.yourspace.data.models.location.LocationJourney
 import com.canopas.yourspace.data.models.user.ApiUser
+import com.canopas.yourspace.data.repository.JourneyRepository
 import com.canopas.yourspace.data.service.auth.AuthService
 import com.canopas.yourspace.data.service.location.ApiJourneyService
 import com.canopas.yourspace.data.service.user.ApiUserService
@@ -26,6 +27,7 @@ class JourneyTimelineViewModel @Inject constructor(
     private val journeyService: ApiJourneyService,
     private val apiUserService: ApiUserService,
     private val authService: AuthService,
+    private val journeyRepository: JourneyRepository,
     private val appDispatcher: AppDispatcher
 ) : ViewModel() {
 
@@ -99,6 +101,23 @@ class JourneyTimelineViewModel @Inject constructor(
                 appending = false,
                 isLoading = false
             )
+
+            if (!hasMoreItems && locationJourneys.isEmpty()) {
+                // No journey found. Try checking in local database
+                // If any location is found for current user and current date then add it to the list as well as remote database
+                val lastJourney = journeyRepository.checkAndAddLocalJourneyToRemoteDatabase(userId)
+                val locationJourney = (
+                    lastJourney?.let {
+                        listOf(it)
+                    } ?: emptyList()
+                    ).groupByDate()
+                _state.value = _state.value.copy(
+                    groupedLocation = locationJourney,
+                    hasMoreLocations = false,
+                    appending = false,
+                    isLoading = false
+                )
+            }
         } catch (e: Exception) {
             Timber.e(e, "Failed to fetch location history")
             _state.value =
diff --git a/app/src/main/java/com/canopas/yourspace/ui/flow/settings/profile/EditProfileViewModel.kt b/app/src/main/java/com/canopas/yourspace/ui/flow/settings/profile/EditProfileViewModel.kt
index aed57515..0811ed19 100644
--- a/app/src/main/java/com/canopas/yourspace/ui/flow/settings/profile/EditProfileViewModel.kt
+++ b/app/src/main/java/com/canopas/yourspace/ui/flow/settings/profile/EditProfileViewModel.kt
@@ -8,7 +8,7 @@ import com.canopas.yourspace.data.models.user.LOGIN_TYPE_GOOGLE
 import com.canopas.yourspace.data.models.user.LOGIN_TYPE_PHONE
 import com.canopas.yourspace.data.repository.SpaceRepository
 import com.canopas.yourspace.data.service.auth.AuthService
-import com.canopas.yourspace.data.storage.room.LocationTableDatabase
+import com.canopas.yourspace.data.storage.LocationCache
 import com.canopas.yourspace.data.utils.AppDispatcher
 import com.canopas.yourspace.ui.navigation.AppDestinations
 import com.canopas.yourspace.ui.navigation.AppNavigator
@@ -26,7 +26,7 @@ class EditProfileViewModel @Inject constructor(
     private val appDispatcher: AppDispatcher,
     private val spaceRepository: SpaceRepository,
     private val authService: AuthService,
-    private val locationTableDatabase: LocationTableDatabase
+    private val locationCache: LocationCache
 ) : ViewModel() {
 
     private val _state = MutableStateFlow(EditProfileState())
@@ -176,7 +176,7 @@ class EditProfileViewModel @Inject constructor(
             )
             spaceRepository.deleteUserSpaces()
             authService.deleteAccount()
-            locationTableDatabase.locationTableDao().deleteLocationData()
+            locationCache.clear()
             navigator.navigateTo(
                 AppDestinations.signIn.path,
                 clearStack = true
diff --git a/build.gradle.kts b/build.gradle.kts
index 59a1fcec..cfef1c23 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.3.2" apply false
+    id("com.android.application") version "8.6.0" apply false
     id("org.jetbrains.kotlin.android") version "1.9.0" apply false
-    id("com.android.library") version "8.3.2" apply false
+    id("com.android.library") version "8.6.0" apply false
     id("com.google.dagger.hilt.android") version "2.50" apply false
     id("com.google.gms.google-services") version "4.4.0" apply false
     id("org.jlleitschuh.gradle.ktlint") version "11.4.2"
diff --git a/data/src/main/java/com/canopas/yourspace/data/di/AppDataProvider.kt b/data/src/main/java/com/canopas/yourspace/data/di/AppDataProvider.kt
index 5aed6761..666b1645 100644
--- a/data/src/main/java/com/canopas/yourspace/data/di/AppDataProvider.kt
+++ b/data/src/main/java/com/canopas/yourspace/data/di/AppDataProvider.kt
@@ -1,7 +1,6 @@
 package com.canopas.yourspace.data.di
 
 import android.content.Context
-import com.canopas.yourspace.data.storage.room.LocationTableDatabase
 import com.canopas.yourspace.data.utils.Config
 import com.google.android.gms.location.GeofencingClient
 import com.google.android.gms.location.LocationServices
@@ -38,11 +37,6 @@ class AppDataProvider {
     fun provideFirebaseFunctions(): FirebaseFunctions =
         FirebaseFunctions.getInstance(FirebaseApp.getInstance(), Config.FIREBASE_REGION)
 
-    @Provides
-    @Singleton
-    fun provideLocationTableDatabase(@ApplicationContext context: Context): LocationTableDatabase =
-        LocationTableDatabase.getInstance(context)
-
     @Provides
     @Singleton
     fun provideGeoFencingClient(@ApplicationContext context: Context): GeofencingClient =
diff --git a/data/src/main/java/com/canopas/yourspace/data/models/location/ApiLocation.kt b/data/src/main/java/com/canopas/yourspace/data/models/location/ApiLocation.kt
index f9060d8d..274383f7 100644
--- a/data/src/main/java/com/canopas/yourspace/data/models/location/ApiLocation.kt
+++ b/data/src/main/java/com/canopas/yourspace/data/models/location/ApiLocation.kt
@@ -4,14 +4,6 @@ import androidx.annotation.Keep
 import com.squareup.moshi.JsonClass
 import java.util.UUID
 
-/**
- * User state that can be either [UserState.STEADY] or [UserState.MOVING]
- * */
-enum class UserState(val value: Int) {
-    STEADY(0),
-    MOVING(1)
-}
-
 @Keep
 @JsonClass(generateAdapter = true)
 data class ApiLocation(
@@ -19,8 +11,7 @@ data class ApiLocation(
     val user_id: String = "",
     val latitude: Double = 0.0,
     val longitude: Double = 0.0,
-    val created_at: Long? = System.currentTimeMillis(),
-    val user_state: Int? = UserState.MOVING.value
+    val created_at: Long? = System.currentTimeMillis()
 )
 
 fun ApiLocation.toLocation() = android.location.Location("").apply {
diff --git a/data/src/main/java/com/canopas/yourspace/data/models/location/LocationJourney.kt b/data/src/main/java/com/canopas/yourspace/data/models/location/LocationJourney.kt
index 3c034bae..d01a572c 100644
--- a/data/src/main/java/com/canopas/yourspace/data/models/location/LocationJourney.kt
+++ b/data/src/main/java/com/canopas/yourspace/data/models/location/LocationJourney.kt
@@ -57,3 +57,10 @@ fun LocationJourney.toLocationFromMovingJourney() = Location("").apply {
     latitude = this@toLocationFromMovingJourney.to_latitude ?: 0.0
     longitude = this@toLocationFromMovingJourney.to_longitude ?: 0.0
 }
+
+fun Location.toLocationJourney(userId: String, journeyId: String) = LocationJourney(
+    id = journeyId,
+    user_id = userId,
+    from_latitude = latitude,
+    from_longitude = longitude
+)
diff --git a/data/src/main/java/com/canopas/yourspace/data/models/location/LocationTable.kt b/data/src/main/java/com/canopas/yourspace/data/models/location/LocationTable.kt
index 0e60609a..e7e5fbe3 100644
--- a/data/src/main/java/com/canopas/yourspace/data/models/location/LocationTable.kt
+++ b/data/src/main/java/com/canopas/yourspace/data/models/location/LocationTable.kt
@@ -13,8 +13,8 @@ data class LocationTable(
     @ColumnInfo(name = "user_id")
     val userId: String = "",
 
-    @ColumnInfo(name = "last_five_minutes_locations")
-    val lastFiveMinutesLocations: String? = null, // last 5 min ApiLocations
+    @ColumnInfo(name = "last_five_locations")
+    val lastFiveLocations: String? = null, // last 5 extracted locations
 
     @ColumnInfo(name = "last_location_journey")
     val lastLocationJourney: String? = null // last journey
diff --git a/data/src/main/java/com/canopas/yourspace/data/receiver/location/LocationUpdateReceiver.kt b/data/src/main/java/com/canopas/yourspace/data/receiver/location/LocationUpdateReceiver.kt
index ff42fed0..fdae955e 100644
--- a/data/src/main/java/com/canopas/yourspace/data/receiver/location/LocationUpdateReceiver.kt
+++ b/data/src/main/java/com/canopas/yourspace/data/receiver/location/LocationUpdateReceiver.kt
@@ -8,8 +8,7 @@ import com.canopas.yourspace.data.service.auth.AuthService
 import com.canopas.yourspace.data.service.location.ApiJourneyService
 import com.canopas.yourspace.data.service.location.ApiLocationService
 import com.canopas.yourspace.data.service.location.LocationManager
-import com.canopas.yourspace.data.storage.room.LocationTableDatabase
-import com.canopas.yourspace.data.utils.LocationConverters
+import com.canopas.yourspace.data.storage.LocationCache
 import com.google.android.gms.location.LocationResult
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
@@ -20,6 +19,7 @@ import timber.log.Timber
 import javax.inject.Inject
 
 const val ACTION_LOCATION_UPDATE = "action.LOCATION_UPDATE"
+const val MIN_LOCATION_DISTANCE = 10f
 
 @AndroidEntryPoint
 class LocationUpdateReceiver : BroadcastReceiver() {
@@ -33,17 +33,14 @@ class LocationUpdateReceiver : BroadcastReceiver() {
     @Inject
     lateinit var locationManager: LocationManager
 
-    @Inject
-    lateinit var locationTableDatabase: LocationTableDatabase
-
     @Inject
     lateinit var authService: AuthService
 
     @Inject
-    lateinit var converters: LocationConverters
+    lateinit var journeyRepository: JourneyRepository
 
     @Inject
-    lateinit var journeyRepository: JourneyRepository
+    lateinit var locationCache: LocationCache
 
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
@@ -53,16 +50,21 @@ class LocationUpdateReceiver : BroadcastReceiver() {
                 try {
                     val userId = authService.currentUser?.id ?: return@launch
 
+                    val lastLocation = locationCache.getLastLocation(userId)
                     locationResult.locations.forEach { extractedLocation ->
-                        val userState = journeyRepository.getUserState(userId, extractedLocation)
-                        locationService.saveCurrentLocation(
-                            userId,
-                            extractedLocation.latitude,
-                            extractedLocation.longitude,
-                            System.currentTimeMillis(),
-                            userState = userState
-                        )
-                        journeyRepository.saveLocationJourney(userState, extractedLocation, userId)
+                        val distance = lastLocation?.distanceTo(extractedLocation) ?: 10f
+                        // Save location only if the distance is greater than 10 meters
+                        // to avoid saving the same location
+                        if (distance >= MIN_LOCATION_DISTANCE) {
+                            locationService.saveCurrentLocation(
+                                userId,
+                                extractedLocation.latitude,
+                                extractedLocation.longitude,
+                                System.currentTimeMillis()
+                            )
+                            locationCache.putLastLocation(extractedLocation, userId)
+                        }
+                        journeyRepository.saveLocationJourney(extractedLocation, userId)
                     }
                 } catch (e: Exception) {
                     Timber.e(e, "Error while saving location")
diff --git a/data/src/main/java/com/canopas/yourspace/data/repository/JourneyRepository.kt b/data/src/main/java/com/canopas/yourspace/data/repository/JourneyRepository.kt
index 80fe99f6..36e86256 100644
--- a/data/src/main/java/com/canopas/yourspace/data/repository/JourneyRepository.kt
+++ b/data/src/main/java/com/canopas/yourspace/data/repository/JourneyRepository.kt
@@ -1,295 +1,319 @@
 package com.canopas.yourspace.data.repository
 
 import android.location.Location
-import com.canopas.yourspace.data.models.location.ApiLocation
 import com.canopas.yourspace.data.models.location.LocationJourney
-import com.canopas.yourspace.data.models.location.LocationTable
-import com.canopas.yourspace.data.models.location.UserState
 import com.canopas.yourspace.data.models.location.isSteadyLocation
-import com.canopas.yourspace.data.models.location.toApiLocation
-import com.canopas.yourspace.data.models.location.toLocation
 import com.canopas.yourspace.data.models.location.toLocationFromMovingJourney
 import com.canopas.yourspace.data.models.location.toLocationFromSteadyJourney
+import com.canopas.yourspace.data.models.location.toLocationJourney
 import com.canopas.yourspace.data.models.location.toRoute
 import com.canopas.yourspace.data.service.location.ApiJourneyService
-import com.canopas.yourspace.data.service.location.ApiLocationService
-import com.canopas.yourspace.data.storage.room.LocationTableDatabase
-import com.canopas.yourspace.data.utils.LocationConverters
-import kotlinx.coroutines.flow.toList
+import com.canopas.yourspace.data.storage.LocationCache
 import timber.log.Timber
+import java.util.Calendar
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.math.sqrt
 
-const val MIN_DISTANCE = 100.0
-const val MIN_TIME_DIFFERENCE = 5 * 60 * 1000
+const val MIN_DISTANCE = 150.0 // 150 meters
+const val MIN_TIME_DIFFERENCE = 5 * 60 * 1000 // 5 minutes
 
 @Singleton
 class JourneyRepository @Inject constructor(
-    private val locationTableDatabase: LocationTableDatabase,
     private val journeyService: ApiJourneyService,
-    private val locationService: ApiLocationService,
-    private val converters: LocationConverters
+    private val locationCache: LocationCache
 ) {
 
     suspend fun saveLocationJourney(
-        userState: Int,
         extractedLocation: Location,
         userId: String
     ) {
         try {
-            val locationData = getLocationData(userId)
-            val lastJourney = getLastJourneyLocation(userId, locationData)
+            val lastKnownJourney = getLastKnownLocation(userId, extractedLocation)
 
-            when {
-                lastJourney == null -> {
-                    journeyService.saveCurrentJourney(
-                        userId = userId,
-                        fromLatitude = extractedLocation.latitude,
-                        fromLongitude = extractedLocation.longitude
-                    )
-                }
-
-                userState == UserState.STEADY.value -> {
-                    saveJourneyForSteadyUser(
-                        currentUserId = userId,
-                        extractedLocation = extractedLocation,
-                        lastKnownJourney = lastJourney
-                    )
-                }
+            val isDayChanged = isDayChanged(extractedLocation, lastKnownJourney)
 
-                userState == UserState.MOVING.value -> {
-                    saveJourneyForMovingUser(
-                        currentUserId = userId,
-                        extractedLocation = extractedLocation,
-                        lastKnownJourney = lastJourney
-                    )
-                }
+            if (isDayChanged) {
+                // Day is changed between last known journey and current location
+                // Just save again the last known journey in remote database with updated day i.e., current time
+                saveJourneyOnDayChanged(userId, lastKnownJourney)
+                return
             }
-        } catch (e: Exception) {
-            Timber.e(e, "Error while saving location journey")
-        }
-    }
 
-    private fun getLocationData(
-        userid: String
-    ): LocationTable? {
-        return locationTableDatabase.locationTableDao().getLocationData(userid)
-    }
+            // Check add add extracted location to last five locations to calculate geometric median
+            checkAndSaveLastFiveLocations(extractedLocation, userId)
 
-    private suspend fun getLastJourneyLocation(
-        userId: String,
-        locationData: LocationTable?
-    ): LocationJourney? {
-        return locationData?.lastLocationJourney?.let {
-            return converters.journeyFromString(it)
-        } ?: run {
-            val lastJourneyLocation = journeyService.getLastJourneyLocation(userId)
-            locationData?.copy(lastLocationJourney = converters.journeyToString(lastJourneyLocation))
-                ?.let {
-                    locationTableDatabase.locationTableDao().updateLocationTable(it)
-                }
-            return lastJourneyLocation
+            // Check and save location journey based on user state i.e., steady or moving
+            checkAndSaveLocationJourney(userId, extractedLocation, lastKnownJourney)
+        } catch (e: Exception) {
+            Timber.e(e, "Error while saving location journey")
         }
     }
 
     /**
-     * Get last five minute locations from local database ~ 1 location per minute
+     * Compare last known journey with extracted location and check if day is changed
      * */
-    private fun getLastFiveMinuteLocations(locationData: LocationTable?): List<ApiLocation> {
-        return locationData?.lastFiveMinutesLocations?.let {
-            converters.locationListFromString(it)
-        } ?: emptyList()
+    private fun isDayChanged(
+        extractedLocation: Location,
+        lastKnownJourney: LocationJourney
+    ): Boolean {
+        val calendar = Calendar.getInstance()
+        calendar.timeInMillis = lastKnownJourney.update_at!!
+        val lastKnownDay = calendar.get(Calendar.DAY_OF_MONTH)
+        calendar.timeInMillis = extractedLocation.time
+        val currentDay = calendar.get(Calendar.DAY_OF_MONTH)
+        return lastKnownDay != currentDay
     }
 
-    private suspend fun checkAndUpdateLastFiveMinLocations(
+    /**
+     * Save last known journey with updated day
+     * */
+    private suspend fun saveJourneyOnDayChanged(
         userId: String,
-        locationData: LocationTable,
-        extractedLocation: Location
+        lastKnownJourney: LocationJourney
     ) {
-        val locations =
-            locationData.lastFiveMinutesLocations?.let { converters.locationListFromString(it) }
-        if (locations.isNullOrEmpty()) {
-            val lastFiveMinLocations =
-                locationService.getLastFiveMinuteLocations(userId).toList().flatten()
-            updateLocationData(locationData, lastFiveMinLocations)
-        } else {
-            val latest = locations.maxByOrNull { it.created_at!! }
-            if (latest == null || latest.created_at!! < System.currentTimeMillis() - 60000) {
-                val updated = locations.toMutableList()
-                updated.removeAll { extractedLocation.time - it.created_at!! > MIN_TIME_DIFFERENCE }
-                updated.add(extractedLocation.toApiLocation(userId))
-                updateLocationData(locationData, updated)
-            }
+        var newJourneyId = ""
+        // Removed createdAt and updatedAt from saveCurrentJourney so that we can just create a new journey
+        // Because it was creating issue while checking current user state...
+        // Changes: https://github.com/canopas/your-space-android/pull/86/commits/b4ee9717148217a72c23ba139520bc308d75f887
+        journeyService.saveCurrentJourney(
+            userId = userId,
+            fromLatitude = lastKnownJourney.from_latitude,
+            fromLongitude = lastKnownJourney.from_longitude,
+            toLatitude = lastKnownJourney.to_latitude,
+            toLongitude = lastKnownJourney.to_longitude,
+            routeDistance = lastKnownJourney.route_distance,
+            routeDuration = lastKnownJourney.route_duration
+        ) {
+            newJourneyId = it
         }
-    }
-
-    private suspend fun updateLocationData(
-        locationData: LocationTable,
-        updatedLocations: List<ApiLocation>
-    ) {
-        val updatedData = locationData.copy(
-            lastFiveMinutesLocations = converters.locationListToString(updatedLocations)
+        val newJourney = lastKnownJourney.copy(
+            id = newJourneyId,
+            created_at = System.currentTimeMillis(),
+            update_at = System.currentTimeMillis()
         )
-        locationTableDatabase.locationTableDao().updateLocationTable(updatedData)
+        locationCache.putLastJourney(newJourney, userId)
     }
 
-    suspend fun getUserState(userId: String, extractedLocation: Location): Int {
-        var locationData =
-            locationTableDatabase.locationTableDao().getLocationData(userId)
-
-        locationData?.let { checkAndUpdateLastFiveMinLocations(userId, it, extractedLocation) }
-
-        locationData =
-            locationTableDatabase.locationTableDao().getLocationData(userId)
-
-        val userState = getUserState(locationData, extractedLocation)
-
-        return userState
-    }
-
-    private fun getUserState(
-        locationData: LocationTable?,
+    /**
+     * Get last known location journey from cache
+     * If not available, fetch from remote database and save it to cache
+     * If not available in remote database as well, save extracted location as new location journey
+     * with steady state in cache as well as remote database
+     * */
+    private suspend fun getLastKnownLocation(
+        userid: String,
         extractedLocation: Location
-    ): Int {
-        val lastFiveMinuteLocations = getLastFiveMinuteLocations(locationData)
-        if (lastFiveMinuteLocations.isMoving(extractedLocation)) return UserState.MOVING.value
-        return UserState.STEADY.value
+    ): LocationJourney {
+        // Return last location journey if available from cache
+        return locationCache.getLastJourney(userid) ?: kotlin.run {
+            // Here, means no location journey available in cache
+            // Fetch last location journey from remote database and save it to cache
+            val lastJourney = journeyService.getLastJourneyLocation(userid)
+            lastJourney?.let {
+                locationCache.putLastJourney(it, userid)
+                return lastJourney
+            } ?: run {
+                // Here, means no location journey available in remote database as well
+                // Possibly user is new or no location journey available
+                // Save extracted location as new location journey with steady state in cache
+                // as well as remote database and return it
+                var newJourneyId = ""
+                journeyService.saveCurrentJourney(
+                    userId = userid,
+                    fromLatitude = extractedLocation.latitude,
+                    fromLongitude = extractedLocation.longitude,
+                    createdAt = extractedLocation.time
+                ) {
+                    newJourneyId = it
+                }
+                val locationJourney = extractedLocation.toLocationJourney(userid, newJourneyId)
+                locationCache.putLastJourney(locationJourney, userid)
+                return locationJourney
+            }
+        }
     }
 
     /**
-     * Save journey for moving user
+     * Figure out the state of user i.e., steady or moving and save location journey accordingly.
      * */
-    private suspend fun saveJourneyForMovingUser(
-        currentUserId: String,
+    private suspend fun checkAndSaveLocationJourney(
+        userId: String,
         extractedLocation: Location,
         lastKnownJourney: LocationJourney
     ) {
+        val geometricMedian = locationCache.getLastFiveLocations(userId)?.let {
+            geometricMedian(it)
+        }
+        val distance =
+            if (lastKnownJourney.isSteadyLocation()) {
+                distanceBetween(
+                    geometricMedian ?: extractedLocation,
+                    lastKnownJourney.toLocationFromSteadyJourney()
+                )
+            } else {
+                distanceBetween(
+                    geometricMedian ?: extractedLocation,
+                    lastKnownJourney.toLocationFromMovingJourney()
+                )
+            }
+
+        val timeDifference = (geometricMedian?.time ?: extractedLocation.time) - lastKnownJourney.update_at!!
+
         if (lastKnownJourney.isSteadyLocation()) {
-            val updatedRoutes = lastKnownJourney.routes.toMutableList()
-            updatedRoutes.add(extractedLocation.toRoute())
-            journeyService.saveCurrentJourney(
-                userId = currentUserId,
-                fromLatitude = lastKnownJourney.from_latitude,
-                fromLongitude = lastKnownJourney.from_longitude,
-                toLatitude = extractedLocation.latitude,
-                toLongitude = extractedLocation.longitude,
-                routeDistance = distanceBetween(
+            // Handle steady user
+            if (distance > MIN_DISTANCE) {
+                // Here, means last known journey is steady and and now user has started moving
+                // Save journey for moving user and update cache as well:
+                saveJourneyWhenUserStartsMoving(
+                    userId,
                     extractedLocation,
-                    lastKnownJourney.toLocationFromSteadyJourney()
-                ).toDouble(),
-                routeDuration = extractedLocation.time - lastKnownJourney.update_at!!
-            )
+                    lastKnownJourney,
+                    distance
+                )
+            }
         } else {
-            val distance = lastKnownJourney.toLocationFromMovingJourney().distanceTo(
-                extractedLocation
-            ).toDouble()
-            val updatedRoutes = lastKnownJourney.routes.toMutableList()
-            updatedRoutes.add(extractedLocation.toRoute())
-            journeyService.updateLastLocationJourney(
-                userId = currentUserId,
-                lastKnownJourney.copy(
-                    to_latitude = extractedLocation.latitude,
-                    to_longitude = extractedLocation.longitude,
-                    route_distance = (lastKnownJourney.route_distance ?: 0.0) + distance,
-                    route_duration = extractedLocation.time - lastKnownJourney.created_at!!,
-                    routes = updatedRoutes,
-                    update_at = System.currentTimeMillis()
+            // Handle moving user
+            if (distance > MIN_DISTANCE) {
+                // Here, means last known journey is moving and user is still moving
+                // Save journey for moving user and update last known journey.
+                // Note: Need to use lastKnownJourney.id as journey id because we are updating the journey
+                updateJourneyForContinuedMovingUser(
+                    userId,
+                    extractedLocation,
+                    lastKnownJourney,
+                    distance
                 )
-            )
+            } else if (distance < MIN_DISTANCE && timeDifference > MIN_TIME_DIFFERENCE) {
+                // Here, means last known journey is moving and user has stopped moving
+                // Save journey for steady user and update last known journey:
+                saveJourneyOnJourneyStopped(
+                    userId,
+                    extractedLocation,
+                    lastKnownJourney,
+                    distance
+                )
+            }
         }
     }
 
     /**
-     * Save journey as steady when user state is steady
+     * Save journey when user starts moving i.e., state changes from steady to moving
      * */
-    private suspend fun saveJourneyForSteadyUser(
-        currentUserId: String,
+    private suspend fun saveJourneyWhenUserStartsMoving(
+        userId: String,
         extractedLocation: Location,
-        lastKnownJourney: LocationJourney
+        lastKnownJourney: LocationJourney,
+        distance: Float
     ) {
-        val lastLatLong =
-            if (lastKnownJourney.isSteadyLocation()) {
-                lastKnownJourney.toLocationFromSteadyJourney()
-            } else {
-                lastKnownJourney.toLocationFromMovingJourney()
-            }
-
-        val distance = distanceBetween(extractedLocation, lastLatLong)
-        val timeDifference = extractedLocation.time - lastKnownJourney.created_at!!
-
-        when {
-            timeDifference > MIN_TIME_DIFFERENCE && distance > MIN_DISTANCE -> {
-                if (lastKnownJourney.isSteadyLocation()) {
-                    journeyService.updateLastLocationJourney(
-                        userId = currentUserId,
-                        lastKnownJourney.copy(update_at = System.currentTimeMillis())
-                    )
-                } else {
-                    journeyService.saveCurrentJourney(
-                        currentUserId,
-                        fromLatitude = lastKnownJourney.to_latitude!!,
-                        fromLongitude = lastKnownJourney.to_longitude!!,
-                        createdAt = lastKnownJourney.update_at
-                    )
-                }
-
-                journeyService.saveCurrentJourney(
-                    userId = currentUserId,
-                    fromLatitude = lastKnownJourney.to_latitude ?: lastKnownJourney.from_latitude,
-                    fromLongitude = lastKnownJourney.to_longitude
-                        ?: lastKnownJourney.from_longitude,
-                    toLatitude = extractedLocation.latitude,
-                    toLongitude = extractedLocation.longitude,
-                    routeDistance = distance.toDouble(),
-                    routeDuration = extractedLocation.time - lastKnownJourney.update_at!!,
-                    createdAt = lastKnownJourney.update_at,
-                    updateAt = System.currentTimeMillis()
+        var newJourneyId = ""
+        val journey = LocationJourney(
+            user_id = userId,
+            from_latitude = lastKnownJourney.from_latitude,
+            from_longitude = lastKnownJourney.from_longitude,
+            to_latitude = extractedLocation.latitude,
+            to_longitude = extractedLocation.longitude,
+            route_distance = distance.toDouble(),
+            route_duration = null,
+            routes = listOf(
+                lastKnownJourney.toLocationFromSteadyJourney().toRoute(),
+                extractedLocation.toRoute()
+            )
+        )
+        journeyService.saveCurrentJourney(
+            userId = userId,
+            fromLatitude = lastKnownJourney.from_latitude,
+            fromLongitude = lastKnownJourney.from_longitude,
+            toLatitude = extractedLocation.latitude,
+            toLongitude = extractedLocation.longitude,
+            routeDistance = distance.toDouble() + (lastKnownJourney.route_distance ?: 0.0),
+            routeDuration = (extractedLocation.time - lastKnownJourney.created_at!!) + (
+                lastKnownJourney.route_duration
+                    ?: 0
                 )
-            }
+        ) {
+            newJourneyId = it
+        }
+        locationCache.putLastJourney(journey.copy(id = newJourneyId), userId)
+    }
 
-            timeDifference < MIN_TIME_DIFFERENCE && distance > MIN_DISTANCE -> {
-                val updatedRoutes = lastKnownJourney.routes.toMutableList()
-                updatedRoutes.add(extractedLocation.toRoute())
-                journeyService.updateLastLocationJourney(
-                    userId = currentUserId,
-                    journey = lastKnownJourney.copy(
-                        to_longitude = extractedLocation.longitude,
-                        to_latitude = extractedLocation.latitude,
-                        route_distance = lastKnownJourney.toLocationFromSteadyJourney().distanceTo(
-                            extractedLocation
-                        ).toDouble(),
-                        routes = updatedRoutes,
-                        route_duration = extractedLocation.time - lastKnownJourney.created_at,
-                        update_at = System.currentTimeMillis()
-                    )
-                )
-            }
+    /**
+     * Update journey for continued moving user i.e., state is moving and user is still moving
+     * */
+    private suspend fun updateJourneyForContinuedMovingUser(
+        userId: String,
+        extractedLocation: Location,
+        lastKnownJourney: LocationJourney,
+        distance: Float
+    ) {
+        val journey = LocationJourney(
+            id = lastKnownJourney.id,
+            user_id = userId,
+            from_latitude = lastKnownJourney.from_latitude,
+            from_longitude = lastKnownJourney.from_longitude,
+            to_latitude = extractedLocation.latitude,
+            to_longitude = extractedLocation.longitude,
+            route_distance = distance.toDouble() + (lastKnownJourney.route_distance ?: 0.0),
+            route_duration = (extractedLocation.time - lastKnownJourney.created_at!!) + (
+                lastKnownJourney.route_duration
+                    ?: 0
+                ),
+            routes = lastKnownJourney.routes + listOf(extractedLocation.toRoute())
+        )
+        journeyService.updateLastLocationJourney(
+            userId = userId,
+            journey = journey.copy(created_at = lastKnownJourney.created_at)
+        )
+        locationCache.putLastJourney(journey, userId)
+    }
 
-            timeDifference > MIN_TIME_DIFFERENCE && distance < MIN_DISTANCE -> {
-                if (lastKnownJourney.isSteadyLocation()) {
-                    journeyService.updateLastLocationJourney(
-                        userId = currentUserId,
-                        lastKnownJourney.copy(
-                            update_at = System.currentTimeMillis()
-                        )
-                    )
-                } else {
-                    journeyService.saveCurrentJourney(
-                        currentUserId,
-                        fromLatitude = extractedLocation.latitude,
-                        fromLongitude = extractedLocation.longitude,
-                        createdAt = System.currentTimeMillis()
-                    )
-                }
-            }
+    /**
+     * Save journey when user stops moving i.e., state changes from moving to steady
+     * */
+    private suspend fun saveJourneyOnJourneyStopped(
+        userId: String,
+        extractedLocation: Location,
+        lastKnownJourney: LocationJourney,
+        distance: Float
+    ) {
+        val movingJourney = LocationJourney(
+            id = lastKnownJourney.id,
+            user_id = userId,
+            from_latitude = lastKnownJourney.from_latitude,
+            from_longitude = lastKnownJourney.from_longitude,
+            to_latitude = extractedLocation.latitude,
+            to_longitude = extractedLocation.longitude,
+            route_distance = distance.toDouble() + (lastKnownJourney.route_distance ?: 0.0),
+            route_duration = (extractedLocation.time - lastKnownJourney.created_at!!) + (
+                lastKnownJourney.route_duration
+                    ?: 0
+                ),
+            routes = lastKnownJourney.routes + listOf(extractedLocation.toRoute()),
+            created_at = lastKnownJourney.created_at,
+            update_at = lastKnownJourney.update_at
+        )
+        journeyService.updateLastLocationJourney(
+            userId = userId,
+            journey = movingJourney
+        )
 
-            timeDifference < MIN_TIME_DIFFERENCE && distance < MIN_DISTANCE -> {
-                journeyService.updateLastLocationJourney(
-                    userId = currentUserId,
-                    lastKnownJourney.copy(update_at = System.currentTimeMillis())
-                )
-            }
+        // Save journey for steady user and update cache as well:
+        var newJourneyId = ""
+        journeyService.saveCurrentJourney(
+            userId = userId,
+            fromLatitude = extractedLocation.latitude,
+            fromLongitude = extractedLocation.longitude,
+            createdAt = lastKnownJourney.update_at
+        ) {
+            newJourneyId = it
         }
+        val steadyJourney = LocationJourney(
+            id = newJourneyId,
+            user_id = userId,
+            from_latitude = extractedLocation.latitude,
+            from_longitude = extractedLocation.longitude
+        )
+        locationCache.putLastJourney(steadyJourney, userId)
     }
 
     /**
@@ -306,14 +330,75 @@ class JourneyRepository @Inject constructor(
         )
         return distance[0]
     }
-}
 
-/**
- * Check if user is moving or steady
- * */
-fun List<ApiLocation>.isMoving(currentLocation: Location): Boolean {
-    return any {
-        val distance = currentLocation.distanceTo(it.toLocation()).toDouble()
-        distance > MIN_DISTANCE
+    /**
+     * Check and add local journey to remote database
+     * Can happen when user switches space or joins/creates new space
+     * */
+    suspend fun checkAndAddLocalJourneyToRemoteDatabase(
+        userId: String,
+        from: Long? = null,
+        to: Long? = null
+    ): LocationJourney? {
+        val lastJourney = locationCache.getLastJourney(userId)
+
+        val journeyFromRemote = journeyService.getLastJourneyLocation(userId)
+        lastJourney?.let { journey ->
+            if (from != null && to != null) {
+                val calendar = Calendar.getInstance()
+                calendar.timeInMillis = journey.created_at!!
+                val lastKnownDay = calendar.get(Calendar.DAY_OF_MONTH)
+                calendar.timeInMillis = from
+                val fromDay = calendar.get(Calendar.DAY_OF_MONTH)
+                calendar.timeInMillis = to
+                val toDay = calendar.get(Calendar.DAY_OF_MONTH)
+                if (lastKnownDay in fromDay..toDay) {
+                    // If last journey and journey from remote database is same then
+                    // no need to add it to remote database
+                    if (lastJourney == journeyFromRemote) {
+                        return lastJourney
+                    }
+                    journeyService.saveCurrentJourney(
+                        userId = userId,
+                        fromLatitude = journey.from_latitude,
+                        fromLongitude = journey.from_longitude
+                    ) {
+                        Timber.d("Local journey added to remote database with steady state")
+                    }
+                    return lastJourney
+                }
+            }
+        }
+        return null
+    }
+
+    private fun distance(loc1: Location, loc2: Location): Double {
+        val latDiff = loc1.latitude - loc2.latitude
+        val lonDiff = loc1.longitude - loc2.longitude
+        return sqrt(latDiff * latDiff + lonDiff * lonDiff)
+    }
+
+    private fun geometricMedian(locations: List<Location>): Location {
+        val result = locations.minByOrNull { candidate ->
+            locations.sumOf { location ->
+                val distance = distance(candidate, location)
+                distance
+            }
+        } ?: throw IllegalArgumentException("Location list is empty")
+        return result
+    }
+
+    private fun checkAndSaveLastFiveLocations(extractedLocation: Location, userId: String) {
+        val lastFiveLocations = locationCache.getLastFiveLocations(userId) ?: emptyList()
+        val lastFiveLocationsWithNewLocation = lastFiveLocations.toMutableList()
+        if (lastFiveLocations.isEmpty()) {
+            lastFiveLocationsWithNewLocation.add(extractedLocation)
+        } else if (lastFiveLocations.size < 5) {
+            lastFiveLocationsWithNewLocation.add(extractedLocation)
+        } else {
+            lastFiveLocationsWithNewLocation.removeAt(0)
+            lastFiveLocationsWithNewLocation.add(extractedLocation)
+        }
+        locationCache.putLastFiveLocations(lastFiveLocationsWithNewLocation, userId)
     }
 }
diff --git a/data/src/main/java/com/canopas/yourspace/data/service/auth/AuthService.kt b/data/src/main/java/com/canopas/yourspace/data/service/auth/AuthService.kt
index 6791355b..024a8aa4 100644
--- a/data/src/main/java/com/canopas/yourspace/data/service/auth/AuthService.kt
+++ b/data/src/main/java/com/canopas/yourspace/data/service/auth/AuthService.kt
@@ -4,6 +4,7 @@ import com.canopas.yourspace.data.models.user.ApiUser
 import com.canopas.yourspace.data.models.user.ApiUserSession
 import com.canopas.yourspace.data.service.location.LocationManager
 import com.canopas.yourspace.data.service.user.ApiUserService
+import com.canopas.yourspace.data.storage.LocationCache
 import com.canopas.yourspace.data.storage.UserPreferences
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import com.google.firebase.auth.FirebaseAuth
@@ -15,7 +16,8 @@ class AuthService @Inject constructor(
     private val userPreferences: UserPreferences,
     private val apiUserService: ApiUserService,
     private val firebaseAuth: FirebaseAuth,
-    private val locationManager: LocationManager
+    private val locationManager: LocationManager,
+    private val locationCache: LocationCache
 ) {
     private val authStateChangeListeners = HashSet<AuthStateChangeListener>()
 
@@ -103,6 +105,7 @@ class AuthService @Inject constructor(
         userPreferences.currentSpace = ""
         firebaseAuth.signOut()
         locationManager.stopService()
+        locationCache.clear()
     }
 
     suspend fun deleteAccount() {
@@ -121,7 +124,6 @@ class AuthService @Inject constructor(
 
     suspend fun updateUserSessionState(state: Int) {
         val currentUser = currentUser ?: return
-        if (currentUser.state == state) return
         apiUserService.updateSessionState(currentUser.id, state)
     }
 }
diff --git a/data/src/main/java/com/canopas/yourspace/data/service/location/ApiJourneyService.kt b/data/src/main/java/com/canopas/yourspace/data/service/location/ApiJourneyService.kt
index aa9ff0f0..26f52206 100644
--- a/data/src/main/java/com/canopas/yourspace/data/service/location/ApiJourneyService.kt
+++ b/data/src/main/java/com/canopas/yourspace/data/service/location/ApiJourneyService.kt
@@ -1,10 +1,8 @@
 package com.canopas.yourspace.data.service.location
 
+import com.canopas.yourspace.data.models.location.JourneyRoute
 import com.canopas.yourspace.data.models.location.LocationJourney
-import com.canopas.yourspace.data.models.location.LocationTable
-import com.canopas.yourspace.data.storage.room.LocationTableDatabase
 import com.canopas.yourspace.data.utils.Config
-import com.canopas.yourspace.data.utils.LocationConverters
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.Query
 import com.google.firebase.firestore.toObject
@@ -15,9 +13,7 @@ import javax.inject.Singleton
 
 @Singleton
 class ApiJourneyService @Inject constructor(
-    db: FirebaseFirestore,
-    private val locationTableDatabase: LocationTableDatabase,
-    private val converters: LocationConverters
+    db: FirebaseFirestore
 ) {
     private val userRef = db.collection(Config.FIRESTORE_COLLECTION_USERS)
 
@@ -37,8 +33,10 @@ class ApiJourneyService @Inject constructor(
         toLongitude: Double? = null,
         routeDistance: Double? = null,
         routeDuration: Long? = null,
+        routes: List<JourneyRoute> = emptyList(),
         createdAt: Long? = null,
-        updateAt: Long? = null
+        updateAt: Long? = null,
+        newJourneyId: ((String) -> Unit)? = null
     ) {
         val docRef = journeyRef(userId).document()
 
@@ -51,48 +49,24 @@ class ApiJourneyService @Inject constructor(
             to_longitude = toLongitude,
             route_distance = routeDistance,
             route_duration = routeDuration,
-            routes = emptyList(),
+            routes = routes,
             created_at = createdAt ?: System.currentTimeMillis(),
-            update_at = updateAt ?: createdAt ?: System.currentTimeMillis()
+            update_at = updateAt ?: System.currentTimeMillis()
         )
 
-        val location = LocationTable(
-            userId = userId,
-            lastFiveMinutesLocations = routeDistance.toString(),
-            lastLocationJourney = routeDuration.toString()
-        )
-
-        locationTableDatabase.locationTableDao().insertLocationData(location)
-        journey.updateLocationJourney(userId)
+        newJourneyId?.invoke(journey.id)
 
         docRef.set(journey).await()
     }
 
     suspend fun updateLastLocationJourney(userId: String, journey: LocationJourney) {
         try {
-            journey.updateLocationJourney(userId)
             journeyRef(userId).document(journey.id).set(journey).await()
         } catch (e: Exception) {
             Timber.e(e, "Error while updating last location journey")
         }
     }
 
-    private suspend fun LocationJourney.updateLocationJourney(userId: String) {
-        locationTableDatabase.locationTableDao().getLocationData(userId)?.let { locationTable ->
-
-            val newLocationData =
-                locationTable.copy(lastLocationJourney = converters.journeyToString(this))
-
-            newLocationData.let {
-                try {
-                    locationTableDatabase.locationTableDao().updateLocationTable(it)
-                } catch (e: Exception) {
-                    Timber.e(e, "Error while updating location journey")
-                }
-            }
-        }
-    }
-
     suspend fun getLastJourneyLocation(userId: String) = try {
         journeyRef(userId).whereEqualTo("user_id", userId)
             .orderBy("created_at", Query.Direction.DESCENDING).limit(1)
diff --git a/data/src/main/java/com/canopas/yourspace/data/service/location/ApiLocationService.kt b/data/src/main/java/com/canopas/yourspace/data/service/location/ApiLocationService.kt
index 11a63de3..41999c99 100644
--- a/data/src/main/java/com/canopas/yourspace/data/service/location/ApiLocationService.kt
+++ b/data/src/main/java/com/canopas/yourspace/data/service/location/ApiLocationService.kt
@@ -1,7 +1,6 @@
 package com.canopas.yourspace.data.service.location
 
 import com.canopas.yourspace.data.models.location.ApiLocation
-import com.canopas.yourspace.data.models.location.UserState
 import com.canopas.yourspace.data.utils.Config
 import com.canopas.yourspace.data.utils.snapshotFlow
 import com.google.firebase.firestore.FirebaseFirestore
@@ -34,8 +33,7 @@ class ApiLocationService @Inject constructor(
             user_id = userId,
             latitude = lastLocation.latitude,
             longitude = lastLocation.longitude,
-            created_at = System.currentTimeMillis(),
-            user_state = UserState.STEADY.value
+            created_at = System.currentTimeMillis()
         )
 
         docRef.set(location).await()
@@ -45,8 +43,7 @@ class ApiLocationService @Inject constructor(
         userId: String,
         latitude: Double,
         longitude: Double,
-        recordedAt: Long,
-        userState: Int?
+        recordedAt: Long
     ) {
         val docRef = locationRef(userId).document()
 
@@ -55,8 +52,7 @@ class ApiLocationService @Inject constructor(
             user_id = userId,
             latitude = latitude,
             longitude = longitude,
-            created_at = recordedAt,
-            user_state = userState
+            created_at = recordedAt
         )
 
         docRef.set(location).await()
diff --git a/data/src/main/java/com/canopas/yourspace/data/service/location/LocationManager.kt b/data/src/main/java/com/canopas/yourspace/data/service/location/LocationManager.kt
index f1d1b223..ba6e82a6 100644
--- a/data/src/main/java/com/canopas/yourspace/data/service/location/LocationManager.kt
+++ b/data/src/main/java/com/canopas/yourspace/data/service/location/LocationManager.kt
@@ -21,7 +21,6 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 private const val LOCATION_UPDATE_INTERVAL = 10000L
-private const val LOCATION_UPDATE_DISTANCE = 10f
 
 @Singleton
 class LocationManager @Inject constructor(@ApplicationContext private val context: Context) {
@@ -58,8 +57,7 @@ class LocationManager @Inject constructor(@ApplicationContext private val contex
         LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, LOCATION_UPDATE_INTERVAL)
             .apply {
                 setGranularity(Granularity.GRANULARITY_PERMISSION_LEVEL)
-                setMinUpdateDistanceMeters(LOCATION_UPDATE_DISTANCE)
-                setWaitForAccurateLocation(true)
+                setMinUpdateIntervalMillis(LOCATION_UPDATE_INTERVAL)
             }.build()
 
     internal fun startLocationTracking() {
diff --git a/data/src/main/java/com/canopas/yourspace/data/storage/LocationCache.kt b/data/src/main/java/com/canopas/yourspace/data/storage/LocationCache.kt
new file mode 100644
index 00000000..f01f7167
--- /dev/null
+++ b/data/src/main/java/com/canopas/yourspace/data/storage/LocationCache.kt
@@ -0,0 +1,44 @@
+package com.canopas.yourspace.data.storage
+
+import android.location.Location
+import android.util.LruCache
+import com.canopas.yourspace.data.models.location.LocationJourney
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class LocationCache @Inject constructor() {
+    private val lastJourneyCache = LruCache<String, LocationJourney>(25)
+    private val lastFiveLocationsCache = LruCache<String, List<Location>>(25)
+    private val lastLocationCache = LruCache<String, Location>(25)
+
+    fun putLastJourney(journey: LocationJourney, userId: String) {
+        lastJourneyCache.put(userId, journey)
+    }
+
+    fun getLastJourney(userId: String): LocationJourney? {
+        return lastJourneyCache.get(userId) ?: null
+    }
+
+    fun putLastFiveLocations(locations: List<Location>, userId: String) {
+        lastFiveLocationsCache.put(userId, locations)
+    }
+
+    fun getLastFiveLocations(userId: String): List<Location>? {
+        return lastFiveLocationsCache.get(userId) ?: null
+    }
+
+    fun putLastLocation(location: Location, userId: String) {
+        lastLocationCache.put(userId, location)
+    }
+
+    fun getLastLocation(userId: String): Location? {
+        return lastLocationCache.get(userId) ?: null
+    }
+
+    fun clear() {
+        lastJourneyCache.evictAll()
+        lastFiveLocationsCache.evictAll()
+        lastLocationCache.evictAll()
+    }
+}
diff --git a/data/src/main/java/com/canopas/yourspace/data/storage/UserPreferences.kt b/data/src/main/java/com/canopas/yourspace/data/storage/UserPreferences.kt
index 957ee3eb..6fa340cb 100644
--- a/data/src/main/java/com/canopas/yourspace/data/storage/UserPreferences.kt
+++ b/data/src/main/java/com/canopas/yourspace/data/storage/UserPreferences.kt
@@ -75,7 +75,7 @@ class UserPreferences @Inject constructor(
         }
     }
 
-    var currentUserSessionState = preferencesDataStore.data.map { preferences ->
+    var currentUserSessionState = preferencesDataStore.data.map { _ ->
         preferencesDataStore.data.first()[KEY_USER_SESSION_JSON]?.let {
             return@let userSessionJsonAdapter.fromJson(it)
         }
@@ -144,7 +144,7 @@ class UserPreferences @Inject constructor(
         }
         set(registered) = runBlocking {
             preferencesDataStore.edit { preferences ->
-                preferences[PreferencesKey.IS_FCM_REGISTERED] = registered ?: false
+                preferences[PreferencesKey.IS_FCM_REGISTERED] = registered
             }
         }
 }
diff --git a/data/src/main/java/com/canopas/yourspace/data/storage/room/LocationTableDao.kt b/data/src/main/java/com/canopas/yourspace/data/storage/room/LocationTableDao.kt
deleted file mode 100644
index 6a802007..00000000
--- a/data/src/main/java/com/canopas/yourspace/data/storage/room/LocationTableDao.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.canopas.yourspace.data.storage.room
-
-import androidx.annotation.Keep
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import androidx.room.Update
-import com.canopas.yourspace.data.models.location.LocationTable
-
-@Keep
-@Dao
-interface LocationTableDao {
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertLocationData(location: LocationTable)
-
-    @Update
-    suspend fun updateLocationTable(location: LocationTable)
-
-    @Query("SELECT * FROM location_table WHERE user_id = :userId")
-    fun getLocationData(userId: String): LocationTable?
-
-    @Query("DELETE FROM location_table")
-    fun deleteLocationData()
-}
diff --git a/data/src/main/java/com/canopas/yourspace/data/storage/room/LocationTableDatabase.kt b/data/src/main/java/com/canopas/yourspace/data/storage/room/LocationTableDatabase.kt
deleted file mode 100644
index 04680207..00000000
--- a/data/src/main/java/com/canopas/yourspace/data/storage/room/LocationTableDatabase.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.canopas.yourspace.data.storage.room
-
-import android.content.Context
-import androidx.room.Database
-import androidx.room.Room
-import androidx.room.RoomDatabase
-import com.canopas.yourspace.data.models.location.LocationTable
-
-@Database(entities = [LocationTable::class], version = 2, exportSchema = false)
-abstract class LocationTableDatabase : RoomDatabase() {
-
-    abstract fun locationTableDao(): LocationTableDao
-
-    companion object {
-
-        @Volatile
-        private var INSTANCE: LocationTableDatabase? = null
-
-        fun getInstance(context: Context): LocationTableDatabase {
-            return INSTANCE ?: synchronized(this) {
-                val instance = Room.databaseBuilder(
-                    context.applicationContext,
-                    LocationTableDatabase::class.java,
-                    "location_table_database"
-                ).fallbackToDestructiveMigration().build()
-                INSTANCE = instance
-                instance
-            }
-        }
-    }
-}
diff --git a/data/src/main/java/com/canopas/yourspace/data/utils/FirestoreExts.kt b/data/src/main/java/com/canopas/yourspace/data/utils/FirestoreExts.kt
index 8a725a84..9663ddf5 100644
--- a/data/src/main/java/com/canopas/yourspace/data/utils/FirestoreExts.kt
+++ b/data/src/main/java/com/canopas/yourspace/data/utils/FirestoreExts.kt
@@ -5,7 +5,6 @@ import com.google.firebase.firestore.DocumentSnapshot
 import com.google.firebase.firestore.EventListener
 import com.google.firebase.firestore.FirebaseFirestoreException
 import com.google.firebase.firestore.Query
-import com.google.firebase.firestore.toObject
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
@@ -19,7 +18,7 @@ fun <T> Query.snapshotFlow(dataType: Class<T>): Flow<List<T>> = callbackFlow {
             return@addSnapshotListener
         }
         if (value != null) {
-            val data = value.documents.filter { it.exists() }.mapNotNull { it.toObject(dataType) as? T }
+            val data = value.documents.filter { it.exists() }.mapNotNull { it.toObject(dataType) }
             trySend(data)
         } else {
             trySend(emptyList())
diff --git a/data/src/main/java/com/canopas/yourspace/data/utils/LocationConverters.kt b/data/src/main/java/com/canopas/yourspace/data/utils/LocationConverters.kt
deleted file mode 100644
index d341899c..00000000
--- a/data/src/main/java/com/canopas/yourspace/data/utils/LocationConverters.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.canopas.yourspace.data.utils
-
-import androidx.room.TypeConverter
-import com.canopas.yourspace.data.models.location.ApiLocation
-import com.canopas.yourspace.data.models.location.LocationJourney
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.Types
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-import timber.log.Timber
-import javax.inject.Inject
-
-/**
- * Converters for Room database, used for converting complex data types to Room supported data types.
- *
- * For example, converting List<ApiLocation> to String and vice versa.
- *
- * Similarly, converting ApiLocation to String and vice versa
- * */
-class LocationConverters @Inject constructor() {
-
-    private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
-    private val type = Types.newParameterizedType(List::class.java, ApiLocation::class.java)
-    private val listJsonAdapter = moshi.adapter<List<ApiLocation>>(type)
-    private val journeyAdapter = moshi.adapter(LocationJourney::class.java)
-
-    /**
-     * Convert String to List<ApiLocation>
-     * */
-    @TypeConverter
-    fun locationListFromString(value: String): List<ApiLocation>? {
-        return try {
-            listJsonAdapter.fromJson(value)
-        } catch (e: Exception) {
-            Timber.e(e, "Error converting location list from string")
-            null
-        }
-    }
-
-    /**
-     * Convert List<ApiLocation> to String
-     * */
-    @TypeConverter
-    fun locationListToString(list: List<ApiLocation>?): String {
-        return try {
-            listJsonAdapter.toJson(list)
-        } catch (e: Exception) {
-            Timber.e(e, "Error converting location list to string")
-            ""
-        }
-    }
-
-    /**
-     * Convert String to LocationJourney
-     * */
-    @TypeConverter
-    fun journeyFromString(value: String): LocationJourney? {
-        return try {
-            journeyAdapter.fromJson(value)
-        } catch (e: Exception) {
-            Timber.e(e, "Error converting journey from string")
-            null
-        }
-    }
-
-    /**
-     * Convert LocationJourney to String
-     * */
-    @TypeConverter
-    fun journeyToString(journey: LocationJourney?): String {
-        return try {
-            journeyAdapter.toJson(journey)
-        } catch (e: Exception) {
-            Timber.e(e, "Error converting journey to string")
-            ""
-        }
-    }
-}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 86a4c53b..0092d42d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Jan 05 12:20:42 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists