Also fixes the mock ServiceLocator

Author: JoseAlcerreca

app/src/mock/java/com/example/android/architecture/blueprints/todoapp/ServiceLocator.kt

@@ -20,6 +20,7 @@ import androidx.annotation.VisibleForTesting
 import androidx.room.Room
 import com.example.android.architecture.blueprints.todoapp.data.FakeTasksRemoteDataSource
 import com.example.android.architecture.blueprints.todoapp.data.source.DefaultTasksRepository
+import com.example.android.architecture.blueprints.todoapp.data.source.TasksDataSource
 import com.example.android.architecture.blueprints.todoapp.data.source.TasksRepository
 import com.example.android.architecture.blueprints.todoapp.data.source.local.TasksLocalDataSource
 import com.example.android.architecture.blueprints.todoapp.data.source.local.ToDoDatabase
@@ -44,16 +45,21 @@ object ServiceLocator {
     }
 
     private fun createTasksRepository(context: Context): TasksRepository {
-        database = Room.databaseBuilder(
+        return DefaultTasksRepository(FakeTasksRemoteDataSource, createTaskLocalDataSource(context))
+    }
+
+    private fun createTaskLocalDataSource(context: Context): TasksDataSource {
+        val database = database ?: createDataBase(context)
+        return TasksLocalDataSource(database.taskDao())
+    }
+
+    private fun createDataBase(context: Context): ToDoDatabase {
+        val result = Room.databaseBuilder(
             context.applicationContext,
             ToDoDatabase::class.java, "Tasks.db"
-        )
-            .build()
-
-        return DefaultTasksRepository(
-            FakeTasksRemoteDataSource,
-            TasksLocalDataSource(database!!.taskDao())
-        )
+        ).build()
+        database = result
+        return result
     }
 
     @VisibleForTesting
@@ -67,6 +73,7 @@ object ServiceLocator {
                 clearAllTables()
                 close()
             }
+            database = null
             tasksRepository = null
         }
     }

app/src/prod/java/com/example/android/architecture/blueprints/todoapp/ServiceLocator.kt

@@ -74,6 +74,7 @@ object ServiceLocator {
                 clearAllTables()
                 close()
             }
+            database = null
             tasksRepository = null
         }
     }