From 91d350019f2cd94de29694434d06beb02f504cec Mon Sep 17 00:00:00 2001
From: ashiagr <agr.ash@gmail.com>
Date: Fri, 5 Aug 2022 17:57:36 +0530
Subject: [PATCH 1/2] Fix folder mapping

---
 .../pocketcasts/servers/sync/FolderResponse.kt            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/servers/src/main/java/au/com/shiftyjelly/pocketcasts/servers/sync/FolderResponse.kt b/modules/services/servers/src/main/java/au/com/shiftyjelly/pocketcasts/servers/sync/FolderResponse.kt
index 0da756a4dd6..6efe2833bf2 100644
--- a/modules/services/servers/src/main/java/au/com/shiftyjelly/pocketcasts/servers/sync/FolderResponse.kt
+++ b/modules/services/servers/src/main/java/au/com/shiftyjelly/pocketcasts/servers/sync/FolderResponse.kt
@@ -16,16 +16,16 @@ data class FolderResponse(
     @field:Json(name = "dateAdded") val dateAdded: Date?
 ) {
     fun toFolder(): Folder? {
-        if (folderUuid == null || name == null || color == null || sortPosition == null || podcastsSortType == null || dateAdded == null) {
+        if (folderUuid == null || name == null || dateAdded == null) {
             return null
         }
         return Folder(
             uuid = folderUuid,
             name = name,
-            color = color,
+            color = color ?: 0,
             addedDate = dateAdded,
-            sortPosition = sortPosition,
-            podcastsSortType = podcastsSortType,
+            sortPosition = sortPosition ?: 0,
+            podcastsSortType = PodcastsSortType.fromServerId(podcastsSortType?.serverId),
             deleted = false,
             syncModified = 0
         )

From c4f5d1a958104f91df6b322cee8b576703bb1b81 Mon Sep 17 00:00:00 2001
From: ashiagr <agr.ash@gmail.com>
Date: Mon, 8 Aug 2022 12:17:20 +0530
Subject: [PATCH 2/2] Add release note

---
 RELEASE-NOTES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 2508b9ac6ac..9df2cb5ff0f 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -5,7 +5,8 @@
 *   Bug Fixes:    
     *   Fix the mini player's play icon showing the wrong icon.
         ([#208](https://github.com/Automattic/pocket-casts-android/pull/208)).
-
+    *   Fixes folder mapping at the time of folders full sync.
+        ([#214](https://github.com/Automattic/pocket-casts-android/pull/214)).
 ### 7.20.2
 
 *   Bug Fixes: