use latest core, including "robust editing"

Author: Thomas Taschauer

OpenDocument.core

@@ -17,7 +17,7 @@
 @property NSNumber *errorCode;
 
 - (bool)translate:(NSString *)inputPath into:(NSString *)outputPath at:(NSNumber *)page with:(NSString *)password editable:(bool)editable;
-- (bool)backTranslate:(NSString *)inputPath into:(NSString *)outputPath;
+- (bool)backTranslate:(NSString *)diff into:(NSString *)outputPath;
 @end
 
 #endif /* CoreWrapper_h */

OpenDocumentReader/CoreWrapper.h

@@ -78,12 +78,12 @@ - (bool)translate:(NSString *)inputPath into:(NSString *)outputPath at:(NSNumber
     }
 }
 
-- (bool)backTranslate:(NSString *)inputPath into:(NSString *)outputPath {
+- (bool)backTranslate:(NSString *)diff into:(NSString *)outputPath {
     @synchronized(self) {
         try {
             _errorCode = 0;
 
-            bool translated = translator.backTranslate([inputPath cStringUsingEncoding:NSUTF8StringEncoding], [outputPath cStringUsingEncoding:NSUTF8StringEncoding]);
+            bool translated = translator.backTranslate([diff cStringUsingEncoding:NSUTF8StringEncoding], [outputPath cStringUsingEncoding:NSUTF8StringEncoding]);
             if (!translated) {
                 _errorCode = @(-4);
                 return false;

OpenDocumentReader/CoreWrapper.mm

@@ -48,7 +48,6 @@ class Document: UIDocument {
     public var edit = false {
         didSet {
             parse()
-            updateChangeCount(.done)
         }
     }
 
@@ -117,32 +116,25 @@ class Document: UIDocument {
         delegate?.documentLoadingCompleted(self)
     }
 
-    override func contents(forType typeName: String) throws -> Any {
-        saveGroup.enter()
-        
-        var tempPath = URL(fileURLWithPath: NSTemporaryDirectory())
-        tempPath.appendPathComponent("tempSave.html")
+    override func writeContents(_ contents: Any, to url: URL, for saveOperation: UIDocument.SaveOperation, originalContentsURL: URL?) throws {
+        var diff = ""
 
-        webview?.evaluateJavaScript("document.documentElement.outerHTML", completionHandler: { (value: Any!, error: Error!) -> Void in
-            if error != nil {
-                Crashlytics.sharedInstance().recordError(error)
-                Crashlytics.sharedInstance().throwException()
+        DispatchQueue.main.sync {
+            self.saveGroup.enter()
 
-                return
-            }
-            
-            let content = value as? String
-            let data = content?.data(using: .utf8)
-            try? data?.write(to: tempPath, options: .atomic)
-            
-            self.saveGroup.leave()
-        })
+            webview?.evaluateJavaScript("generateDiff()", completionHandler: { (value: Any!, error: Error!) -> Void in
+                if error != nil {
+                    Crashlytics.sharedInstance().recordError(error)
+                    Crashlytics.sharedInstance().throwException()
 
-        return tempPath as Any
-    }
-    
-    override func writeContents(_ contents: Any, to url: URL, for saveOperation: UIDocument.SaveOperation, originalContentsURL: URL?) throws {
-        let tempPath = contents as! URL
+                    return
+                }
+                
+                diff = (value as? String)!
+
+                self.saveGroup.leave()
+            })
+        }
 
         let waitResult = saveGroup.wait(timeout: .now() + 30)
         if (waitResult != DispatchTimeoutResult.success) {
@@ -152,7 +144,7 @@ class Document: UIDocument {
         // running on main-thread to make sure CoreWrapper is always called from the same thread
         // TODO: run on background thread instead?
         DispatchQueue.main.sync {
-            coreWrapper.backTranslate(tempPath.path, into: url.path)
+            coreWrapper.backTranslate(diff, into: url.path)
         }
 
         let errorCode = coreWrapper.errorCode != nil ? coreWrapper.errorCode.intValue : 0

OpenDocumentReader/Document.swift

@@ -114,7 +114,7 @@ class DocumentViewController: UIViewController, DocumentDelegate {
             return
         }
 
-        if doc.hasUnsavedChanges {
+        if doc.edit {
             let alert = UIAlertController(title: "You have unsaved changes", message: "Save them now?", preferredStyle: .alert)
             alert.addAction(UIAlertAction(title: "No", style: .destructive, handler: { (_) in
                 Analytics.logEvent("alert_unsaved_changes_no", parameters: nil)
@@ -125,7 +125,8 @@ class DocumentViewController: UIViewController, DocumentDelegate {
             alert.addAction(UIAlertAction(title: "Yes", style: .default, handler: { (_) in
                 Analytics.logEvent("alert_unsaved_changes_yes", parameters: nil)
 
-                self.closeCurrentDocument() //doc.close calls autosave
+                self.saveContent()
+                self.closeCurrentDocument()
             }))
 
             self.present(alert, animated: true, completion: nil)
@@ -143,15 +144,8 @@ class DocumentViewController: UIViewController, DocumentDelegate {
             return
         }
 
-        doc.close { (success) in
-            if (!success) {
-                self.showToast(controller: self, message: "Error while saving", seconds: 1.5, color: .red) {
-                    self.dismiss(animated: true, completion: nil)
-                }
-            } else {
-                self.dismiss(animated: true, completion: nil)
-            }
-        }
+        doc.close()
+        self.dismiss(animated: true, completion: nil)
     }
 
     @IBAction func showMenu(_ sender: Any) {
@@ -163,7 +157,7 @@ class DocumentViewController: UIViewController, DocumentDelegate {
             }))
         }
 
-        if document?.hasUnsavedChanges ?? false {
+        if document?.edit ?? false {
             alert.addAction(UIAlertAction(title: "Save", style: .default, handler: { (_) in
                 self.saveContent()
             }))
@@ -210,14 +204,17 @@ class DocumentViewController: UIViewController, DocumentDelegate {
         }
 
         doc.save(to: doc.fileURL, for: .forOverwriting) { success in
+            let message: String
+            let color: UIColor
             if success {
-                self.showToast(controller: self, message: "Successfully saved", seconds: 1.5, color: .green)
-                
-                // makes sure UI stays in edit-mode
-                self.document?.updateChangeCount(.done)
+                message = "Successfully saved"
+                color = .green
             } else {
-                self.showToast(controller: self, message: "Error while saving", seconds: 1.5, color: .red)
+                message = "Error while saving"
+                color = .red
             }
+            
+            self.showToast(controller: self, message: message, seconds: 1.5, color: color)
         }
     }