- Fixes 2 space indents #1747

- Fixes usaved data on preview toggle
- Fixes related to iOS codebase

FSNotes iOS/View/NotesTableView.swift

@@ -385,7 +385,7 @@ class NotesTableView: UITableView,
  let lockUnlockImage = UIImage(systemName: lockUnlockImageName)
  actions.append(UIAction(title: lockUnlockTitle, image: lockUnlockImage, identifier: UIAction.Identifier("lockUnlock"), handler: handler))
 
- if note.isEncrypted() {
+ if note.isEncrypted() && !note.project.isEncrypted {
  let removeEncryptionTitle = NSLocalizedString("Remove Encryption", comment: "")
  let removeEncryptionImage = UIImage(systemName: "lock.slash")
  actions.append(UIAction(title: removeEncryptionTitle, image: removeEncryptionImage, identifier: UIAction.Identifier("removeEncryption"), handler: handler))

FSNotes iOS/ViewController+More.swift

@@ -60,15 +60,15 @@ extension ViewController: UIDocumentPickerDelegate {
  case .Inbox:
  popoverActions = [.importNote, .settingsFolder, .createFolder, .multipleSelection, .openInFiles, .settingsRepository]
  case .All, .Todo:
- popoverActions = [.settingsFolder, .multipleSelection]
+ popoverActions = [.settingsFolder, .createFolder, .multipleSelection]
  case .Trash:
  popoverActions = [.settingsFolder, .multipleSelection, .openInFiles, .emptyBin]
  case .Project:
  popoverActions = [.importNote, .settingsFolder, .createFolder, .removeFolder, .renameFolder, .multipleSelection, .openInFiles, .settingsRepository, .encryptFolder]
  case .Tag:
  popoverActions = [.removeTag, .renameTag, .multipleSelection]
  case .Untagged:
- popoverActions = [.multipleSelection]
+ popoverActions = [.createFolder, .multipleSelection]
  case .ProjectEncryptedLocked:
  popoverActions = [.unLockFolder, .decryptFolder, .settingsFolder, .removeFolder, .renameFolder, .multipleSelection, .openInFiles, .settingsRepository]
  case .ProjectEncryptedUnlocked:
@@ -589,7 +589,11 @@ extension ViewController: UIDocumentPickerDelegate {
  }
 
  private func createFolder(selectedProject: Project?) {
- guard let selectedProject = selectedProject else { return }
+ guard var selectedProject = selectedProject else { return }
+
+ if selectedProject.isVirtual {
+ selectedProject = self.storage.getDefault()!
+ }
 
  let mvc = UIApplication.getVC()
  let alertController = UIAlertController(title: NSLocalizedString("Create folder:", comment: ""), message: nil, preferredStyle: .alert)
@@ -804,8 +808,6 @@ extension ViewController: UIDocumentPickerDelegate {
  private func openInFiles(selectedProject: Project?) {
  guard let selectedProject = selectedProject else { return }
 
- let mvc = UIApplication.getVC()
-
  guard let path = selectedProject.url.path.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlPathAllowed) else { return }
 
  if let projectUrl = URL(string: "shareddocuments://" + path) {
@@ -816,13 +818,11 @@ extension ViewController: UIDocumentPickerDelegate {
  private func openGitSettings(selectedProject: Project?) {
  guard let selectedProject = selectedProject else { return }
 
- let vc = UIApplication.getVC()
- let storage = Storage.shared()
  let projectController = AppDelegate.getGitVC(for: selectedProject)
  let controller = UINavigationController(rootViewController: projectController)
 
  self.dismiss(animated: true, completion: nil)
- vc.present(controller, animated: true, completion: nil)
+ UIApplication.getVC().present(controller, animated: true, completion: nil)
  }
 
  private func emptyBin() {

FSNotes iOS/ViewController.swift

@@ -76,7 +76,7 @@ class ViewController: UIViewController, UISearchBarDelegate, UIGestureRecognizer
 
  // Project for import picker
  public var selectedProject: Project?
- private var initialLoadingState = false
+ public var initialLoadingState = false
 
  override func viewWillAppear(_ animated: Bool) {
  configureSearchController()
@@ -1480,6 +1480,8 @@ class ViewController: UIViewController, UISearchBarDelegate, UIGestureRecognizer
 
  storage = Storage.shared()
  sidebarTableView.reloadSidebar()
+
+ initialLoadingState = false
  viewDidLoad()
  }
 

FSNotes.xcodeproj/project.pbxproj

@@ -4588,7 +4588,7 @@
  CODE_SIGN_IDENTITY = "Apple Development";
  CODE_SIGN_STYLE = Automatic;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 638;
+ CURRENT_PROJECT_VERSION = 639;
  DEVELOPMENT_TEAM = 866P6MTE92;
  EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES;
  ENABLE_HARDENED_RUNTIME = YES;
@@ -4605,7 +4605,7 @@
  "@executable_path/../Frameworks",
  );
  MACOSX_DEPLOYMENT_TARGET = 10.14;
- MARKETING_VERSION = 6.9.2;
+ MARKETING_VERSION = 6.9.3;
  OTHER_SWIFT_FLAGS = "$(inherited)";
  PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes;
  PRODUCT_NAME = FSNotes;
@@ -4628,7 +4628,7 @@
  CODE_SIGN_IDENTITY = "Apple Development";
  CODE_SIGN_STYLE = Automatic;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 638;
+ CURRENT_PROJECT_VERSION = 639;
  DEPLOYMENT_LOCATION = NO;
  DEVELOPMENT_TEAM = 866P6MTE92;
  EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES;
@@ -4646,7 +4646,7 @@
  "@executable_path/../Frameworks",
  );
  MACOSX_DEPLOYMENT_TARGET = 10.14;
- MARKETING_VERSION = 6.9.2;
+ MARKETING_VERSION = 6.9.3;
  ONLY_ACTIVE_ARCH = YES;
  PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes;
  PRODUCT_NAME = FSNotes;

FSNotes/Business/Note.swift

@@ -913,11 +913,12 @@ public class Note: NSObject {
  }
 
  public func save(attributed: NSAttributedString) {
+ let copy = attributed.copy() as? NSAttributedString
  modifiedLocalAt = Date()
 
  let operation = BlockOperation()
  operation.addExecutionBlock({
- if let copy = attributed.copy() as? NSAttributedString {
+ if let copy = copy {
  let mutable = NSMutableAttributedString(attributedString: copy)
  self.save(content: mutable)
 

FSNotes/Business/Storage.swift

@@ -38,7 +38,6 @@ class Storage {
  public var shouldMovePrompt = false
 
  private var trashURL = URL(string: String())
- private var archiveURL = URL(string: String())
 
  private let lastNewsDate = "2023-05-25"
  public var isCrashedLastTime = false

FSNotes/Helpers/FileSystemEventManager.swift

@@ -246,19 +246,20 @@ class FileSystemEventManager {
  return
  }
 
- guard var fsContent = note.getContent() else { return }
-
- // Trying load content from encrypted note with current password
- if note.url.pathExtension == "etp", let password = note.password, note.unLock(password: password) {
- fsContent = note.content
- }
-
  guard let modificationDate = note.getFileModifiedDate(),
  let creationDate = note.getFileCreationDate() else { return }
 
  if modificationDate.isGreaterThan(note.modifiedLocalAt) {
  note.modifiedLocalAt = modificationDate
  note.cacheHash = nil
+
+ guard var fsContent = note.getContent() else { return }
+
+ // Trying load content from encrypted note with current password
+ if note.url.pathExtension == "etp", let password = note.password, note.unLock(password: password) {
+ fsContent = note.content
+ }
+
  note.content = NSMutableAttributedString(attributedString: fsContent)
 
  // tags changes

FSNotes/View/MPreviewView.swift

@@ -79,9 +79,7 @@ class MPreviewView: WKWebView, WKUIDelegate, WKNavigationDelegate {
  if note.container == .encryptedTextPack && !note.isUnlocked() {
  evc.unLock(notes: [note])
  } else if note.content.length == 0 {
- evc.vcEditor?.disablePreviewEditorAndNote()
-
- evc.refillEditArea()
+ evc.disablePreview()
  evc.focusEditArea()
  }
  }
@@ -93,9 +91,7 @@ class MPreviewView: WKWebView, WKUIDelegate, WKNavigationDelegate {
  if event.keyCode == kVK_Return {
  DispatchQueue.main.async {
  if let evc = self.editorVC {
- evc.vcEditor?.disablePreviewEditorAndNote()
-
- evc.refillEditArea()
+ evc.disablePreview()
  evc.focusEditArea()
  }
  }

FSNotes/ViewController.swift

@@ -872,8 +872,6 @@ class ViewController: EditorViewController,
  refillEditArea()
  }
 
-
-
  @IBAction func noteUp(_ sender: NSMenuItem) {
  NSApp.mainWindow?.makeFirstResponder(notesTableView)
 

FSNotesCore/Shared/NSTextStorage++.swift

@@ -76,6 +76,7 @@ extension NSTextStorage {
  value.count > 1,
 
  value.starts(with: " ")
+ || value.starts(with: " ")
  || value.starts(with: "\t")
  || value.starts(with: "* ")
  || value.starts(with: "- ")