Shorten bug report url

ParetoSecurity · Jul 29, 2022 · b8558e6 · b8558e6
1 parent 6654b91
commit b8558e6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 31 deletions.
diff --git a/Pareto/AppInfo.swift b/Pareto/AppInfo.swift
@@ -103,9 +103,8 @@ enum AppInfo {
 
     static let bugReportURL = { () -> URL in
         let baseURL = "https://paretosecurity.com/report-bug?"
-        let logs = try? logEntries().joined(separator: "\n").addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
         let versions = getVersions().addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)
-        if let url = URL(string: baseURL + "&logs=" + logs! + "&version=" + versions!) {
+        if let url = URL(string: baseURL + "&version=" + versions!) {
             return url
         }
 
@@ -133,7 +132,7 @@ enum AppInfo {
             for log in allEntries
                 .compactMap({ $0 as? OSLogEntryLog })
                 .filter({ entry in
-                    entry.subsystem == "niteo.co.Pareto"
+                    entry.subsystem == Bundle.main.bundleIdentifier
                 }) {
                 logs.append("\(log.subsystem): \(log.composedMessage)")
             }
@@ -145,7 +144,7 @@ enum AppInfo {
     }
 
     static let getVersions = { () -> String in
-        "HW: \(AppInfo.hwModelName)\nmacOS: \(AppInfo.macOSVersionString)\nApp Version: \(AppInfo.appVersion)\nBuild: \(AppInfo.buildVersion)"
+        "HW: \(AppInfo.hwModelName) macOS: \(AppInfo.macOSVersionString) App: Pareto Auditor App Version: \(AppInfo.appVersion) Build: \(AppInfo.buildVersion)"
     }
 
     public static func getSystemUUID() -> String? {

diff --git a/Pareto/Info.plist b/Pareto/Info.plist
@@ -26,7 +26,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4870</string>
+	<string>4875</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Pareto/Views/Settings/AboutSettingsView.swift b/Pareto/Views/Settings/AboutSettingsView.swift
@@ -22,38 +22,21 @@ struct AboutSettingsView: View {
         case Failed = "Failed to update, download manually"
     }
 
-    func copy() {
-        var logs = [String]()
-        logs.append("Version: \(AppInfo.getVersions())")
-        logs.append("Location: \(Bundle.main.path)")
-        logs.append("Build: \(AppInfo.utmSource)")
-
-        NSPasteboard.general.clearContents()
-        NSPasteboard.general.setString(logs.joined(separator: "\n"), forType: .string)
-    }
-
     var body: some View {
         HStack {
             Image("Logo").resizable()
                 .aspectRatio(contentMode: .fit).onTapGesture {
-                    if !showBeta {
-                        konami += 1
-                        if konami == 3 {
-                            showBeta = true
-                            konami = 0
+                    konami += 1
+                    if konami >= 3 {
+                        showBeta.toggle()
+                        konami = 0
+                        if showBeta {
                             let alert = NSAlert()
                             alert.messageText = "You are now part of a secret society seeing somewhat mysterious things."
                             alert.alertStyle = NSAlert.Style.informational
                             alert.addButton(withTitle: "Let me in")
                             alert.runModal()
                         }
-
-                    } else {
-                        konami += 1
-                        if konami >= 3 {
-                            showBeta = false
-                            konami = 0
-                        }
                     }
                 }
             VStack(alignment: .leading) {
@@ -81,10 +64,7 @@ struct AboutSettingsView: View {
                             }
                         }
                     #endif
-                }.contextMenu(ContextMenu(menuItems: {
-                    Button("Copy diagnostic data", action: copy)
-                }))
-
+                }
                 HStack(spacing: 0) {
                     Text("We’d love to ")
                     Link("hear from you!",