diff --git a/FlashBack.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate b/FlashBack.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate index 39b279a..dbb4bed 100644 Binary files a/FlashBack.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate and b/FlashBack.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/FlashBack/ViewController.m b/FlashBack/ViewController.m index 82080ef..0f7da5c 100755 --- a/FlashBack/ViewController.m +++ b/FlashBack/ViewController.m @@ -105,25 +105,6 @@ NSString *backupNameSelected; UIAlertAction* ok = [UIAlertAction okActionWithHandler:^(UIAlertAction * action) { - //RUN RESTORE SCRIPT - - NSTask *restoreTask = [[NSTask alloc] init]; - [restoreTask setLaunchPath:@"/bin/bash"]; - [restoreTask setArguments:@[ @"FBRestore", backupNameSelected, stringTweaksEnabled, stringIconsEnabled, stringWallpaperEnabled]]; - [restoreTask launch]; - [restoreTask waitUntilExit]; - - NSTask *killPrefsTask = [[NSTask alloc] init]; - [killPrefsTask setLaunchPath:@"/bin/bash"]; - [killPrefsTask setArguments:@[ @"killall", @"cfprefsd"]]; - [killPrefsTask launch]; - [killPrefsTask waitUntilExit]; - - NSTask *respringTask = [[NSTask alloc] init]; - [respringTask setLaunchPath:@"/bin/bash"]; - [respringTask setArguments:@[ @"sbreload"]]; - [respringTask launch]; - [respringTask waitUntilExit]; UIAlertController * finishedRestoreAlert= [UIAlertController alertControllerWithTitle:@"Restoring from backup" @@ -131,6 +112,30 @@ NSString *backupNameSelected; preferredStyle:UIAlertControllerStyleAlert]; [self presentViewController:finishedRestoreAlert animated:YES completion:nil]; + //RUN RESTORE SCRIPT + + NSLog(@"Running script"); + NSTask *restoreTask = [[NSTask alloc] init]; + [restoreTask setLaunchPath:@"/bin/bash"]; + [restoreTask setArguments:@[ @"FBRestore", backupNameSelected, stringTweaksEnabled, stringIconsEnabled, stringWallpaperEnabled]]; + [restoreTask launch]; + [restoreTask waitUntilExit]; + + /*NSLog(@"killing xenhtml prefs"); + NSTask *killPrefsTask = [[NSTask alloc] init]; + [killPrefsTask setLaunchPath:@"/bin/bash"]; + [killPrefsTask setArguments:@[ @"killall", @"cfprefsd"]]; + [killPrefsTask launch]; + [killPrefsTask waitUntilExit];*/ + + NSLog(@"time to respring"); + NSTask *respringTask = [[NSTask alloc] init]; + [respringTask setLaunchPath:@"/bin/bash"]; + [respringTask setArguments:@[ @"killall", @"backboardd"]]; + [respringTask launch]; + [respringTask waitUntilExit]; + + [restoreBackupAlert dismissViewControllerAnimated:YES completion:nil]; }];