Use app group for shared user defaults, fixes #2

D-32 · D-32 · commit e5a3b4ee85ea · 2014-10-19T22:34:03.000+02:00
diff --git a/BitStore.xcodeproj/project.pbxproj b/BitStore.xcodeproj/project.pbxproj
@@ -985,8 +985,8 @@
 			projectRoot = "";
 			targets = (
 				03584666194F09A900521709 /* BitStore */,
-				03AC8C6D199511BE00E901E2 /* BitStore Tests */,
 				9AAAC41B19D092FD00994EB6 /* BitStoreToday */,
+				03AC8C6D199511BE00E901E2 /* BitStore Tests */,
 			);
 		};
 /* End PBXProject section */
@@ -1345,8 +1345,8 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				BUNDLE_NAME = com.dylanmarriott.BitStore;
 				CODE_SIGN_ENTITLEMENTS = BitStore/BitStore.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Dylan Marriott (W5F5B94GXS)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Dylan Marriott (W5F5B94GXS)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "BitStore/BitStore-Prefix.pch";
@@ -1371,7 +1371,7 @@
 					"$(inherited)",
 				);
 				PRODUCT_NAME = BitStore;
-				PROVISIONING_PROFILE = "bee4a859-9af2-4a1c-a294-fe0bee76faf1";
+				PROVISIONING_PROFILE = "";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
diff --git a/BitStore.xcodeproj/xcshareddata/xcschemes/BitStoreToday.xcscheme b/BitStore.xcodeproj/xcshareddata/xcschemes/BitStoreToday.xcscheme
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0600"
+   wasCreatedForAppExtension = "YES"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9AAAC41B19D092FD00994EB6"
+               BuildableName = "BitStoreToday.appex"
+               BlueprintName = "BitStoreToday"
+               ReferencedContainer = "container:BitStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "03584666194F09A900521709"
+               BuildableName = "BitStore.app"
+               BlueprintName = "BitStore"
+               ReferencedContainer = "container:BitStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9AAAC41B19D092FD00994EB6"
+            BuildableName = "BitStoreToday.appex"
+            BlueprintName = "BitStoreToday"
+            ReferencedContainer = "container:BitStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "03584666194F09A900521709"
+            BuildableName = "BitStore.app"
+            BlueprintName = "BitStore"
+            ReferencedContainer = "container:BitStore.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "03584666194F09A900521709"
+            BuildableName = "BitStore.app"
+            BlueprintName = "BitStore"
+            ReferencedContainer = "container:BitStore.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/BitStore/BitStore.entitlements b/BitStore/BitStore.entitlements
@@ -3,7 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.application-groups</key>
-	<array/>
+	<array>
+		<string>group.bitstore</string>
+	</array>
 	<key>keychain-access-groups</key>
 	<array>
 		<string>$(AppIdentifierPrefix)com.dylanmarriott.BitStore</string>
diff --git a/BitStore/Controller/AppStart.m b/BitStore/Controller/AppStart.m
@@ -63,10 +63,6 @@ + (void)setupStorage {
     if ([UserDefaults instance].userId == nil) {
         [UserDefaults instance].userId = [[NSUUID UUID] UUIDString];
     }
-    
-    if ([UserDefaults instance].sharedUser == nil) {
-        [UserDefaults instance].sharedUser = [[SharedUser alloc] init];
-    }
 }
 
 + (void)setupKeychain {
diff --git a/BitStore/Helper/ExchangeHelper.m b/BitStore/Helper/ExchangeHelper.m
@@ -52,10 +52,9 @@ - (void)changeCurreny:(NSString *)currency {
     _exchange.complete = NO;
     
     // update shared user
-    SharedUser* user = [UserDefaults instance].sharedUser;
+    SharedUser* user = [[SharedUser alloc] init];
     user.todayCurrency = currency;
     user.cachedPrice = nil;
-    [UserDefaults instance].sharedUser = user;
     
     [self storeState];
     [self notifyListeners];
diff --git a/BitStore/Helper/UserDefaults.h b/BitStore/Helper/UserDefaults.h
@@ -11,7 +11,6 @@
 @class Exchange;
 @class Address;
 @class ContactList;
-@class SharedUser;
 
 @interface UserDefaults : NSObject
 
@@ -29,7 +28,6 @@
 @property (nonatomic) BOOL buyShowed;
 @property (nonatomic) BOOL buyDismissed;
 @property (nonatomic) NSString* customerId;
-@property (nonatomic) SharedUser* sharedUser;
 
 + (UserDefaults *)instance;
 - (void)reset;
diff --git a/BitStore/Helper/UserDefaults.m b/BitStore/Helper/UserDefaults.m
@@ -10,7 +10,6 @@
 #import "Exchange.h"
 #import "Address.h"
 #import "ContactList.h"
-#import "SharedUser.h"
 
 @implementation UserDefaults {
     NSUserDefaults* _defaults;
@@ -171,15 +170,6 @@ - (void)setCustomerId:(NSString *)customerId {
     [_defaults synchronize];
 }
 
-// SharedUser
-- (SharedUser *)sharedUser {
-    return (SharedUser *)[self codableObjectForKey:@"sharedUser"];
-}
-
-- (void)setSharedUser:(SharedUser *)sharedUser {
-    [self setCodableObject:sharedUser forKey:@"sharedUser"];
-}
-
 #pragma mark -
 - (void)reset {
 	NSString* domain = [[NSBundle mainBundle] bundleIdentifier];
diff --git a/BitStore/Model/SharedUser.h b/BitStore/Model/SharedUser.h
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
-@interface SharedUser : NSObject <NSCoding>
+@interface SharedUser : NSObject
 
 @property (nonatomic) NSString* todayCurrency;
 @property (nonatomic) NSNumber* cachedPrice;
diff --git a/BitStore/Model/SharedUser.m b/BitStore/Model/SharedUser.m
@@ -9,30 +9,38 @@
 #import "SharedUser.h"
 #import "UserDefaults.h"
 
-@implementation SharedUser
+@implementation SharedUser {
+    NSUserDefaults* _defaults;
+}
 
 - (id)init {
     if (self = [super init]) {
-        self.todayCurrency = @"USD";
+        _defaults = [[NSUserDefaults alloc] initWithSuiteName:@"group.bitstore"];
     }
     return self;
 }
 
-- (id)initWithCoder:(NSCoder *)aDecoder {
-    if (self = [super init]) {
-        self.todayCurrency = [aDecoder decodeObjectForKey:@"todayCurrency"];
-        self.cachedPrice = [aDecoder decodeObjectForKey:@"cachedPrice"];
+- (NSString *)todayCurrency {
+    NSString* ret = [_defaults stringForKey:@"todayCurrency"];
+    if (!ret) {
+        ret = @"USD";
+        [self setTodayCurrency:ret];
     }
-    return self;
+    return ret;
+}
+
+- (void)setTodayCurrency:(NSString *)todayCurrency {
+    [_defaults setObject:todayCurrency forKey:@"todayCurrency"];
+    [_defaults synchronize];
 }
 
-- (void)encodeWithCoder:(NSCoder *)encoder {
-    [encoder encodeObject:self.todayCurrency forKey:@"todayCurrency"];
-    [encoder encodeObject:self.cachedPrice forKey:@"cachedPrice"];
+- (NSNumber *)cachedPrice {
+    return [_defaults objectForKey:@"cachedPrice"];
 }
 
-- (NSString *)description {
-    return [NSString stringWithFormat:@"currency: %@", self.todayCurrency];
+- (void)setCachedPrice:(NSNumber *)cachedPrice {
+    [_defaults setObject:cachedPrice forKey:@"cachedPrice"];
+    [_defaults synchronize];
 }
 
 @end
diff --git a/BitStoreToday/BitStoreToday.entitlements b/BitStoreToday/BitStoreToday.entitlements
@@ -3,6 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.application-groups</key>
-	<array/>
+	<array>
+		<string>group.bitstore</string>
+	</array>
 </dict>
 </plist>
diff --git a/BitStoreToday/TodayViewController.m b/BitStoreToday/TodayViewController.m
@@ -16,11 +16,13 @@ @interface TodayViewController () <NCWidgetProviding>
 @end
 
 @implementation TodayViewController {
+    SharedUser* _user;
     UILabel* _priceLabel;
 }
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    _user = [[SharedUser alloc] init];
     self.preferredContentSize = CGSizeMake(200, 64);
 }
 
@@ -80,16 +82,15 @@ - (void)actionReceive:(id)sender {
 }
 
 - (void)updatePriceLabel {
-    SharedUser* user = [self user];
-    if (user.cachedPrice) {
-        _priceLabel.text = [NSString stringWithFormat:@"%.0f %@", [user.cachedPrice floatValue], user.todayCurrency];
+    if (_user.cachedPrice) {
+        _priceLabel.text = [NSString stringWithFormat:@"%.0f %@", [_user.cachedPrice floatValue], _user.todayCurrency];
     } else {
         _priceLabel.text = NSLocalizedString(@"loading", nil);
     }
 }
 
 - (void)widgetPerformUpdateWithCompletionHandler:(void (^)(NCUpdateResult))completionHandler {
-    NSString* url = [NSString stringWithFormat:@"https://api.bitcoinaverage.com/ticker/global/%@", [self user].todayCurrency];
+    NSString* url = [NSString stringWithFormat:@"https://api.bitcoinaverage.com/ticker/global/%@", _user.todayCurrency];
     NSURLRequest* request = [[NSURLRequest alloc] initWithURL:[NSURL URLWithString:url]];
     [NSURLConnection sendAsynchronousRequest:request queue:[NSOperationQueue mainQueue]
                            completionHandler:^(NSURLResponse *response,
@@ -100,9 +101,7 @@ - (void)widgetPerformUpdateWithCompletionHandler:(void (^)(NCUpdateResult))compl
                                    NSError* jsonError;
                                    NSDictionary* json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
                                    if (!jsonError) {
-                                       SharedUser* user = [self user];
-                                       user.cachedPrice = [json objectForKey:@"last"];
-                                       [self saveUser:user];
+                                       _user.cachedPrice = [json objectForKey:@"last"];
                                        [self updatePriceLabel];
                                        completionHandler(NCUpdateResultNewData);
                                    } else {
@@ -118,24 +117,4 @@ - (UIEdgeInsets)widgetMarginInsetsForProposedMarginInsets:(UIEdgeInsets)defaultM
     return newInsets;
 }
 
-- (NSUserDefaults *)userDefaults {
-    return [[NSUserDefaults alloc]initWithSuiteName:@"com.dylanmarriott.BitStore"];
-}
-
-- (SharedUser *)user {
-    NSData* data = [[self userDefaults] objectForKey:@"sharedUser"];
-    SharedUser* user = [NSKeyedUnarchiver unarchiveObjectWithData:data];
-    if (!user) {
-        user = [[SharedUser alloc] init];
-        [self saveUser:user];
-    }
-    return user;
-}
-
-- (void)saveUser:(SharedUser *)user {
-    NSData* encoded = [NSKeyedArchiver archivedDataWithRootObject:user];
-    [[self userDefaults] setObject:encoded forKey:@"sharedUser"];
-    [[self userDefaults] synchronize];
-}
-
 @end

Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,6 @@ + (void)setupStorage {`
`63`	`63`	`if ([UserDefaults instance].userId == nil) {`
`64`	`64`	`[UserDefaults instance].userId = [[NSUUID UUID] UUIDString];`
`65`	`65`	`}`
`66`		`-`
`67`		`- if ([UserDefaults instance].sharedUser == nil) {`
`68`		`- [UserDefaults instance].sharedUser = [[SharedUser alloc] init];`
`69`		`- }`
`70`	`66`	`}`
`71`	`67`
`72`	`68`	`+ (void)setupKeychain {`