iOS: Got rid of device UID

client/iOS/Controllers/BookmarkGatewaySettingsController.h

@@ -0,0 +1,13 @@
+//
+//  BookmarkGatewaySettingsController.h
+//  FreeRDP
+//
+//  Created by Thinstuff Developer on 4/30/13.
+//
+//
+
+#import <UIKit/UIKit.h>
+
+@interface BookmarkGatewaySettingsController : UITableViewController
+
+@end

client/iOS/Controllers/BookmarkGatewaySettingsController.m

@@ -0,0 +1,122 @@
+//
+//  BookmarkGatewaySettingsController.m
+//  FreeRDP
+//
+//  Created by Thinstuff Developer on 4/30/13.
+//
+//
+
+#import "BookmarkGatewaySettingsController.h"
+
+@interface BookmarkGatewaySettingsController ()
+
+@end
+
+@implementation BookmarkGatewaySettingsController
+
+- (id)initWithStyle:(UITableViewStyle)style
+{
+    self = [super initWithStyle:style];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+
+    // Uncomment the following line to preserve selection between presentations.
+    // self.clearsSelectionOnViewWillAppear = NO;
+ 
+    // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
+    // self.navigationItem.rightBarButtonItem = self.editButtonItem;
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+#warning Potentially incomplete method implementation.
+    // Return the number of sections.
+    return 0;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+#warning Incomplete method implementation.
+    // Return the number of rows in the section.
+    return 0;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    static NSString *CellIdentifier = @"Cell";
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+    
+    // Configure the cell...
+    
+    return cell;
+}
+
+/*
+// Override to support conditional editing of the table view.
+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    // Return NO if you do not want the specified item to be editable.
+    return YES;
+}
+*/
+
+/*
+// Override to support editing the table view.
+- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (editingStyle == UITableViewCellEditingStyleDelete) {
+        // Delete the row from the data source
+        [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
+    }   
+    else if (editingStyle == UITableViewCellEditingStyleInsert) {
+        // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
+    }   
+}
+*/
+
+/*
+// Override to support rearranging the table view.
+- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath
+{
+}
+*/
+
+/*
+// Override to support conditional rearranging of the table view.
+- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    // Return NO if you do not want the item to be re-orderable.
+    return YES;
+}
+*/
+
+#pragma mark - Table view delegate
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    // Navigation logic may go here. Create and push another view controller.
+    /*
+     <#DetailViewController#> *detailViewController = [[<#DetailViewController#> alloc] initWithNibName:@"<#Nib name#>" bundle:nil];
+     // ...
+     // Pass the selected object to the new view controller.
+     [self.navigationController pushViewController:detailViewController animated:YES];
+     [detailViewController release];
+     */
+}
+
+@end

client/iOS/Controllers/EncryptionController.m

@@ -9,6 +9,7 @@
 
 #import "EncryptionController.h"
 #import "SFHFKeychainUtils.h"
+#import "TSXAdditions.h"
 
 @interface EncryptionController (Private)
 
@@ -109,7 +110,13 @@ static EncryptionController* _shared_encryption_controller = nil;
 
 - (NSString*)keychainDefaultPassword
 {
-    return [[UIDevice currentDevice] uniqueIdentifier];
+    NSString* password = [[NSUserDefaults standardUserDefaults] stringForKey:@"UUID"];
+    if ([password length] == 0)
+    {
+        password = [NSString stringWithUUID];
+        [[NSUserDefaults standardUserDefaults] setObject:password forKey:@"UUID"];
+    }
+    return password;
 }
 
 #pragma mark -