fix(encrypt): improved error handling

rownd · Aug 25, 2022 · c842143 · c842143
1 parent 1b93af4
commit c842143
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/Sources/Rownd/Views/KeyTransfer/KeyScanner.swift b/Sources/Rownd/Views/KeyTransfer/KeyScanner.swift
@@ -11,6 +11,7 @@ import CodeScanner
 
 struct KeyScannerView: View {
     var receiveKeyTransfer: (_ url: String) -> Void
+    var parentViewController: UIViewController
     @State private var isPresentingScanner = true
     @State private var scannedCode: String?
     @State private var isTransferringKey = false
@@ -60,7 +61,10 @@ struct KeyScannerView: View {
                     Spacer()
                 }
 
-                NavigationLink(destination: KeyTransferProgress(isShowingProgressView: $isTransferringKey), isActive: $isTransferringKey) { EmptyView() }
+                NavigationLink(destination: KeyTransferProgress(
+                    parentViewController: parentViewController,
+                    isShowingProgressView: $isTransferringKey
+                ), isActive: $isTransferringKey) { EmptyView() }
 
             }
             .padding(.horizontal)

diff --git a/Sources/Rownd/Views/KeyTransfer/KeyTransferProgress.swift b/Sources/Rownd/Views/KeyTransfer/KeyTransferProgress.swift
@@ -11,6 +11,7 @@ import SwiftUI
 struct KeyTransferProgress: View {
     @Environment(\.presentationMode) var presentationMode
     @EnvironmentObject var keyState: KeyTransferViewState
+    var parentViewController: UIViewController
 
     @Binding var isShowingProgressView: Bool
 
@@ -94,6 +95,14 @@ struct KeyTransferProgress: View {
                                 .frame(minWidth: 0, maxWidth: .infinity)
                             Spacer()
                         }
+
+                        Button(action: {
+                            parentViewController.dismiss(animated: true)
+                        }, label: {
+                            Text("Finish")
+                                .frame(minWidth: 0, maxWidth: .infinity)
+                        })
+                        .modifier(RowndButton())
                     }.frame(maxHeight: .infinity)
                 }
             }

diff --git a/Sources/Rownd/Views/KeyTransfer/KeyTransferView.swift b/Sources/Rownd/Views/KeyTransfer/KeyTransferView.swift
@@ -13,7 +13,7 @@ struct KeyTransferView : View {
 
     @Environment(\.presentationMode) var presentationMode
 
-    var parentViewController: UIViewController?
+    var parentViewController: UIViewController
     var setupKeyTransfer: () -> Void
     var receiveKeyTransfer: (_ url: String) -> Void
 
@@ -38,7 +38,7 @@ struct KeyTransferView : View {
                             Button(action: {
                                 self.setupKeyTransfer()
                                 activeNavSelection = "key-code"
-                                parentViewController?.bottomSheetController?.grow(toMaximumHeight: true)
+                                parentViewController.bottomSheetController?.grow(toMaximumHeight: true)
                             }, label: {
                                 Text("Show encrpytion key")
                                     .frame(minWidth: 0, maxWidth: .infinity)
@@ -53,12 +53,12 @@ struct KeyTransferView : View {
                             switch AVCaptureDevice.authorizationStatus(for: .video) {
                             case .authorized:
                                 activeNavSelection = "key-scanner"
-                                parentViewController?.bottomSheetController?.grow(toMaximumHeight: true)
+                                parentViewController.bottomSheetController?.grow(toMaximumHeight: true)
                             case .notDetermined:
                                 AVCaptureDevice.requestAccess(for: .video) { granted in
                                     if granted {
                                         activeNavSelection = "key-scanner"
-                                        parentViewController?.bottomSheetController?.grow(toMaximumHeight: true)
+                                        parentViewController.bottomSheetController?.grow(toMaximumHeight: true)
                                     }
                                 }
                             case .denied:
@@ -88,7 +88,10 @@ struct KeyTransferView : View {
                                 dismissButton: .default(Text("OK"))
                             )
                         }
-                        NavigationLink(destination: KeyScannerView(receiveKeyTransfer: receiveKeyTransfer), tag: "key-scanner", selection: $activeNavSelection) { EmptyView() }
+                        NavigationLink(destination: KeyScannerView(
+                            receiveKeyTransfer: receiveKeyTransfer,
+                            parentViewController: parentViewController
+                        ), tag: "key-scanner", selection: $activeNavSelection) { EmptyView() }
                         NavigationLink(destination: KeyCodeView(), tag: "key-code", selection: $activeNavSelection) { EmptyView() }
 
                         Spacer()
@@ -139,7 +142,8 @@ struct RowndButton: ViewModifier {
 
 struct KeyTransferView_Previews: PreviewProvider {
     static var previews: some View {
-        KeyTransferView(setupKeyTransfer: {
+        KeyTransferView(parentViewController: KeyTransferViewController(),
+                        setupKeyTransfer: {
             return
         }, receiveKeyTransfer: { url in
             return

diff --git a/Sources/Rownd/Views/KeyTransfer/KeyTransferViewController.swift b/Sources/Rownd/Views/KeyTransfer/KeyTransferViewController.swift
@@ -74,6 +74,7 @@ class KeyTransferViewController : UIViewController {
 
     private func receiveKeyTransfer(_ url: String) {
         keyState.isReceivingKey = true
+        keyState.operationError = nil
 
         Task {
             let url = URL(string: url)