Move hardcoded keys array to User class

Author: afarber

MyAuth/MyAuth/MasterViewController.h

@@ -1,5 +1,4 @@
 #import <UIKit/UIKit.h>
 
 @interface MasterViewController : UITableViewController
-
 @end

MyAuth/MyAuth/MasterViewController.m

@@ -10,7 +10,6 @@
 
 @interface MasterViewController () {
     NSDictionary *_menu;
-    NSArray *_keys;
 }
 @end
 
@@ -20,8 +19,6 @@ - (void)awakeFromNib
 {
     [super awakeFromNib];
 
-    _keys = @[kFB, kGG, kMR, kOK, kVK];
-        
     _menu = @{
               kFB:  @{
                       kKey:      kFB,
@@ -71,14 +68,14 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    return _keys.count;
+    return [[User keys] count];
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Cell" forIndexPath:indexPath];
 
-    NSString *key = _keys[indexPath.row];
+    NSString *key = [User keys][indexPath.row];
     NSString *label = _menu[key][kLabel];
     cell.textLabel.text = label;
     return cell;
@@ -87,7 +84,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     [tableView deselectRowAtIndexPath:indexPath animated:NO];
-    NSString *key = _keys[indexPath.row];
+    NSString *key = [User keys][indexPath.row];
     NSLog(@"%s: key=%@", __PRETTY_FUNCTION__, key);
     [User saveDefaultKey:key];
     User* user = [User loadForKey:key];

MyAuth/MyAuth/User.h

@@ -13,6 +13,7 @@
 -(void)save;
 -(void)reset;
 
++(NSArray*)keys;
 +(User*)load;
 +(User*)loadForKey:(NSString*)key;
 +(void)saveDefaultKey:(NSString*)key;

MyAuth/MyAuth/User.m

@@ -1,6 +1,6 @@
 #import "User.h"
+#import "SocialNetwork.h"
 
-static NSString* const kKey       = @"key";
 static NSString* const kUserId    = @"userId";
 static NSString* const kFirstName = @"firstName";
 static NSString* const kLastName  = @"lastName";
@@ -52,11 +52,23 @@ -(void)reset
     [defaults synchronize];
 }
 
++(NSArray*)keys
+{
+    static NSArray *_keys;
+    static dispatch_once_t token;
+    
+    dispatch_once(&token, ^{
+        _keys = @[kFB, kGG, kMR, kOK, kVK];
+    });
+    
+    return _keys;
+}
+
 +(User*)load
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSString *key = [defaults objectForKey:kKey];
-    if (!key)
+    if ([[User keys] containsObject:key] == NO)
         return nil;
 
     NSData *archived = [defaults objectForKey:key];
@@ -70,7 +82,7 @@ +(User*)load
 +(User*)loadForKey:(NSString*)key
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    if (!key)
+    if ([[User keys] containsObject:key] == NO)
         return nil;
 
     NSData *archived = [defaults objectForKey:key];