Merge pull request #87 from writeas/fix-crash-on-share-button

Fix crash on share button

Author: AngeloStavrow

CHANGELOG.md

@@ -5,7 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.0.0a1]
+## [Unreleased]
+
+### Fixed
+
+- Fixed a link in the change log; added date to the 1.0.0a1 release.
+
+## [1.0.0a1] - 2020-09-30
 
 ### Added
 
@@ -86,7 +92,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - Contributing guide
     - This changelog
 
-[1.0.0a1]: https://github.com/writeas/writefreely-swiftui-multiplatform/compare/v1.0.0a1...0.1.1
+[Unreleased]: https://github.com/writeas/writefreely-swiftui-multiplatform/compare/v1.0.0a1...HEAD
+[1.0.0a1]: https://github.com/writeas/writefreely-swiftui-multiplatform/compare/v0.1.1...v1.0.0a1
 [0.1.1]: https://github.com/writeas/writefreely-swiftui-multiplatform/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/writeas/writefreely-swiftui-multiplatform/compare/v0.0.2...v0.1.0
 [0.0.2]: https://github.com/writeas/writefreely-swiftui-multiplatform/compare/v0.0.1...v0.0.2

WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>WriteFreely-MultiPlatform (iOS).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 		<key>WriteFreely-MultiPlatform (macOS).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 </dict>

iOS/PostEditor/PostEditorView.swift

@@ -190,9 +190,20 @@ struct PostEditorView: View {
     }
 
     private func sharePost() {
-        guard let urlString = model.selectedPost?.slug != nil ?
-                "\(model.account.server)/\((model.selectedPost?.collectionAlias)!)/\((model.selectedPost?.slug)!)" :
-                "\(model.account.server)/\((model.selectedPost?.postId)!)" else { return }
+        // If the post doesn't have a post ID, it isn't published, and therefore can't be shared, so return early.
+        guard let postId = post.postId else { return }
+
+        var urlString: String
+
+        if let postSlug = post.slug,
+           let postCollectionAlias = post.collectionAlias {
+            // This post is in a collection, so share the URL as server/collectionAlias/postSlug.
+            urlString = "\(model.account.server)/\((postCollectionAlias))/\((postSlug))"
+        } else {
+            // This is a draft post, so share the URL as server/postID
+            urlString = "\(model.account.server)/\((postId))"
+        }
+
         guard let data = URL(string: urlString) else { return }
 
         let activityView = UIActivityViewController(activityItems: [data], applicationActivities: nil)