Merge pull request contentful#64 from contentful/develop

0.4.1

Author: loudmouth

.env

@@ -1 +1 @@
-CONTENTFUL_SDK_VERSION=0.4.0
+CONTENTFUL_SDK_VERSION=0.4.1

.envrc

@@ -1 +1 @@
-export CONTENFUL_SDK_VERSION=0.4.0
+export CONTENFUL_SDK_VERSION=0.4.1

CHANGELOG.md

@@ -14,11 +14,19 @@ This project adheres to [Semantic Versioning](http://semver.org/) starting from
 ## Table of contents
 
 #### 0.x Releases
-- `0.4.x` Releases - [0.4.0](#040)
+- `0.4.x` Releases - [0.4.0](#040) | [0.4.1](#041)
 - `0.3.x` Releases - [0.3.0](#030) | [0.3.1](#031)
 
 ---
 
+## [`0.4.1`](https://github.com/contentful/contentful.swift/releases/tag/0.4.1)
+Released on 2017-05-23.
+
+#### Fixed
+- Potential crash during sync callback due to unretained `SyncSpace` instance
+
+---
+
 ## [`0.4.0`](https://github.com/contentful/contentful.swift/releases/tag/0.4.0)
 Released on 2017-05-18.
 

Config.xcconfig

@@ -1 +1 @@
-CONTENTFUL_SDK_VERSION=0.4.0
+CONTENTFUL_SDK_VERSION=0.4.1

Sources/SyncSpace.swift

@@ -103,35 +103,37 @@ public final class SyncSpace: ImmutableMappable {
         }
 
         // Callback to merge the most recent sync page with the current sync space.
-        let syncCompletion: (Result<SyncSpace>) -> Void = { [unowned self] result in
+        let syncCompletion: (Result<SyncSpace>) -> Void = { [weak self] result in
+
+            guard let strongSelf = self else { return }
 
             switch result {
             case .success(let syncSpace):
 
                 for asset in syncSpace.assets {
-                    self.delegate?.create(asset: asset)
-                    self.assetsMap[asset.sys.id] = asset
+                    strongSelf.delegate?.create(asset: asset)
+                    strongSelf.assetsMap[asset.sys.id] = asset
                 }
 
                 for entry in syncSpace.entries {
-                    entry.resolveLinks(against: self.entries + syncSpace.entries, and: self.assets)
-                    self.delegate?.create(entry: entry)
-                    self.entriesMap[entry.sys.id] = entry
+                    entry.resolveLinks(against: strongSelf.entries + syncSpace.entries, and: strongSelf.assets)
+                    strongSelf.delegate?.create(entry: entry)
+                    strongSelf.entriesMap[entry.sys.id] = entry
                 }
 
                 for deletedAssetId in syncSpace.deletedAssets {
-                    self.delegate?.delete(assetWithId: deletedAssetId)
-                    self.assetsMap.removeValue(forKey: deletedAssetId)
+                    strongSelf.delegate?.delete(assetWithId: deletedAssetId)
+                    strongSelf.assetsMap.removeValue(forKey: deletedAssetId)
                 }
 
                 for deletedEntryId in syncSpace.deletedEntries {
-                    self.delegate?.delete(entryWithId: deletedEntryId)
-                    self.entriesMap.removeValue(forKey: deletedEntryId)
+                    strongSelf.delegate?.delete(entryWithId: deletedEntryId)
+                    strongSelf.entriesMap.removeValue(forKey: deletedEntryId)
                 }
 
-                self.syncToken = syncSpace.syncToken
+                strongSelf.syncToken = syncSpace.syncToken
 
-                completion(.success(self))
+                completion(.success(strongSelf))
             case .error(let error):
                 completion(.error(error))
             }