From aac15f91e4334f9ef8ee89c64dccaf404124b0e2 Mon Sep 17 00:00:00 2001
From: Alex Lavallee <73203142+lavalleeale@users.noreply.github.com>
Date: Sun, 17 Jan 2021 21:37:07 -0800
Subject: [PATCH] Change hard-coded bundleID to automatically retrieved one

---
 Secretive/Views/CreateSecretView.swift | 20 +-------------------
 Secretive/Views/SecretDetailView.swift |  8 +-------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/Secretive/Views/CreateSecretView.swift b/Secretive/Views/CreateSecretView.swift
index bd500b8..5753932 100644
--- a/Secretive/Views/CreateSecretView.swift
+++ b/Secretive/Views/CreateSecretView.swift
@@ -5,10 +5,9 @@ struct CreateSecretView<StoreType: SecretStoreModifiable>: View {
     
     @ObservedObject var store: StoreType
     @Binding var showing: Bool
-    @State private var comment = ""
+    
     @State private var name = ""
     @State private var requiresAuthentication = true
-    let defaults = UserDefaults.standard
 
     var body: some View {
         VStack {
@@ -26,10 +25,6 @@ struct CreateSecretView<StoreType: SecretStoreModifiable>: View {
                         Text("Name:")
                         TextField("Shhhhh", text: $name).focusable()
                     }
-                    HStack {
-                        Text("Comment:")
-                        TextField("\(dashedUserName)@\(dashedHostName)", text: $comment).focusable()
-                    }
                     HStack {
                         Toggle(isOn: $requiresAuthentication) {
                             Text("Requires Authentication (Biometrics or Password)")
@@ -50,22 +45,9 @@ struct CreateSecretView<StoreType: SecretStoreModifiable>: View {
             }
         }.padding()
     }
-    var dashedUserName: String {
-        NSUserName().replacingOccurrences(of: " ", with: "-")
-    }
-    var dashedHostName: String {
-        [Host.current().localizedName, "local"]
-            .compactMap { $0 }
-            .joined(separator: ".")
-            .replacingOccurrences(of: " ", with: "-")
-    }
     
     func save() {
         try! store.create(name: name, requiresAuthentication: requiresAuthentication)
-        if comment != "" {
-            defaults.set(comment, forKey: name)
-        }
-        defaults.set(comment, forKey: name)
         showing = false
     }
 }
diff --git a/Secretive/Views/SecretDetailView.swift b/Secretive/Views/SecretDetailView.swift
index ef7e006..cbe76bc 100644
--- a/Secretive/Views/SecretDetailView.swift
+++ b/Secretive/Views/SecretDetailView.swift
@@ -5,8 +5,6 @@ struct SecretDetailView<SecretType: Secret>: View {
     
     @State var secret: SecretType
 
-    let defaults = UserDefaults.standard
-    
     private let keyWriter = OpenSSHKeyWriter()
     
     var body: some View {
@@ -38,11 +36,7 @@ struct SecretDetailView<SecretType: Secret>: View {
     }
     
     var keyString: String {
-        if defaults.string(forKey: secret.name) != "" {
-            return keyWriter.openSSHString(secret: secret, comment: defaults.string(forKey: secret.name))
-        } else {
-            return keyWriter.openSSHString(secret: secret, comment: "\(dashedUserName)@\(dashedHostName)")
-        }
+        keyWriter.openSSHString(secret: secret, comment: "\(dashedUserName)@\(dashedHostName)")
     }
     
     func copy() {