Fix crash when a request of TrackMaps of user are null

See: square/retrofit#3075
davidasensio · Sep 4, 2020 · f6bea7c · f6bea7c
1 parent 40b2ee4
commit f6bea7c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/src/main/java/com/handysparksoft/trackmap/core/data/server/ServerDataSource.kt b/app/src/main/java/com/handysparksoft/trackmap/core/data/server/ServerDataSource.kt
@@ -18,7 +18,11 @@ class ServerDataSource(private val service: TrackMapService) : RemoteDataSource
     }
 
     override suspend fun getUserTrackMaps(userId: String): Map<String, TrackMap> {
-        return service.getUserTrackMaps(userId)
+        return try {
+            service.getUserTrackMaps(userId)
+        } catch (e: Exception) {
+            HashMap() // Return an empty HashMap when a request returns null
+        }
     }
 
     override suspend fun saveTrackMap(userId: String, trackMapId: String, trackMap: TrackMap) {

diff --git a/app/src/main/java/com/handysparksoft/trackmap/core/platform/UserHandler.kt b/app/src/main/java/com/handysparksoft/trackmap/core/platform/UserHandler.kt
@@ -9,5 +9,5 @@ class UserHandler @Inject constructor(private val context: Context) {
 
     @SuppressLint("HardwareIds")
     fun getUserId() =
-        Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
+        Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID) +"_"
 }