Fixes (see commit description)

- Fix issue caused by merge
- Improve icons in onboarding
- Use onboarding's pairing file step properly

AltStore/LaunchViewController.swift

@@ -62,15 +62,15 @@ final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDeleg
         start_em_proxy(bind_addr: Consts.Proxy.serverURL)
         
         guard let pf = fetchPairingFile() else {
-            self.showOnboarding(step: .pairing)
+            self.showOnboarding(step: .pairing, closeAfterPairing: true)
             return
         }
         start_minimuxer_threads(pf)
         #endif
     }
 
-    func showOnboarding(step: OnboardingView.OnboardingStep = .welcome) {
-        let onboardingView = OnboardingView(onDismiss: { self.dismiss(animated: true) }, currentStep: step)
+    func showOnboarding(step: OnboardingView.OnboardingStep = .welcome, closeAfterPairing: Bool = false) {
+        let onboardingView = OnboardingView(onDismiss: { self.dismiss(animated: true) }, closeAfterPairing: closeAfterPairing, currentStep: step)
             .environment(\.managedObjectContext, DatabaseManager.shared.viewContext)
         let navigationController = UINavigationController(rootViewController: UIHostingController(rootView: onboardingView))
         navigationController.isNavigationBarHidden = true
@@ -96,31 +96,8 @@ final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDeleg
         } else if let plistString = Bundle.main.object(forInfoDictionaryKey: "ALTPairingFile") as? String, !plistString.isEmpty, !plistString.contains("insert pairing file here"){
             print("Loaded ALTPairingFile from Info.plist")
             return plistString
-        } else {
-            // Show an alert explaining the pairing file
-            // Create new Alert
-            let dialogMessage = UIAlertController(title: "Pairing File", message: "Select the pairing file for your device. For more information, go to https://wiki.sidestore.io/guides/install#pairing-process", preferredStyle: .alert)
-            
-            // Create OK button with action handler
-            let ok = UIAlertAction(title: "OK", style: .default, handler: { (action) -> Void in
-                // Try to load it from a file picker
-                var types = UTType.types(tag: "plist", tagClass: UTTagClass.filenameExtension, conformingTo: nil)
-                types.append(contentsOf: UTType.types(tag: "mobiledevicepairing", tagClass: UTTagClass.filenameExtension, conformingTo: UTType.data))
-                types.append(.xml)
-                let documentPickerController = UIDocumentPickerViewController(forOpeningContentTypes: types)
-                documentPickerController.shouldShowFileExtensions = true
-                documentPickerController.delegate = self
-                self.present(documentPickerController, animated: true, completion: nil)
-             })
-            
-            //Add OK button to a dialog message
-            dialogMessage.addAction(ok)
-
-            // Present Alert to
-            self.present(dialogMessage, animated: true, completion: nil)
-
-            return nil
         }
+        return nil
     }
 
     func displayError(_ msg: String) {

AltStore/Operations/OperationError.swift

@@ -163,5 +163,4 @@ extension MinimuxerError: LocalizedError {
     fileprivate func setArgument(name: String) -> String {
         return String(format: NSLocalizedString("Cannot set %@ on the device.", comment: ""), name)
     }
-    return error as! OperationError
 }

AltStore/Views/Onboarding/AppIconsShowcase.swift

@@ -17,47 +17,52 @@ struct AppIconsShowcase: View {
         VStack {
             GeometryReader { proxy in
                 ZStack(alignment: .bottom) {
-                    Image(uiImage: UIImage(named: "AppIcon")!)
+                    // left
+                    Image(uiImage: UIImage(named: "Midnight-image")!)
                         .resizable()
                         .aspectRatio(contentMode: .fit)
                         .frame(height: 0.2 * proxy.size.width)
-                        .clipShape(RoundedRectangle(cornerRadius: 24, style: .circular))
-                        .offset(x: -0.3*proxy.size.width * self.animationProgress, y: -30)
+                        .cornerRadius(0.2 * proxy.size.width * 0.234)
+                        .offset(x: -0.3 * proxy.size.width * self.animationProgress, y: -30)
                         .rotationEffect(.degrees(-20 * self.animationProgress))
                         .shadow(radius: 8 * self.animationProgress)
 
-                    Image(uiImage: UIImage(named: "AppIcon")!)
+                    // center-left
+                    Image(uiImage: UIImage(named: "Steel-image")!)
                         .resizable()
                         .aspectRatio(contentMode: .fit)
                         .frame(height: 0.25 * proxy.size.width)
-                        .clipShape(RoundedRectangle(cornerRadius: 24, style: .circular))
-                        .offset(x: -0.15*proxy.size.width * self.animationProgress, y: -10)
+                        .cornerRadius(0.25 * proxy.size.width * 0.234)
+                        .offset(x: -0.15 * proxy.size.width * self.animationProgress, y: -10)
                         .rotationEffect(.degrees(-10 * self.animationProgress))
                         .shadow(radius: 12 * self.animationProgress)
 
-                    Image(uiImage: UIImage(named: "AppIcon")!)
+                    // right
+                    Image(uiImage: UIImage(named: "Storm-image")!)
                         .resizable()
                         .aspectRatio(contentMode: .fit)
                         .frame(height: 0.2 * proxy.size.width)
-                        .clipShape(RoundedRectangle(cornerRadius: 24, style: .circular))
-                        .offset(x: self.animationProgress*0.3*proxy.size.width, y: -30)
-                        .rotationEffect(.degrees(self.animationProgress*20))
+                        .cornerRadius(0.2 * proxy.size.width * 0.234)
+                        .offset(x: self.animationProgress * 0.3 * proxy.size.width, y: -30)
+                        .rotationEffect(.degrees(self.animationProgress * 20))
                         .shadow(radius: 8 * self.animationProgress)
-
-                    Image(uiImage: UIImage(named: "AppIcon")!)
+                    
+                    // center-right
+                    Image(uiImage: UIImage(named: "Starburst-image")!)
                         .resizable()
                         .aspectRatio(contentMode: .fit)
                         .frame(height: 0.25 * proxy.size.width)
-                        .clipShape(RoundedRectangle(cornerRadius: 24, style: .circular))
-                        .offset(x: self.animationProgress * 0.15*proxy.size.width, y: -10)
+                        .cornerRadius(0.25 * proxy.size.width * 0.234)
+                        .offset(x: self.animationProgress * 0.15 * proxy.size.width, y: -10)
                         .rotationEffect(.degrees(self.animationProgress * 10))
                         .shadow(radius: 12 * self.animationProgress)
-
-                    Image(uiImage: UIImage(named: "AppIcon")!)
+                    
+                    // center
+                    Image(uiImage: UIImage(named: "Neon-image")!)
                         .resizable()
                         .aspectRatio(contentMode: .fit)
                         .frame(height: 0.3 * proxy.size.width)
-                        .clipShape(RoundedRectangle(cornerRadius: 24, style: .circular))
+                        .cornerRadius(0.3 * proxy.size.width * 0.234)
                         .shadow(radius: 16 * self.animationProgress + 8 * self.animation2Progress)
                         .scaleEffect(1.0 + 0.05 * self.animation2Progress)
                 }

AltStore/Views/Onboarding/OnboardingView.swift

@@ -23,8 +23,10 @@ struct OnboardingView: View {
 
     // Temporary workaround for UIKit compatibility
     var onDismiss: (() -> Void)? = nil
+    
+    var closeAfterPairing = false
 
-    @State var currentStep: OnboardingStep = .wireguard //.welcome
+    @State var currentStep: OnboardingStep = .welcome
     @State private var pairingFileURL: URL? = nil
     @State private var isWireGuardAppStorePageVisible: Bool = false
     @State private var isDownloadingWireGuardProfile: Bool = false
@@ -269,25 +271,27 @@ extension OnboardingView {
         do {
             // Read to a string
             let data = try Data(contentsOf: url)
-            let pairing_string = String(bytes: data, encoding: .utf8)
-            if pairing_string == nil {
-                // TODO: Show error message
+            let pairingString = String(bytes: data, encoding: .utf8)
+            if pairingString == nil {
+                // TODO: Show error message (this will only be triggered if the pairing file is not UTF8)
                 debugPrint("Unable to read pairing file")
                 // displayError("Unable to read pairing file")
             }
 
             // Save to a file for next launch
             let filename = "ALTPairingFile.mobiledevicepairing"
-            let fm = FileManager.default
-            let documentsPath = fm.documentsDirectory.appendingPathComponent("/\(filename)")
-            try pairing_string?.write(to: documentsPath, atomically: true, encoding: String.Encoding.utf8)
+            let documentsPath = FileManager.default.documentsDirectory.appendingPathComponent("/\(filename)")
+            try pairingString?.write(to: documentsPath, atomically: true, encoding: String.Encoding.utf8)
 
             // Start minimuxer now that we have a file
-            start_minimuxer_threads(pairing_string!)
-
-            // Show the next onboarding step
-            self.showNextStep()
+            start_minimuxer_threads(pairingString!)
 
+            // Show the next onboarding step, or finish onboarding
+            if !self.closeAfterPairing {
+                self.showNextStep()
+            } else {
+                self.finishOnboarding()
+            }
         } catch {
             NotificationManager.shared.reportError(error: error)
         }