diff --git a/.gitignore b/.gitignore index a7e8bea..c7dd4b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,13 @@ -/Users/aaron/Documents/GitHub/FlashBack/FlashBack/Assets.xcassets/.DS_Store -FlashBack/.DS_Store +# Crap .DS_Store -FlashBack.xcodeproj/project.pbxproj -FlashBack/.DS_Store -FlashBack/Assets.xcassets/.DS_Store + +# Xcode +*.pbxuser +!default.pbxuser +xcuserdata +*.xccheckout +*.xcuserstate + +# Theos .theos -packages \ No newline at end of file +packages/ diff --git a/FlashBack.xcodeproj/project.pbxproj b/FlashBack.xcodeproj/project.pbxproj index e460009..f306ec9 100644 --- a/FlashBack.xcodeproj/project.pbxproj +++ b/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 = ""; }; 9318182E23B85E8100E3F260 /* UINavigationItem+LargeAccessoryView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UINavigationItem+LargeAccessoryView.h"; sourceTree = ""; }; - 9354F89D2419CA5700D5F8DA /* runtime.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = runtime.h; path = ../../../../theos/sdks/iPhoneOS12.2.sdk/usr/include/objc/runtime.h; sourceTree = ""; }; 935A57C223E6A8AE00AA2C7D /* UIAlertAction+Common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIAlertAction+Common.h"; sourceTree = ""; }; 935A57C323E6A8AE00AA2C7D /* UIAlertAction+Common.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIAlertAction+Common.m"; sourceTree = ""; }; 935A57C523E7510600AA2C7D /* SpecialButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SpecialButton.h; sourceTree = ""; }; @@ -165,7 +164,6 @@ BDCF06A0224B545100ED9A62 /* LaunchScreen.storyboard */, BDCF06A3224B545100ED9A62 /* Info.plist */, BDCF06A4224B545100ED9A62 /* main.m */, - 9354F89D2419CA5700D5F8DA /* runtime.h */, BD5BEF5C23E297D90014EE51 /* globalVars.h */, BD5BEF5D23E2981E0014EE51 /* globalVars.m */, ); diff --git a/FlashBack.xcodeproj/project.xcworkspace/xcuserdata/aaron.xcuserdatad/UserInterfaceState.xcuserstate b/FlashBack.xcodeproj/project.xcworkspace/xcuserdata/aaron.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 1c009a5..0000000 Binary files a/FlashBack.xcodeproj/project.xcworkspace/xcuserdata/aaron.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/FlashBack.xcodeproj/project.xcworkspace/xcuserdata/aaron.xcuserdatad/WorkspaceSettings.xcsettings b/FlashBack.xcodeproj/project.xcworkspace/xcuserdata/aaron.xcuserdatad/WorkspaceSettings.xcsettings deleted file mode 100644 index 1ce7f18..0000000 --- a/FlashBack.xcodeproj/project.xcworkspace/xcuserdata/aaron.xcuserdatad/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,20 +0,0 @@ - - - - - BuildLocationStyle - UseAppPreferences - CustomBuildIntermediatesPath - /Users/aaron/Desktop/Build/Intermediates.noindex - CustomBuildLocationType - Absolute - CustomBuildProductsPath - /Users/aaron/Documents/GitHub/FlashBack - DerivedDataLocationStyle - Default - IssueFilterStyle - ShowActiveSchemeOnly - LiveSourceIssuesEnabled - - - diff --git a/FlashBack.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate b/FlashBack.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100755 index 41360ec..0000000 Binary files a/FlashBack.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/FlashBack.xcodeproj/xcuserdata/aaron.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/FlashBack.xcodeproj/xcuserdata/aaron.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist deleted file mode 100644 index 60717c1..0000000 --- a/FlashBack.xcodeproj/xcuserdata/aaron.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/FlashBack.xcodeproj/xcuserdata/aaron.xcuserdatad/xcschemes/xcschememanagement.plist b/FlashBack.xcodeproj/xcuserdata/aaron.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 5fcd4eb..0000000 --- a/FlashBack.xcodeproj/xcuserdata/aaron.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,14 +0,0 @@ - - - - - SchemeUserState - - FlashBack.xcscheme_^#shared#^_ - - orderHint - 2 - - - - diff --git a/FlashBack.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist b/FlashBack.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100755 index 0957787..0000000 --- a/FlashBack.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,14 +0,0 @@ - - - - - SchemeUserState - - FlashBack.xcscheme_^#shared#^_ - - orderHint - 0 - - - - diff --git a/FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/IDEFindNavigatorScopes.plist b/FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/IDEFindNavigatorScopes.plist deleted file mode 100644 index 5dd5da8..0000000 --- a/FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/IDEFindNavigatorScopes.plist +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/UserInterfaceState.xcuserstate b/FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index c3fa9a9..0000000 Binary files a/FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist deleted file mode 100644 index 9be9172..0000000 --- a/FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - diff --git a/FlashBack.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate b/FlashBack.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 5b37d3b..0000000 Binary files a/FlashBack.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/FlashBack/BSAction.h b/FlashBack/BSAction.h index b47a189..155520f 100755 --- a/FlashBack/BSAction.h +++ b/FlashBack/BSAction.h @@ -1,7 +1,3 @@ -#import "BSDescriptionProviding.h" -#import "BSSettingDescriptionProvider.h" -#import "BSXPCCoding.h" - -@interface BSAction : NSObject +@interface BSAction : NSObject @end diff --git a/FlashBack/Info.plist b/FlashBack/Info.plist index f81118c..b3a8f71 100755 --- a/FlashBack/Info.plist +++ b/FlashBack/Info.plist @@ -40,6 +40,8 @@ UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight UIUserInterfaceStyle Dark diff --git a/FlashBack/UIAlertAction+Common.h b/FlashBack/UIAlertAction+Common.h index 8565443..bde32a0 100644 --- a/FlashBack/UIAlertAction+Common.h +++ b/FlashBack/UIAlertAction+Common.h @@ -8,6 +8,12 @@ #import +@interface UIAlertController (Private) + +@property (nonatomic, retain) UIViewController *contentViewController; + +@end + @interface UIAlertAction (Common) + (UIAlertAction *)okAction; + (UIAlertAction *)okActionWithHandler:(void (^)(UIAlertAction *action))handler; diff --git a/FlashBack/ViewController.m b/FlashBack/ViewController.m index 3dbe873..4472cc6 100755 --- a/FlashBack/ViewController.m +++ b/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 diff --git a/Makefile b/Makefile index fb2ed6b..8b74326 100644 --- a/Makefile +++ b/Makefile @@ -4,4 +4,7 @@ XCODEPROJ_NAME = FlashBack FlashBack_CODESIGN_FLAGS = -Sentitlements.plist -include $(THEOS_MAKE_PATH)/xcodeproj.mk \ No newline at end of file +include $(THEOS_MAKE_PATH)/xcodeproj.mk + +after-stage:: + @sudo chmod 6755 $(THEOS_STAGING_DIR)/usr/bin/fbmobileldrestart diff --git a/Podfile b/Podfile index 8c0a5cc..1dcc7eb 100644 --- a/Podfile +++ b/Podfile @@ -1,3 +1,3 @@ -target ‘FlashBack’ do - pod ‘SDWebImage’, ‘~> 5.4.2’ -end \ No newline at end of file +target 'FlashBack' do + pod 'SDWebImage', '~> 5.4.2' +end diff --git a/Pods/Pods.xcodeproj/xcuserdata/aaron.xcuserdatad/xcschemes/Pods-FlashBack.xcscheme b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-FlashBack.xcscheme similarity index 75% rename from Pods/Pods.xcodeproj/xcuserdata/aaron.xcuserdatad/xcschemes/Pods-FlashBack.xcscheme rename to Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-FlashBack.xcscheme index c2b6462..1841b5b 100644 --- a/Pods/Pods.xcodeproj/xcuserdata/aaron.xcuserdatad/xcschemes/Pods-FlashBack.xcscheme +++ b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-FlashBack.xcscheme @@ -1,17 +1,17 @@ + buildForArchiving = "YES" + buildForAnalyzing = "YES"> - - + shouldUseLaunchSchemeArgsEnv = "YES"> + + - - + debugDocumentVersioning = "YES"> + + + + diff --git a/Pods/Pods.xcodeproj/xcuserdata/aaron.xcuserdatad/xcschemes/SDWebImage.xcscheme b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme similarity index 75% rename from Pods/Pods.xcodeproj/xcuserdata/aaron.xcuserdatad/xcschemes/SDWebImage.xcscheme rename to Pods/Pods.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme index 6302782..e108172 100644 --- a/Pods/Pods.xcodeproj/xcuserdata/aaron.xcuserdatad/xcschemes/SDWebImage.xcscheme +++ b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme @@ -1,17 +1,17 @@ + buildForArchiving = "YES" + buildForAnalyzing = "YES"> - - + shouldUseLaunchSchemeArgsEnv = "YES"> + + - - + debugDocumentVersioning = "YES"> + + + + diff --git a/Pods/Pods.xcodeproj/xcuserdata/aaron.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/aaron.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 2411fde..0000000 --- a/Pods/Pods.xcodeproj/xcuserdata/aaron.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,25 +0,0 @@ - - - - - SchemeUserState - - Pods-FlashBack.xcscheme - - isShown - - orderHint - 0 - - SDWebImage.xcscheme - - isShown - - orderHint - 1 - - - SuppressBuildableAutocreation - - - diff --git a/Pods/Pods.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index c9e76eb..0000000 --- a/Pods/Pods.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,19 +0,0 @@ - - - - - SchemeUserState - - Pods-FlashBack.xcscheme_^#shared#^_ - - orderHint - 1 - - SDWebImage.xcscheme_^#shared#^_ - - orderHint - 2 - - - - diff --git a/entitlements.plist b/entitlements.plist index d3bce73..ea1fbf2 100644 --- a/entitlements.plist +++ b/entitlements.plist @@ -4,10 +4,14 @@ platform-application + com.apple.private.skip-library-validation + com.apple.private.security.no-container com.apple.private.security.container-required + com.apple.springboard.appbackgroundstyle + dynamic-codesigning application-identifier @@ -16,7 +20,5 @@ com.mpg13 get-task-allow - com.apple.private.skip-library-validation - - \ No newline at end of file + diff --git a/layout/DEBIAN/control b/layout/DEBIAN/control index bb2b4c6..a602ccd 100644 --- a/layout/DEBIAN/control +++ b/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 diff --git a/layout/usr/bin/FBRestore b/layout/usr/bin/FBRestore index 08bd2e3..c65ad48 100755 --- a/layout/usr/bin/FBRestore +++ b/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