Merge pull request #4 from nick1ee/codereview

confirmed
nick1ee · Aug 4, 2017 · 38f4327 · 38f4327
2 parents 9d49eff + 3ad111d
commit 38f4327
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Journal/Controller/JournalViewController.swift b/Journal/Controller/JournalViewController.swift
@@ -73,7 +73,7 @@ class JournalViewController: UIViewController {
 
         if self.receivedJournal != nil {
 
-            guard let data = receivedJournal?.imageData as? Data else { return }
+            guard let data = receivedJournal?.imageData else { return }
 
             uploadImageView.image = UIImage(data: data)
 

diff --git a/Journal/Extension/Extensions.swift b/Journal/Extension/Extensions.swift
@@ -110,14 +110,14 @@ extension JournalViewController {
             inputContent.text != "" {
 
             guard
-                let imageData = UIImagePNGRepresentation(uploadImageView.image!) as? NSData,
+                let data = UIImageJPEGRepresentation(uploadImageView.image!, 1),
                 let title = inputTitle.text,
                 let content = inputContent.text else { return }
 
             let timeToInteger = Int(Date().timeIntervalSince1970 * 1000.0)
             let timestamp = String(timeToInteger)
 
-            let journal = Journal.init(imageData: imageData, title: title, content: content, timeStamp: timestamp)
+            let journal = Journal.init(imageData: data, title: title, content: content, timeStamp: timestamp)
 
             CoreDataProvider().saveJournal(withJournal: journal)
 

diff --git a/Journal/Structure/Journal.swift b/Journal/Structure/Journal.swift
@@ -10,7 +10,7 @@ import Foundation
 
 struct Journal {
 
-    var imageData: NSData
+    var imageData: Data
 
     var title: String
 
@@ -48,13 +48,13 @@ extension Journal {
 
         }
 
-        guard let imageData = journal.imageData else {
+        guard let data = journal.imageData else {
 
             throw FetchJournalError.missingImageData
 
         }
 
-        self.imageData = imageData
+        self.imageData = data as Data
 
         guard let title = journal.title else {