mirror of https://github.com/oxen-io/session-ios
Transitioning off custom preference files
Frederic Jacobs
11 years ago
parent
021468ff45
commit
9465423c72
@ -0,0 +1,15 @@
|
||||
//
|
||||
// VersionMigrations.h
|
||||
// Signal
|
||||
//
|
||||
// Created by Frederic Jacobs on 29/07/14.
|
||||
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
@interface VersionMigrations : NSObject
|
||||
|
||||
+ (void)migrationFrom1Dot0Dot2toLarger;
|
||||
|
||||
@end
|
||||
@ -0,0 +1,39 @@
|
||||
//
|
||||
// VersionMigrations.m
|
||||
// Signal
|
||||
//
|
||||
// Created by Frederic Jacobs on 29/07/14.
|
||||
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "VersionMigrations.h"
|
||||
|
||||
@implementation VersionMigrations
|
||||
|
||||
+ (void)migrationFrom1Dot0Dot2toLarger{
|
||||
// Read everything in preference file, drop into NSUserDefaults
|
||||
|
||||
NSString* documentsDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"/Documents/"];
|
||||
NSString *path = [NSString stringWithFormat:@"%@/%@.plist", documentsDirectory, @"RedPhone-Data"];
|
||||
|
||||
NSData *plistData = [NSData dataWithContentsOfFile:path];
|
||||
|
||||
NSString *error;
|
||||
NSPropertyListFormat format;
|
||||
NSDictionary *dict = [NSPropertyListSerialization propertyListFromData:plistData mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&error];
|
||||
|
||||
NSLog(@"%@", dict);
|
||||
NSArray *entries = [dict allKeys];
|
||||
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
|
||||
|
||||
for (NSUInteger i = 0; i < [entries count]; i++) {
|
||||
NSString *key = [entries objectAtIndex:i];
|
||||
[defaults setObject:[dict objectForKey:key] forKey:key];
|
||||
}
|
||||
|
||||
[defaults synchronize];
|
||||
|
||||
// delete
|
||||
}
|
||||
|
||||
@end
|
||||
@ -1,26 +0,0 @@
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
/**
|
||||
*
|
||||
* PreferenceListViewController displays a list of options and highlights a selected one indicated by selectedValueBlock.
|
||||
* When selected, the selected block is called and the value should be updated manually.
|
||||
*
|
||||
*/
|
||||
|
||||
typedef void (^SelectedBlock) (NSString *newValue);
|
||||
typedef NSString* (^GetSelectedValueBlock) ();
|
||||
|
||||
@interface PreferenceListViewController : UIViewController <UITableViewDataSource, UITableViewDelegate> {
|
||||
@private SelectedBlock selectedBlock;
|
||||
@private GetSelectedValueBlock getSelectedValueBlock;
|
||||
@private NSString *settingsValue;
|
||||
}
|
||||
|
||||
@property (nonatomic, strong) IBOutlet UITableView *optionTableView;
|
||||
@property (nonatomic, strong) NSArray *options;
|
||||
|
||||
+ (PreferenceListViewController *)preferenceListViewControllerForSelectedValue:(GetSelectedValueBlock)selectedValueBlock
|
||||
andOptions:(NSArray *)options
|
||||
andSelectedBlock:(SelectedBlock)block;
|
||||
|
||||
@end
|
||||
@ -1,67 +0,0 @@
|
||||
#import "Environment.h"
|
||||
#import "PreferencesUtil.h"
|
||||
#import "PreferenceListTableViewCell.h"
|
||||
#import "PreferenceListViewController.h"
|
||||
#import "Util.h"
|
||||
|
||||
static NSString *const PREFERENCE_LIST_TABLE_VIEW_CELL = @"PreferenceListTableViewCell";
|
||||
|
||||
@implementation PreferenceListViewController
|
||||
|
||||
+ (PreferenceListViewController *)preferenceListViewControllerForSelectedValue:(GetSelectedValueBlock)selectedValueBlock
|
||||
andOptions:(NSArray *)options
|
||||
andSelectedBlock:(SelectedBlock)block {
|
||||
require(selectedValueBlock != nil);
|
||||
require(block != nil);
|
||||
|
||||
PreferenceListViewController *vc = [PreferenceListViewController new];
|
||||
vc.options = options;
|
||||
vc->selectedBlock = block;
|
||||
vc->getSelectedValueBlock = selectedValueBlock;
|
||||
return vc;
|
||||
}
|
||||
|
||||
- (void)viewDidLoad {
|
||||
[super viewDidLoad];
|
||||
self.navigationController.navigationBar.barTintColor = [UIUtil darkBackgroundColor];
|
||||
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
|
||||
self.navigationController.navigationBar.translucent = NO;
|
||||
|
||||
settingsValue = getSelectedValueBlock();
|
||||
[_optionTableView reloadData];
|
||||
}
|
||||
|
||||
#pragma mark - UITableViewDelegate
|
||||
|
||||
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
|
||||
return (NSInteger)[_options count];
|
||||
}
|
||||
|
||||
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
|
||||
PreferenceListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:PREFERENCE_LIST_TABLE_VIEW_CELL];
|
||||
if (!cell) {
|
||||
cell = [[PreferenceListTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
|
||||
reuseIdentifier:PREFERENCE_LIST_TABLE_VIEW_CELL];
|
||||
}
|
||||
|
||||
if ([settingsValue isEqualToString:_options[(NSUInteger)indexPath.row]]) {
|
||||
cell.accessoryType = UITableViewCellAccessoryCheckmark;
|
||||
} else {
|
||||
cell.accessoryType = UITableViewCellAccessoryNone;
|
||||
}
|
||||
|
||||
NSString *date = _options[(NSUInteger)indexPath.row];
|
||||
cell.preferenceTextLabel.text = [date lowercaseString];
|
||||
|
||||
return cell;
|
||||
}
|
||||
|
||||
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
|
||||
[tableView deselectRowAtIndexPath:indexPath animated:YES];
|
||||
|
||||
selectedBlock(_options[(NSUInteger)indexPath.row]);
|
||||
settingsValue = getSelectedValueBlock();
|
||||
[_optionTableView reloadData];
|
||||
}
|
||||
|
||||
@end
|
||||
Loading…
Reference in New Issue