skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Improved cloud store enumeration.

Browse Source 
[ADDED]     Stores now enumerated in a TVC.
This commit is contained in:
Maarten Billemont
2013-09-07 10:08:49 -04:00
parent 0921796136
commit 8ea0f00cf0
3 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
External/Pearl vendored

Submodule External/Pearl updated: 41c3582a72...ea7054e328

2
External/UbiquityStoreManager vendored

Submodule External/UbiquityStoreManager updated: ebc094f4c1...5a19df087f

36
MasterPassword/ObjC/iOS/MPLogsViewController.m
View File

@@ -91,8 +91,8 @@
for (NSURL *content in contents) for (NSURL *content in contents)
if ([[NSFileManager defaultManager] fileExistsAtPath:content.path isDirectory:&directory] && directory) { if ([[NSFileManager defaultManager] fileExistsAtPath:content.path isDirectory:&directory] && directory) {
NSString *contentString = [content lastPathComponent]; NSString *contentString = [content lastPathComponent];
NSUInteger lastDash = [contentString rangeOfString:@"-" options:NSBackwardsSearch].location; NSUInteger firstDash = [contentString rangeOfString:@"-" options:0].location;
NSString *storeDescription = lastDash == NSNotFound? contentString: [contentString substringFromIndex:lastDash + 1]; NSString *storeDescription = firstDash == NSNotFound? contentString: [contentString substringToIndex:firstDash];
NSPersistentStore *store = nil; NSPersistentStore *store = nil;
@try { @try {
NSURL *storeURL = [[cloudStoreDirectory NSURL *storeURL = [[cloudStoreDirectory
@@ -135,27 +135,21 @@
} }
NSString *storeUUID = [[MPiOSAppDelegate get].storeManager valueForKey:@"storeUUID_ThreadSafe"]; NSString *storeUUID = [[MPiOSAppDelegate get].storeManager valueForKey:@"storeUUID_ThreadSafe"];
NSUInteger lastDash = [storeUUID rangeOfString:@"-" options:NSBackwardsSearch].location; NSUInteger firstDash = [storeUUID rangeOfString:@"-" options:0].location;
NSString *title = PearlString( @"Current: %@", lastDash == NSNotFound? storeUUID: [storeUUID substringFromIndex:lastDash + 1] ); PearlArrayTVC *vc = [[PearlArrayTVC alloc] initWithStyle:UITableViewStylePlain];
vc.title = PearlString( @"Current: %@", firstDash == NSNotFound? storeUUID: [storeUUID substringToIndex:firstDash] );
[stores enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
[vc addRowWithName:obj style:PearlArrayTVCRowStyleLink toggled:NO toSection:@"Cloud Stores"
activationBlock:^BOOL(BOOL wasToggled) {
[[MPiOSAppDelegate get].storeManager setValue:key forKey:@"storeUUID"];
[[MPiOSAppDelegate get].storeManager reloadStore];
[[MPiOSAppDelegate get] signOutAnimated:YES];
return YES;
}];
}];
dispatch_async( dispatch_get_main_queue(), ^{ dispatch_async( dispatch_get_main_queue(), ^{
[switchCloudStoreProgress cancelAlertAnimated:YES]; [switchCloudStoreProgress cancelAlertAnimated:YES];
[self.navigationController pushViewController:vc animated:YES];
NSArray *storeUUIDs = [stores allKeys];
[PearlSheet showSheetWithTitle:title viewStyle:UIActionSheetStyleAutomatic
initSheet:^(UIActionSheet *sheet) {
for (NSString *contentName in storeUUIDs)
[sheet addButtonWithTitle:[stores objectForKey:contentName]];
}
tappedButtonBlock:^(UIActionSheet *sheet, NSInteger buttonIndex) {
if (buttonIndex == sheet.cancelButtonIndex)
return;
[[MPiOSAppDelegate get].storeManager setValue:[storeUUIDs objectAtIndex:(unsigned)buttonIndex]
forKey:@"storeUUID"];
[[MPiOSAppDelegate get].storeManager reloadStore];
[[MPiOSAppDelegate get] signOutAnimated:YES];
}
cancelTitle:[PearlStrings get].commonButtonCancel destructiveTitle:nil otherTitles:nil];
} ); } );
} }