Make changes to ProtoDataStore:

1) use context.createDataStore factory
2) Fix bug where unspecified value is not handled
3) Update SharedPreferencesMigration to use the updated Constructor

Author: rohitsat13

app/src/main/java/com/codelab/android/datastore/data/UserPreferencesRepository.kt

@@ -19,41 +19,19 @@ package com.codelab.android.datastore.data
 import android.content.Context
 import android.util.Log
 import androidx.datastore.DataStore
-import androidx.datastore.DataStoreFactory
-import androidx.datastore.migrations.MigrationFromSharedPreferences
+import androidx.datastore.createDataStore
 import androidx.datastore.migrations.SharedPreferencesMigration
 import androidx.datastore.migrations.SharedPreferencesView
 import com.codelab.android.datastore.UserPreferences
 import com.codelab.android.datastore.UserPreferences.SortOrder
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
-import java.io.File
 import java.io.IOException
 
 private const val USER_PREFERENCES_NAME = "user_preferences"
 private const val DATA_STORE_FILE_NAME = "user_prefs.pb"
 private const val SORT_ORDER_KEY = "sort_order"
 
-// Define the mapping from SharedPreferences to UserPreferences
-private class UserPreferencesMigration : MigrationFromSharedPreferences<UserPreferences> {
-    override suspend fun migrate(
-        prefs: SharedPreferencesView,
-        currentData: UserPreferences
-    ): UserPreferences {
-        return if (currentData.sortOrder == SortOrder.UNSPECIFIED) {
-            currentData.toBuilder()
-                .setSortOrder(
-                    SortOrder.valueOf(
-                        prefs.getString(SORT_ORDER_KEY, SortOrder.NONE.name) ?: SortOrder.NONE.name
-                    )
-                )
-                .build()
-        } else {
-            currentData
-        }
-    }
-}
-
 /**
  * Class that handles saving and retrieving user preferences
  */
@@ -62,15 +40,26 @@ class UserPreferencesRepository private constructor(context: Context) {
     private val TAG: String = "UserPreferencesRepo"
 
     // Build the DataStore
-    private val userPreferencesStore: DataStore<UserPreferences> = DataStoreFactory().create(
-        produceFile = { File(context.filesDir, DATA_STORE_FILE_NAME) },
+    private val userPreferencesStore: DataStore<UserPreferences> = context.createDataStore(
+        fileName = DATA_STORE_FILE_NAME,
         serializer = UserPreferencesSerializer,
-        migrationProducers = listOf(
+        migrations = listOf(
             SharedPreferencesMigration(
                 context,
-                USER_PREFERENCES_NAME,
-                UserPreferencesMigration()
-            )
+                USER_PREFERENCES_NAME
+            ) { sharedPrefs: SharedPreferencesView, currentData: UserPreferences ->
+                // Define the mapping from SharedPreferences to UserPreferences
+                if (currentData.sortOrder == SortOrder.UNSPECIFIED) {
+                    currentData.toBuilder()
+                        .setSortOrder(
+                            SortOrder.valueOf(
+                                sharedPrefs.getString(SORT_ORDER_KEY, SortOrder.NONE.name)!!
+                            )
+                        ).build()
+                } else {
+                    currentData
+                }
+            }
         )
     )
 

app/src/main/java/com/codelab/android/datastore/ui/TasksViewModel.kt

@@ -72,6 +72,7 @@ class TasksViewModel(
         }
         // sort the tasks
         return when (sortOrder) {
+            SortOrder.UNSPECIFIED -> filteredTasks // Treat unspecified order as NONE
             SortOrder.NONE -> filteredTasks
             SortOrder.BY_DEADLINE -> filteredTasks.sortedByDescending { it.deadline }
             SortOrder.BY_PRIORITY -> filteredTasks.sortedBy { it.priority }