Merge pull request #2 from kirb/master

Fix build

.gitignore

@@ -1,8 +1,13 @@
-/Users/aaron/Documents/GitHub/FlashBack/FlashBack/Assets.xcassets/.DS_Store
+# Crap
-FlashBack/.DS_Store
 .DS_Store
-FlashBack.xcodeproj/project.pbxproj
+
-FlashBack/.DS_Store
+# Xcode
-FlashBack/Assets.xcassets/.DS_Store
+*.pbxuser
+!default.pbxuser
+xcuserdata
+*.xccheckout
+*.xcuserstate
+
+# Theos
 .theos
-packages
+packages/

FlashBack.xcodeproj/project.pbxproj

@@ -45,7 +45,6 @@
 /* Begin PBXFileReference section */
 		812AE756A45667D1A5844EDE /* Pods-FlashBack.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlashBack.release.xcconfig"; path = "Target Support Files/Pods-FlashBack/Pods-FlashBack.release.xcconfig"; sourceTree = "<group>"; };
 		9318182E23B85E8100E3F260 /* UINavigationItem+LargeAccessoryView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UINavigationItem+LargeAccessoryView.h"; sourceTree = "<group>"; };
-		9354F89D2419CA5700D5F8DA /* runtime.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = runtime.h; path = ../../../../theos/sdks/iPhoneOS12.2.sdk/usr/include/objc/runtime.h; sourceTree = "<group>"; };
 		935A57C223E6A8AE00AA2C7D /* UIAlertAction+Common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIAlertAction+Common.h"; sourceTree = "<group>"; };
 		935A57C323E6A8AE00AA2C7D /* UIAlertAction+Common.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIAlertAction+Common.m"; sourceTree = "<group>"; };
 		935A57C523E7510600AA2C7D /* SpecialButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SpecialButton.h; sourceTree = "<group>"; };
@@ -165,7 +164,6 @@
 				BDCF06A0224B545100ED9A62 /* LaunchScreen.storyboard */,
 				BDCF06A3224B545100ED9A62 /* Info.plist */,
 				BDCF06A4224B545100ED9A62 /* main.m */,
-				9354F89D2419CA5700D5F8DA /* runtime.h */,
 				BD5BEF5C23E297D90014EE51 /* globalVars.h */,
 				BD5BEF5D23E2981E0014EE51 /* globalVars.m */,
 			);

FlashBack.xcodeproj/project.xcworkspace/xcuserdata/aaron.xcuserdatad/WorkspaceSettings.xcsettings

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildLocationStyle</key>
-	<string>UseAppPreferences</string>
-	<key>CustomBuildIntermediatesPath</key>
-	<string>/Users/aaron/Desktop/Build/Intermediates.noindex</string>
-	<key>CustomBuildLocationType</key>
-	<string>Absolute</string>
-	<key>CustomBuildProductsPath</key>
-	<string>/Users/aaron/Documents/GitHub/FlashBack</string>
-	<key>DerivedDataLocationStyle</key>
-	<string>Default</string>
-	<key>IssueFilterStyle</key>
-	<string>ShowActiveSchemeOnly</string>
-	<key>LiveSourceIssuesEnabled</key>
-	<true/>
-</dict>
-</plist>

FlashBack.xcodeproj/xcuserdata/aaron.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   uuid = "9B71B754-8EF4-4B21-944A-011F70D1E639"
-   type = "1"
-   version = "2.0">
-</Bucket>

FlashBack.xcodeproj/xcuserdata/aaron.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>FlashBack.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>2</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>

FlashBack.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>FlashBack.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>

FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/IDEFindNavigatorScopes.plist

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<array/>
-</plist>

FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   uuid = "B4DA8066-859C-4D54-B813-6182CDC34866"
-   type = "0"
-   version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
-         <BreakpointContent
-            uuid = "420B6B06-2537-46F9-BD0E-B659BC2C7A8C"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            scope = "1"
-            stopOnStyle = "0">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
-</Bucket>

FlashBack/BSAction.h

@@ -1,7 +1,3 @@
-#import "BSDescriptionProviding.h"
+@interface BSAction : NSObject
-#import "BSSettingDescriptionProvider.h"
-#import "BSXPCCoding.h"
-
-@interface BSAction : NSObject <BSDescriptionProviding, BSSettingDescriptionProvider, BSXPCCoding>
 
 @end

FlashBack/Info.plist

@@ -40,6 +40,8 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIUserInterfaceStyle</key>
 	<string>Dark</string>

FlashBack/UIAlertAction+Common.h

@@ -8,6 +8,12 @@
 
 #import <UIKit/UIKit.h>
 
+@interface UIAlertController (Private)
+
+@property (nonatomic, retain) UIViewController *contentViewController;
+
+@end
+
 @interface UIAlertAction (Common)
 + (UIAlertAction *)okAction;
 + (UIAlertAction *)okActionWithHandler:(void (^)(UIAlertAction *action))handler;

FlashBack/ViewController.m

@@ -114,6 +114,31 @@ NSString *backupNameSelected;
 														 alertControllerWithTitle:@"Restoring from backup"
 														 message:@"Your device will respring when the process is completed."
 														 preferredStyle:UIAlertControllerStyleAlert];
+
+			UIActivityIndicatorViewStyle indicatorStyle = UIActivityIndicatorViewStyleGray;
+			if (@available(iOS 13, *)) {
+				indicatorStyle = UIActivityIndicatorViewStyleMedium;
+			}
+			UIActivityIndicatorView *activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:indicatorStyle];
+			activityIndicator.translatesAutoresizingMaskIntoConstraints = NO;
+			[activityIndicator startAnimating];
+
+			finishedRestoreAlert.contentViewController = [[UIViewController alloc] init];
+			[finishedRestoreAlert.contentViewController.view addSubview:activityIndicator];
+
+			[NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[activityIndicator]|"
+																																											options:kNilOptions
+																																											metrics:nil
+																																												views:@{
+																																														@"activityIndicator": activityIndicator
+																																												}]];
+			[NSLayoutConstraint activateConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[activityIndicator]|"
+																																											options:kNilOptions
+																																											metrics:nil
+																																												views:@{
+																																														@"activityIndicator": activityIndicator
+																																												}]];
+
 			[self presentViewController:finishedRestoreAlert animated:YES completion:nil];
 			
 			//RUN RESTORE SCRIPT

Makefile

@@ -4,4 +4,7 @@ XCODEPROJ_NAME = FlashBack
 
 FlashBack_CODESIGN_FLAGS = -Sentitlements.plist
 
-include $(THEOS_MAKE_PATH)/xcodeproj.mk
+include $(THEOS_MAKE_PATH)/xcodeproj.mk
+
+after-stage::
+	@sudo chmod 6755 $(THEOS_STAGING_DIR)/usr/bin/fbmobileldrestart

Podfile

@@ -1,3 +1,3 @@
-target ‘FlashBack’ do
+target 'FlashBack' do
-	pod ‘SDWebImage’, ‘~> 5.4.2’
+	pod 'SDWebImage', '~> 5.4.2'
-end
+end

Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-FlashBack.xcscheme

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D8A9F7958C91654222F0E3BABD9CC9F3"
@@ -23,14 +23,15 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
-      buildConfiguration = "Debug">
+      <Testables>
-      <AdditionalOptions>
+      </Testables>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -38,17 +39,23 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      buildConfiguration = "Debug"
       allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
+      debugDocumentVersioning = "YES">
-      buildConfiguration = "Release"
+      <MacroExpansion>
-      shouldUseLaunchSchemeArgsEnv = "YES">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D8A9F7958C91654222F0E3BABD9CC9F3"
+            BuildableName = "libPods-FlashBack.a"
+            BlueprintName = "Pods-FlashBack"
+            ReferencedContainer = "container:Pods.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

Pods/Pods.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "3847153A6E5EEFB86565BA840768F429"
@@ -23,14 +23,15 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
-      buildConfiguration = "Debug">
+      <Testables>
-      <AdditionalOptions>
+      </Testables>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -38,17 +39,23 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      buildConfiguration = "Debug"
       allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
+      debugDocumentVersioning = "YES">
-      buildConfiguration = "Release"
+      <MacroExpansion>
-      shouldUseLaunchSchemeArgsEnv = "YES">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3847153A6E5EEFB86565BA840768F429"
+            BuildableName = "libSDWebImage.a"
+            BlueprintName = "SDWebImage"
+            ReferencedContainer = "container:Pods.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

Pods/Pods.xcodeproj/xcuserdata/aaron.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>Pods-FlashBack.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-		<key>SDWebImage.xcscheme</key>
-		<dict>
-			<key>isShown</key>
-			<false/>
-			<key>orderHint</key>
-			<integer>1</integer>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict/>
-</dict>
-</plist>

Pods/Pods.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>Pods-FlashBack.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>1</integer>
-		</dict>
-		<key>SDWebImage.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>2</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>

entitlements.plist

@@ -4,10 +4,14 @@
 <dict>
 	<key>platform-application</key>
 	<true/>
+	<key>com.apple.private.skip-library-validation</key>
+	<true/>
 	<key>com.apple.private.security.no-container</key>
 	<true/>
 	<key>com.apple.private.security.container-required</key>
 	<false/>
+	<key>com.apple.springboard.appbackgroundstyle</key>
+	<true/>
 	<key>dynamic-codesigning</key>
 	<true/>
 	<key>application-identifier</key>
@@ -16,7 +20,5 @@
 	<string>com.mpg13</string>
 	<key>get-task-allow</key>
 	<true/>
-    <key>com.apple.private.skip-library-validation</key>
-    <true/>
 </dict>
-</plist>
+</plist>

layout/DEBIAN/control

@@ -1,4 +1,4 @@
-Package: com.mpg13.FlashBack
+Package: com.mpg13.flashback
 Name: FlashBack
 Depends: mobilesubstrate,firmware (>= 12.0) | com.chpwn.iconsupport, firmware (<< 12.0) | com.ichitaso.iconanus,ldid
 Conflicts: com.mpg13.FlashBackfree

layout/usr/bin/FBRestore

@@ -31,7 +31,6 @@ fi
 # clear caches and respring
 uicache
 recache --no respring &>/dev/null
-#sbreload && exit 0 || killall -9 SpringBoard && exit 0 # Kill the script.
+fbmobileldrestart
-#fbmobileldrestart
 
 exit 0