Skip to content

Commit

Permalink
change email and fix main threading (again, oops)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Samgisaninja
Samgisaninja committed Jan 26, 2020
1 parent 1bfff03 commit 598e3d7
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
4 changes: 2 additions & 2 deletions SuccessionRestore.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@
"$(inherited)",
"$(PROJECT_DIR)/SuccessionRestore",
);
MARKETING_VERSION = 1.4.9;
MARKETING_VERSION = 1.4.10;
PRODUCT_BUNDLE_IDENTIFIER = com.samgisaninja.SuccessionRestore;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -646,7 +646,7 @@
"$(inherited)",
"$(PROJECT_DIR)/SuccessionRestore",
);
MARKETING_VERSION = 1.4.9;
MARKETING_VERSION = 1.4.10;
PRODUCT_BUNDLE_IDENTIFIER = com.samgisaninja.SuccessionRestore;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
Binary file modified ...proj/project.xcworkspace/xcuserdata/samgardner.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion SuccessionRestore/DecryptViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ -(NSString *)getRFSKey{

} else {
// If the iOS version isn't in the dict above, then :rip:
[self errorAlert:[NSString stringWithFormat:@"Couldn't get codename for your iOS %@\nPlease email me [email protected] or dm me on reddit u/Samg_is_a_Ninja", _deviceBuild]];
[self errorAlert:[NSString stringWithFormat:@"Couldn't get codename for your iOS %@\nPlease email me [email protected] or dm me on reddit u/Samg_is_a_Ninja", _deviceBuild]];
return @"Failed.";
}
}
Expand Down
14 changes: 8 additions & 6 deletions SuccessionRestore/DownloadViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ -(NSString *)getRFSKey{

} else {
// If the iOS version isn't in the dict above, then :rip:
[self errorAlert:[NSString stringWithFormat:@"Couldn't get codename for your iOS %@\nPlease email me [email protected] or dm me on reddit u/Samg_is_a_Ninja", deviceBuild]];
[self errorAlert:[NSString stringWithFormat:@"Couldn't get codename for your iOS %@\nPlease email me [email protected] or dm me on reddit u/Samg_is_a_Ninja", deviceBuild]];
return @"Failed.";
}
}
Expand Down Expand Up @@ -378,15 +378,15 @@ - (void) URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTa
[task resume];
} else {
// if the device's model isn't in the beta list, then present an alert with an action to send an email to me requesting beta support
UIAlertController *requestBetaSupportAlert = [UIAlertController alertControllerWithTitle:@"Your device is not currently supported" message:@"Please send an email with your device model and iOS build number to [email protected] request support" preferredStyle:UIAlertControllerStyleAlert];
UIAlertController *requestBetaSupportAlert = [UIAlertController alertControllerWithTitle:@"Your device is not currently supported" message:@"Please send an email with your device model and iOS build number to [email protected] request support" preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:@"Dismiss" style:UIAlertActionStyleCancel handler:nil];
[requestBetaSupportAlert addAction:dismissAction];
// check to see if the device can send email using the stock mail app
if ([MFMailComposeViewController canSendMail]) {
UIAlertAction *sendMailAction = [UIAlertAction actionWithTitle:@"Send email" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
MFMailComposeViewController* composeVC = [[MFMailComposeViewController alloc] init];
composeVC.mailComposeDelegate = self;
[composeVC setToRecipients:@[@"[email protected]"]];
[composeVC setToRecipients:@[@"[email protected]"]];
[composeVC setSubject:@"Succession: Add beta support request"];
[composeVC setMessageBody:[NSString stringWithFormat:@"%@\n%@", self->deviceBuild, self->deviceModel] isHTML:NO];
[self presentViewController:composeVC animated:YES completion:nil];
Expand All @@ -396,14 +396,14 @@ - (void) URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTa
[self presentViewController:requestBetaSupportAlert animated:TRUE completion:nil];
}
} else {
UIAlertController *requestBetaSupportAlert = [UIAlertController alertControllerWithTitle:@"Your device is not currently supported" message:@"Please send an email with your device model and iOS build number to [email protected] request support" preferredStyle:UIAlertControllerStyleAlert];
UIAlertController *requestBetaSupportAlert = [UIAlertController alertControllerWithTitle:@"Your device is not currently supported" message:@"Please send an email with your device model and iOS build number to [email protected] request support" preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:@"Dismiss" style:UIAlertActionStyleCancel handler:nil];
[requestBetaSupportAlert addAction:dismissAction];
if ([MFMailComposeViewController canSendMail]) {
UIAlertAction *sendMailAction = [UIAlertAction actionWithTitle:@"Send email" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
MFMailComposeViewController* composeVC = [[MFMailComposeViewController alloc] init];
composeVC.mailComposeDelegate = self;
[composeVC setToRecipients:@[@"[email protected]"]];
[composeVC setToRecipients:@[@"[email protected]"]];
[composeVC setSubject:@"Succession: Add beta support request"];
[composeVC setMessageBody:[NSString stringWithFormat:@"%@\n%@", self->deviceBuild, self->deviceModel] isHTML:NO];
[self presentViewController:composeVC animated:YES completion:nil];
Expand Down Expand Up @@ -535,7 +535,9 @@ - (void) postDownload {
}];
[ipswDoesntMatch addAction:overrideAction];
[ipswDoesntMatch addAction:cancelAction];
[self presentViewController:ipswDoesntMatch animated:TRUE completion:nil];
dispatch_async(dispatch_get_main_queue(), ^{
[self presentViewController:ipswDoesntMatch animated:TRUE completion:nil];
});
}
}

Expand Down
2 changes: 1 addition & 1 deletion Template/DEBIAN/control
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: com.samgisaninja.successionrestore
Name: Succession
Version: 1.4.9
Version: 1.4.10
Architecture: iphoneos-arm
Description: Restore without updating via rootfilesystem DMG
Maintainer: Samg_is_a_Ninja
Expand Down

0 comments on commit 598e3d7

Please sign in to comment.