fixed copilot suggestions

Author: isiahpwilliams

app/src/main/java/com/cornellappdev/uplift/data/repositories/DatastoreRepository.kt

@@ -28,8 +28,6 @@ object PreferencesKeys {
     val GOAL = intPreferencesKey("workoutGoal")
     val SKIP = booleanPreferencesKey("skip")
     val FCM_TOKEN = stringPreferencesKey("fcmToken")
-    val ACCESS_TOKEN = stringPreferencesKey("accessToken")
-    val REFRESH_TOKEN = stringPreferencesKey("refreshToken")
     val DECLINED_NOTIFICATION_PERMISSION =
         booleanPreferencesKey("declinedNotificationPermission")
     val CAPACITY_REMINDERS_ID = intPreferencesKey("capacityRemindersId")

app/src/main/java/com/cornellappdev/uplift/data/repositories/TokenManager.kt

@@ -15,13 +15,22 @@ class TokenManager @Inject constructor(@ApplicationContext private val context:
     private val fileName = "encrypted_tokens"
 
     // Initialize EncryptedSharedPreferences
-    private val sharedPreferences: SharedPreferences by lazy {
+    private val sharedPreferences: SharedPreferences? by lazy {
         try {
             createEncryptedPrefs()
         } catch (e: Exception) {
             Log.e("TokenManager", "Failed to initialize EncryptedSharedPreferences", e)
+            // Clear corrupted state
             context.deleteSharedPreferences(fileName)
-            context.getSharedPreferences(fileName, Context.MODE_PRIVATE)
+            try {
+                // Could have failed due to previous corrupted state
+                // One more attempt after cleaning the corruption
+                createEncryptedPrefs()
+            } catch (retryException: Exception) {
+                // Probably broken return null
+                Log.e("TokenManager", "Failed to initialize EncryptedSharedPreferences again", retryException)
+                null
+            }
         }
     }
 
@@ -40,18 +49,17 @@ class TokenManager @Inject constructor(@ApplicationContext private val context:
     }
 
     fun saveTokens(accessToken: String, refreshToken: String) {
-        sharedPreferences.edit().apply {
+        sharedPreferences?.edit {
             putString("access_token", accessToken)
             putString("refresh_token", refreshToken)
-            apply()
         }
     }
 
-    fun getAccessToken(): String? = sharedPreferences.getString("access_token", null)
+    fun getAccessToken(): String? = sharedPreferences?.getString("access_token", null)
 
-    fun getRefreshToken(): String? = sharedPreferences.getString("refresh_token", null)
+    fun getRefreshToken(): String? = sharedPreferences?.getString("refresh_token", null)
 
     fun clearTokens() {
-        sharedPreferences.edit { clear() }
+        sharedPreferences?.edit { clear() }
     }
 }

app/src/main/java/com/cornellappdev/uplift/data/repositories/UserInfoRepository.kt

@@ -8,7 +8,6 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.Preferences
 import com.apollographql.apollo.ApolloClient
 import com.cornellappdev.uplift.CreateUserMutation
-import com.cornellappdev.uplift.DeleteUserMutation
 import com.cornellappdev.uplift.GetUserByNetIdQuery
 import com.cornellappdev.uplift.LoginUserMutation
 import com.cornellappdev.uplift.SetWorkoutGoalsMutation
@@ -65,7 +64,7 @@ class UserInfoRepository @Inject constructor(
             else {
                 Log.d("UserInfoRepository", "Skipping goal upload")
             }
-            storeUserFields(id, name, netId, email, skip, accessToken, refreshToken, goal)
+            storeUserFields(id, name, netId, email, skip, goal)
             Log.d("UserInfoRepositoryImpl", "User created successfully")
             return true
         } catch (e: Exception) {
@@ -95,15 +94,13 @@ class UserInfoRepository @Inject constructor(
     }
 
 
-    suspend fun storeUserFields(id: String, username: String, netId: String, email: String, skip: Boolean, accessToken: String, refreshToken: String, goal: Int) {
+    suspend fun storeUserFields(id: String, username: String, netId: String, email: String, skip: Boolean, goal: Int) {
         dataStore.edit { preferences ->
             preferences[PreferencesKeys.ID] = id
             preferences[PreferencesKeys.NETID] = netId
             preferences[PreferencesKeys.USERNAME] = username
             preferences[PreferencesKeys.EMAIL] = email
             preferences[PreferencesKeys.SKIP] = skip
-            preferences[PreferencesKeys.ACCESS_TOKEN] = accessToken
-            preferences[PreferencesKeys.REFRESH_TOKEN] = refreshToken
             if (!skip) {
                 preferences[PreferencesKeys.GOAL] = goal
             }
@@ -187,18 +184,6 @@ class UserInfoRepository @Inject constructor(
         }
     }
 
-    private suspend fun storeAccessToken(accessToken: String) {
-        dataStore.edit { preferences ->
-            preferences[PreferencesKeys.ACCESS_TOKEN] = accessToken
-        }
-    }
-
-    private suspend fun storeRefreshToken(refreshToken: String) {
-        dataStore.edit { preferences ->
-            preferences[PreferencesKeys.REFRESH_TOKEN] = refreshToken
-        }
-    }
-
 
     suspend fun getSkipFromDataStore(): Boolean {
         return dataStore.data.map { preferences ->

app/src/main/java/com/cornellappdev/uplift/ui/screens/reminders/WorkoutReminderScreen.kt

@@ -24,13 +24,11 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.cornellappdev.uplift.ui.components.general.UpliftTopBarWithBack
 import com.cornellappdev.uplift.ui.components.goalsetting.DeleteDialog
 import com.cornellappdev.uplift.ui.components.goalsetting.GoalSlider
 import com.cornellappdev.uplift.ui.components.goalsetting.WorkoutReminders
 import com.cornellappdev.uplift.ui.components.general.UpliftButton
-import com.cornellappdev.uplift.ui.viewmodels.onboarding.ProfileCreationViewModel
 import com.cornellappdev.uplift.ui.viewmodels.profile.SettingsViewModel
 import com.cornellappdev.uplift.util.GRAY04
 import com.cornellappdev.uplift.util.montserratFamily
@@ -63,6 +61,7 @@ fun WorkoutReminderSettingsScreen(
 
 /**
  * @param reminders: list of reminders
+ * @param goalValue: the value of the goal slider
  * @param onRemindersChange: callback for when reminders are changed
  * @param onGoalValueChange: callback for when the goal slider value is changed
  * @param onBackClick: callback for when the back button is clicked

app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/onboarding/ProfileCreationViewModel.kt

@@ -24,17 +24,14 @@ data class ProfileCreationUiState(
 class ProfileCreationViewModel @Inject constructor(
     private val userInfoRepository: UserInfoRepository,
     private val rootNavigationRepository: RootNavigationRepository,
-) : UpliftViewModel<ProfileCreationUiState>(ProfileCreationUiState()) {
-
-    init {
-        viewModelScope.launch {
-            val user = userInfoRepository.getFirebaseUser()
-            val name = user?.displayName ?: ""
-            applyMutation {
-                copy(user = user, name = name)
-            }
-        }
+) : UpliftViewModel<ProfileCreationUiState>(
+    userInfoRepository.getFirebaseUser().let { user ->
+        ProfileCreationUiState(
+            user = user,
+            name = user?.displayName ?: ""
+        )
     }
+) {
 
     private fun createUser() = viewModelScope.launch {
         val state = getStateValue()