Merge pull request #216 from Automattic/fix/folder-sync-issue

Fix/folder sync issue

Author: mchowning

RELEASE-NOTES.md

@@ -1,5 +1,11 @@
 # Release notes
 
+### 7.20.3
+
+*   Bug Fixes:
+    *   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:    

dependencies.gradle

@@ -26,7 +26,7 @@ project.ext {
     applicationId = 'au.com.shiftyjelly.pocketcasts'
 
     versionCode = getVersionCode()
-    versionName = '7.20.2' + getVersionNameSuffix()
+    versionName = '7.20.3' + getVersionNameSuffix()
 
     // Android
     minSdkVersion = 23

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
         )