From 91ac953f865df53bb0be419c8c8a70505acb84e7 Mon Sep 17 00:00:00 2001
From: aniruddha dhamal <ani123.dhamal@gmail.com>
Date: Sat, 29 May 2021 12:05:39 -0700
Subject: [PATCH] Updating sorting logic in UserPreferencesRepository

Fixes https://github.com/googlecodelabs/android-datastore/issues/31
---
 .../android/datastore/data/UserPreferencesRepository.kt       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/com/codelab/android/datastore/data/UserPreferencesRepository.kt b/app/src/main/java/com/codelab/android/datastore/data/UserPreferencesRepository.kt
index 85911dc..5c6dfa9 100644
--- a/app/src/main/java/com/codelab/android/datastore/data/UserPreferencesRepository.kt
+++ b/app/src/main/java/com/codelab/android/datastore/data/UserPreferencesRepository.kt
@@ -91,6 +91,8 @@ class UserPreferencesRepository(private val dataStore: DataStore<Preferences>) {
                 if (enable) {
                     if (currentOrder == SortOrder.BY_PRIORITY) {
                         SortOrder.BY_DEADLINE_AND_PRIORITY
+                    } else if (currentOrder == SortOrder.BY_DEADLINE_AND_PRIORITY) {
+                        return@edit
                     } else {
                         SortOrder.BY_DEADLINE
                     }
@@ -121,6 +123,8 @@ class UserPreferencesRepository(private val dataStore: DataStore<Preferences>) {
                 if (enable) {
                     if (currentOrder == SortOrder.BY_DEADLINE) {
                         SortOrder.BY_DEADLINE_AND_PRIORITY
+                    } else if (currentOrder == SortOrder.BY_DEADLINE_AND_PRIORITY) {
+                        return@edit
                     } else {
                         SortOrder.BY_PRIORITY
                     }