From fd37a163b9ac3ec4f710e7847b81a7fb83112d3d Mon Sep 17 00:00:00 2001
From: Angelo Stavrow <contact@angelostavrow.com>
Date: Tue, 31 May 2022 07:36:43 -0400
Subject: [PATCH] Revert "Add error handling to Mac app"

This reverts commit b1a8b8b29c7a745ea9733ed0d7266c775b534b47.
---
 Shared/WriteFreely_MultiPlatformApp.swift |  1 -
 macOS/PostEditor/PostEditorView.swift     | 11 -----------
 macOS/Settings/MacAccountView.swift       | 15 ++-------------
 macOS/Settings/MacPreferencesView.swift   | 13 -------------
 macOS/Settings/MacUpdatesView.swift       | 13 -------------
 5 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/Shared/WriteFreely_MultiPlatformApp.swift b/Shared/WriteFreely_MultiPlatformApp.swift
index d17c965..76ff61b 100644
--- a/Shared/WriteFreely_MultiPlatformApp.swift
+++ b/Shared/WriteFreely_MultiPlatformApp.swift
@@ -115,7 +115,6 @@ struct WriteFreely_MultiPlatformApp: App {
                     }
                     .tag(2)
             }
-            .withErrorHandling()
             .frame(minWidth: 500, maxWidth: 500, minHeight: 200)
             .padding()
 //            .preferredColorScheme(preferences.selectedColorScheme)    // See PreferencesModel for info.
diff --git a/macOS/PostEditor/PostEditorView.swift b/macOS/PostEditor/PostEditorView.swift
index b76e921..56bedc9 100644
--- a/macOS/PostEditor/PostEditorView.swift
+++ b/macOS/PostEditor/PostEditorView.swift
@@ -2,7 +2,6 @@ import SwiftUI
 
 struct PostEditorView: View {
     @EnvironmentObject var model: WriteFreelyModel
-    @EnvironmentObject var errorHandling: ErrorHandling
 
     @ObservedObject var post: WFAPost
     @State private var isHovering: Bool = false
@@ -39,16 +38,6 @@ struct PostEditorView: View {
                 LocalStorageManager.standard.saveContext()
             }
         })
-        .onChange(of: model.hasError) { value in
-            if value {
-                if let error = model.currentError {
-                    self.errorHandling.handle(error: error)
-                } else {
-                    self.errorHandling.handle(error: AppError.genericError())
-                }
-                model.hasError = false
-            }
-        }
         .onDisappear(perform: {
             DispatchQueue.main.async {
                 model.editor.clearLastDraft()
diff --git a/macOS/Settings/MacAccountView.swift b/macOS/Settings/MacAccountView.swift
index 9939e99..f0d4c30 100644
--- a/macOS/Settings/MacAccountView.swift
+++ b/macOS/Settings/MacAccountView.swift
@@ -2,22 +2,11 @@ import SwiftUI
 
 struct MacAccountView: View {
     @EnvironmentObject var model: WriteFreelyModel
-    @EnvironmentObject var errorHandling: ErrorHandling
 
     var body: some View {
-        Form {
-            AccountView()
-        }
-        .onChange(of: model.hasError) { value in
-            if value {
-                if let error = model.currentError {
-                    self.errorHandling.handle(error: error)
-                } else {
-                    self.errorHandling.handle(error: AppError.genericError())
-                }
-                model.hasError = false
+            Form {
+                    AccountView()
             }
-        }
     }
 }
 
diff --git a/macOS/Settings/MacPreferencesView.swift b/macOS/Settings/MacPreferencesView.swift
index feb91e5..85fa829 100644
--- a/macOS/Settings/MacPreferencesView.swift
+++ b/macOS/Settings/MacPreferencesView.swift
@@ -1,9 +1,6 @@
 import SwiftUI
 
 struct MacPreferencesView: View {
-    @EnvironmentObject var model: WriteFreelyModel
-    @EnvironmentObject var errorHandling: ErrorHandling
-
     @ObservedObject var preferences: PreferencesModel
 
     var body: some View {
@@ -11,16 +8,6 @@ struct MacPreferencesView: View {
             PreferencesView(preferences: preferences)
             Spacer()
         }
-        .onChange(of: model.hasError) { value in
-            if value {
-                if let error = model.currentError {
-                    self.errorHandling.handle(error: error)
-                } else {
-                    self.errorHandling.handle(error: AppError.genericError())
-                }
-                model.hasError = false
-            }
-        }
     }
 }
 
diff --git a/macOS/Settings/MacUpdatesView.swift b/macOS/Settings/MacUpdatesView.swift
index ba9f6a3..afb6c48 100644
--- a/macOS/Settings/MacUpdatesView.swift
+++ b/macOS/Settings/MacUpdatesView.swift
@@ -2,9 +2,6 @@ import SwiftUI
 import Sparkle
 
 struct MacUpdatesView: View {
-    @EnvironmentObject var model: WriteFreelyModel
-    @EnvironmentObject var errorHandling: ErrorHandling
-
     @ObservedObject var updaterViewModel: MacUpdatesViewModel
 
     @AppStorage(WFDefaults.automaticallyChecksForUpdates, store: UserDefaults.shared)
@@ -84,16 +81,6 @@ that can cause crashes and data loss.
         .onChange(of: subscribeToBetaUpdates) { _ in
             updaterViewModel.toggleAllowedChannels()
         }
-        .onChange(of: model.hasError) { value in
-            if value {
-                if let error = model.currentError {
-                    self.errorHandling.handle(error: error)
-                } else {
-                    self.errorHandling.handle(error: AppError.genericError())
-                }
-                model.hasError = false
-            }
-        }
     }
 }