Merge pull request #58 from nodes-ios/fix/html-string-characterEncoding

Added an option for html string attributes string to fix encoding issues
ml-archive · Sep 11, 2018 · e41d930 · e41d930
2 parents 92f06f4 + 30d193e
commit e41d930
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/Codemine.xcodeproj/project.pbxproj b/Codemine.xcodeproj/project.pbxproj
@@ -1032,7 +1032,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -1052,7 +1052,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/Codemine.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Codemine.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Codemine/Extensions/String+HTML.swift b/Codemine/Extensions/String+HTML.swift
@@ -13,7 +13,9 @@ public func stringFromHtml(string: String) -> NSAttributedString? {
         let data = string.data(using: String.Encoding.utf8, allowLossyConversion: true)
         if let d = data {
             let str = try NSAttributedString(data: d,
-                                             options: [NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType],
+                                             options: [
+                                                NSAttributedString.DocumentReadingOptionKey.documentType: NSAttributedString.DocumentType.html,
+                                                NSAttributedString.DocumentReadingOptionKey.characterEncoding: String.Encoding.utf8.rawValue],
                                              documentAttributes: nil)
             return str
         }