diff --git a/SuccessionRestore.xcodeproj/project.pbxproj b/SuccessionRestore.xcodeproj/project.pbxproj index ab62ead5..84b776ed 100644 --- a/SuccessionRestore.xcodeproj/project.pbxproj +++ b/SuccessionRestore.xcodeproj/project.pbxproj @@ -623,7 +623,7 @@ "$(inherited)", "$(PROJECT_DIR)/SuccessionRestore", ); - MARKETING_VERSION = "1.4.13~b3"; + MARKETING_VERSION = 1.4.14; PRODUCT_BUNDLE_IDENTIFIER = com.samgisaninja.SuccessionRestore; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -649,7 +649,7 @@ "$(inherited)", "$(PROJECT_DIR)/SuccessionRestore", ); - MARKETING_VERSION = "1.4.13~b3"; + MARKETING_VERSION = 1.4.14; PRODUCT_BUNDLE_IDENTIFIER = com.samgisaninja.SuccessionRestore; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/SuccessionRestore.xcodeproj/project.xcworkspace/xcuserdata/samgardner.xcuserdatad/UserInterfaceState.xcuserstate b/SuccessionRestore.xcodeproj/project.xcworkspace/xcuserdata/samgardner.xcuserdatad/UserInterfaceState.xcuserstate index 6b203155..e7d85b8b 100644 Binary files a/SuccessionRestore.xcodeproj/project.xcworkspace/xcuserdata/samgardner.xcuserdatad/UserInterfaceState.xcuserstate and b/SuccessionRestore.xcodeproj/project.xcworkspace/xcuserdata/samgardner.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SuccessionRestore/HomePageViewController.m b/SuccessionRestore/HomePageViewController.m index f4fb3581..878fe6c7 100644 --- a/SuccessionRestore/HomePageViewController.m +++ b/SuccessionRestore/HomePageViewController.m @@ -12,6 +12,7 @@ #include #include #include +#import @interface HomePageViewController () @@ -60,10 +61,8 @@ - (void)viewDidLoad { } // Don't run on unc0ver 4.0-4.2.X because of restore hang if ([[NSFileManager defaultManager] fileExistsAtPath:@"/usr/libexec/pwnproxy"]) { - UIAlertController *pwnproxyError = [UIAlertController alertControllerWithTitle:@"Succession is disabled" message:@"Succession is not compatible with unc0ver 4.0-4.2.1" preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction *exitAction = [UIAlertAction actionWithTitle:@"Exit" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) { - exit(0); - }]; + UIAlertController *pwnproxyError = [UIAlertController alertControllerWithTitle:@"Warning" message:@"Succession is not compatible with unc0ver 4.0-4.2.1. Please make sure that you are running unc0ver 4.3 or higher." preferredStyle:UIAlertControllerStyleAlert]; + UIAlertAction *exitAction = [UIAlertAction actionWithTitle:@"Exit" style:UIAlertActionStyleDestructive handler:nil]; [pwnproxyError addAction:exitAction]; [self presentViewController:pwnproxyError animated:TRUE completion:nil]; } @@ -342,5 +341,44 @@ - (void) URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTa } } +int sha1_to_str(const unsigned char *hash, size_t hashlen, char *buf, size_t buflen) +{ + if (buflen < (hashlen*2+1)) { + return -1; + } + + int i; + for (i=0; i