Merge branch 'develop' into patch/fix-widget

AltStore/Operations/DeactivateAppOperation.swift

@@ -33,8 +33,7 @@ final class DeactivateAppOperation: ResultOperation<InstalledApp>
         
         if let error = self.context.error
         {
-            self.finish(.failure(error))
+            return self.finish(.failure(error))
-            return
         }
         
         DatabaseManager.shared.persistentContainer.performBackgroundTask { (context) in
@@ -43,19 +42,13 @@ final class DeactivateAppOperation: ResultOperation<InstalledApp>
             let allIdentifiers = [installedApp.resignedBundleIdentifier] + appExtensionProfiles
             
             for profile in allIdentifiers {
-                var attempts = 5
+                do {
-                while (attempts != 0){
+                    try remove_provisioning_profile(profile)
-                    print("Remove Provisioning profile attempts left: \(attempts)")
+                    self.progress.completedUnitCount += 1
-                    do {
+                    installedApp.isActive = false
-                        try remove_provisioning_profile(profile)
+                    return self.finish(.success(installedApp))
-                        self.progress.completedUnitCount += 1
+                } catch {
-                        installedApp.isActive = false
+                    return self.finish(.failure(error))
-                        return self.finish(.success(installedApp))
-                    } catch {
-                        if (attempts == 0){
-                            return self.finish(.failure(error))
-                        } else { attempts -= 1 }
-                    }
                 }
             }
         }

AltStore/Operations/RefreshAppOperation.swift

@@ -42,19 +42,13 @@ final class RefreshAppOperation: ResultOperation<InstalledApp>
             
             DatabaseManager.shared.persistentContainer.performBackgroundTask { (context) in
                 print("Sending refresh app request...")
-
+                
                 for p in profiles {
-                    var attempts = 5
+                    do {
-                    while (attempts != 0){
+                        let bytes = p.value.data.toRustByteSlice()
-                        print("Install provisioning profile attempts left: \(attempts)")
+                        try install_provisioning_profile(bytes.forRust())
-                        do {
+                    } catch {
-                            let bytes = p.value.data.toRustByteSlice()
+                        return self.finish(.failure(error))
-                            try install_provisioning_profile(bytes.forRust())
-                        } catch {
-                            if (attempts == 0) {
-                                return self.finish(.failure(error))
-                            } else { attempts -= 1 }
-                        }
                     }
                     self.progress.completedUnitCount += 1
                     

AltStore/Resources/Assets.xcassets/Riley.imageset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "riley.jpg",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

AltStore/Resources/Assets.xcassets/Shane.imageset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "shane.jpeg",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

AltStore/Resources/Assets.xcassets/SideStore.imageset/Contents.json

@@ -4,6 +4,14 @@
       "filename" : "1024.png",
       "idiom" : "universal",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {