From e3bb9b425fcc10d02717dbb45623207dbc68f6ac Mon Sep 17 00:00:00 2001
From: naturecodevoid <44983869+naturecodevoid@users.noreply.github.com>
Date: Sun, 17 Sep 2023 10:37:49 -0700
Subject: [PATCH] [skip ci] Add more information to staging errors (#468)

* Point to my forks and attempt to add more information to staging errors

* Improve error message a bit

* Revert fetch-prebuilt.sh changes

* Undo some whitespace changes

* missed one

* oops

* [skip ci]

* [skip ci]

* [skip ci] remove staging directory from install app error

Signed-off-by: naturecodevoid <44983869+naturecodevoid@users.noreply.github.com>

---------

Signed-off-by: naturecodevoid <44983869+naturecodevoid@users.noreply.github.com>
Co-authored-by: Dadoum <dadoum@protonmail.com>
---
 AltStore/Info.plist                           |  2 +-
 AltStore/Operations/InstallAppOperation.swift | 25 +++++++------------
 AltStore/Operations/OperationError.swift      |  4 +--
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/AltStore/Info.plist b/AltStore/Info.plist
index 72110fc2..a54f4f93 100644
--- a/AltStore/Info.plist
+++ b/AltStore/Info.plist
@@ -4,8 +4,8 @@
 <dict>
 	<key>ALTAppGroups</key>
 	<array>
-		<string>group.com.SideStore.SideStore</string>
 		<string>group.$(APP_GROUP_IDENTIFIER)</string>
+		<string>group.com.SideStore.SideStore</string>
 	</array>
 	<key>ALTDeviceID</key>
 	<string>00008101-000129D63698001E</string>
diff --git a/AltStore/Operations/InstallAppOperation.swift b/AltStore/Operations/InstallAppOperation.swift
index 144b0be8..f4870609 100644
--- a/AltStore/Operations/InstallAppOperation.swift
+++ b/AltStore/Operations/InstallAppOperation.swift
@@ -198,22 +198,15 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
                     UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
                 }
             }
-            var attempts = 10
-            while (attempts != 0){
-                print("Install ipa attempts left: \(attempts)")
-                do {
-                    try install_ipa(installedApp.bundleIdentifier)
-                    installing = false
-                    installedApp.refreshedDate = Date()
-                    self.finish(.success(installedApp))
-                    break
-                } catch {
-                    attempts -= 1
-                    if (attempts <= 0){
-                        installing = false
-                        self.finish(.failure(MinimuxerError.InstallApp))
-                    }
-                }
+            
+            do {
+                try install_ipa(installedApp.bundleIdentifier)
+                installing = false
+                installedApp.refreshedDate = Date()
+                self.finish(.success(installedApp))
+            } catch let error {
+                installing = false
+                self.finish(.failure(error))
             }
         }
     }
diff --git a/AltStore/Operations/OperationError.swift b/AltStore/Operations/OperationError.swift
index 7829502a..c3141c17 100644
--- a/AltStore/Operations/OperationError.swift
+++ b/AltStore/Operations/OperationError.swift
@@ -138,8 +138,8 @@ extension MinimuxerError: LocalizedError {
             return self.createService(name: "AFC")
         case .RwAfc:
             return NSLocalizedString("AFC was unable to manage files on the device", comment: "")
-        case .InstallApp:
-            return NSLocalizedString("Unable to install the app from the staging directory", comment: "")
+        case .InstallApp(let message):
+            return NSLocalizedString("Unable to install the app: \(message.toString())", comment: "")
         case .UninstallApp:
             return NSLocalizedString("Unable to uninstall the app", comment: "")