fixes for sk20

graphiclife · graphiclife · commit bb40b892cc4d · 2013-12-10T13:35:11.000+01:00
diff --git a/Common/Classes/HKCacheManager.h b/Common/Classes/HKCacheManager.h
@@ -41,6 +41,7 @@ typedef void (^HKCacheManagerProgressHandler)( double progress );
 	sqlite3			   *_database;
 	sqlite3_stmt	   *_select;
 	sqlite3_stmt	   *_insert;
+	sqlite3_stmt	   *_update;
 	sqlite3_stmt	   *_selectIdentifiers;
 	dispatch_queue_t	_queue;
 
diff --git a/Common/Classes/HKCacheManager.m b/Common/Classes/HKCacheManager.m
@@ -186,6 +186,24 @@ - (NSData *)cachedDataWithIdentifier:(NSString *)identifier
     return retval;
 }
 
+- (void)clearFastCacheForIdentifier:(NSString *)identifier
+{
+    NSNumber    *csize;
+    NSUInteger   index = [_fastcacheIdentifiers indexOfObject:identifier];
+    
+    if ( index == NSNotFound )
+        return;
+    
+    csize = [_fastcacheSizes objectAtIndex:index];
+        
+    [_fastcache removeObjectForKey:identifier];
+    
+    _fastcacheSize -= [csize unsignedIntegerValue];
+    
+    [_fastcacheIdentifiers removeObjectAtIndex:index];
+    [_fastcacheSizes removeObjectAtIndex:index];
+}
+
 - (void)cacheData:(NSData *)data withIdentifier:(NSString *)identifier
 {
     if ( identifier == nil )
@@ -203,17 +221,34 @@ - (void)cacheData:(NSData *)data withIdentifier:(NSString *)identifier
     const int cdlength = (int)[data length];
     
     dispatch_sync( _queue, ^ {
-        sqlite3_bind_text( _insert, 1, cidentifier, cilength, NULL );
-        sqlite3_bind_blob( _insert, 2, cdata, cdlength, NULL );
+        sqlite3_bind_blob( _update, 1, cdata, cdlength, NULL );
+        sqlite3_bind_text( _update, 2, cidentifier, cilength, NULL );
+        
+        sqlite3_step( _update );
+        sqlite3_reset( _update );
         
-        if ( sqlite3_step( _insert ) == SQLITE_DONE )
+        if ( sqlite3_changes( _database ) > 0 )
         {
 #ifdef HK_DEBUG_CACHE
-            NSLog(@"HKCacheManager->Successfully saved cache with identifier: %@", identifier);
+            NSLog(@"HKCacheManager->Successfully updated cache with identifier: %@", identifier);
 #endif
         }
+        else
+        {
+            sqlite3_bind_text( _insert, 1, cidentifier, cilength, NULL );
+            sqlite3_bind_blob( _insert, 2, cdata, cdlength, NULL );
+            
+            if ( sqlite3_step( _insert ) == SQLITE_DONE )
+            {
+#ifdef HK_DEBUG_CACHE
+                NSLog(@"HKCacheManager->Successfully saved cache with identifier: %@", identifier);
+#endif
+            }
+            
+            sqlite3_reset( _insert );
+        }
         
-        sqlite3_reset( _insert );
+        [self clearFastCacheForIdentifier:identifier];
     });
     
 #ifdef HK_DEBUG_CACHE
@@ -230,14 +265,12 @@ - (void)cacheURL:(NSURL *)url completionHandler:(HKCacheManagerCompletionHandler
 
 - (void)cacheURL:(NSURL *)url identifier:(NSString *)identifier progressHandler:(HKCacheManagerProgressHandler)progressHandler completionHandler:(HKCacheManagerCompletionHandler)completionHandler
 {
-    dispatch_queue_t cqueue = dispatch_get_current_queue();
-
     dispatch_async( dispatch_get_global_queue( DISPATCH_QUEUE_PRIORITY_DEFAULT, 0 ), ^ {
         HKURLOperation *operation = [[HKURLOperation alloc] initWithURL:url
                                                         progressHandler:^( double progress ) {
                                                             if ( progressHandler != nil )
                                                             {
-                                                                dispatch_async( cqueue, ^{
+                                                                dispatch_async( dispatch_get_main_queue(), ^{
                                                                     progressHandler( progress ); 
                                                                 });
                                                             }
@@ -254,13 +287,13 @@ - (void)cacheURL:(NSURL *)url identifier:(NSString *)identifier progressHandler:
                                                               
                                                               [self cacheData:data withIdentifier:sid];
                                                               
-                                                              dispatch_async( cqueue, ^{
+                                                              dispatch_async( dispatch_get_main_queue(), ^{
                                                                   completionHandler( YES, sid, nil );
                                                               });
                                                           }
                                                           else
                                                           {
-                                                              dispatch_async( cqueue, ^{
+                                                              dispatch_async( dispatch_get_main_queue(), ^{
                                                                   completionHandler( NO, nil, error );
                                                               });
                                                           }
@@ -420,6 +453,19 @@ - (BOOL)setup
             {
 #ifdef HK_DEBUG_CACHE
                 NSLog(@"HKCacheManager->Error: 'Couldn't create database data insert statement!'");
+#endif
+                return NO;
+            }
+            
+            if ( _update )
+            {
+                sqlite3_finalize( _update ); _update = nil;
+            }
+            
+            if ( sqlite3_prepare_v2( _database, "UPDATE cache SET data = ? WHERE identifier = ?", -1, &_update, NULL ) != SQLITE_OK )
+            {
+#ifdef HK_DEBUG_CACHE
+                NSLog(@"HKCacheManager->Error: 'Couldn't create database data update statement!'");
 #endif
                 return NO;
             }
diff --git a/Common/Classes/HKDataStore.m b/Common/Classes/HKDataStore.m
@@ -352,7 +352,7 @@ - (NSManagedObjectContext *)detachNewContext
     if ( _detached == nil )
         _detached = [[NSMutableSet alloc] init];
 
-    NSManagedObjectContext *context = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
+    NSManagedObjectContext *context = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
 
     [context setPersistentStoreCoordinator:_coordinator];
     [context setMergePolicy:[_context mergePolicy]];
@@ -462,7 +462,7 @@ - (void)setup
 
     if ( _context == nil )
     {
-        _context = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
+        _context = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
 
         [_context setPersistentStoreCoordinator:_coordinator];
 
diff --git a/Common/Classes/HKHook.m b/Common/Classes/HKHook.m
@@ -112,7 +112,7 @@ - (void)setQueue:(dispatch_queue_t)value
 void HKHookRegister ( const char *hook, id object, id registrant, HKHookHandler handler )
 {
     NSMutableDictionary *hooks = objc_getAssociatedObject( object, &gHKHookKey );
-    HKHook              *h = [HKHook hookWithHook:hook handler:handler queue:dispatch_get_current_queue() registrant:registrant];
+    HKHook              *h = [HKHook hookWithHook:hook handler:handler queue:dispatch_get_main_queue() registrant:registrant];
     NSString            *key = [NSString stringWithFormat:@"%s_%p", hook, registrant];
     
     if ( hooks == nil )
diff --git a/Common/Classes/HKRESTAPI.h b/Common/Classes/HKRESTAPI.h
@@ -25,7 +25,7 @@
 #import <Foundation/Foundation.h>
 
 #ifdef HK_DEBUG
-# define HK_DEBUG_REST_API
+// # define HK_DEBUG_REST_API
 # ifdef HK_DEBUG_REST_API
 #  define HK_DEBUG_REST_API_PROFILE
 #  define HK_DEBUG_REST_API_DATA
diff --git a/Common/Classes/HKRESTAPI.m b/Common/Classes/HKRESTAPI.m
@@ -37,8 +37,6 @@ - (id)resultForData:(NSData *)data error:(NSError **)error
 
 @end
 
-#import "JSONKit.h"
-
 @implementation HKRESTAPIJSONResultAdapter
 
 - (id)resultForData:(NSData *)data error:(NSError **)error
@@ -47,11 +45,7 @@ - (id)resultForData:(NSData *)data error:(NSError **)error
   
     if ( [data length] > 0 )
     {
-        JSONDecoder *decoder = [[JSONDecoder alloc] initWithParseOptions:JKParseOptionNone];
-        
-        retval = [decoder objectWithData:data error:error];
-        
-        [decoder release];
+        retval = [NSJSONSerialization JSONObjectWithData:data options:0 error:error];
     }
     
     return retval;
diff --git a/iOS/Classes/HKFormController.m b/iOS/Classes/HKFormController.m
@@ -279,15 +279,15 @@ - (IBAction)handleDone:(id)sender
     
     if ( [self ensureRequiredFieldsFilled] )
     {
-        [self.parentViewController dismissModalViewControllerAnimated:YES];
+        [self.parentViewController dismissViewControllerAnimated:YES completion:nil];
     
         [[NSNotificationCenter defaultCenter] postNotificationName:HK_FORM_NOTIFICATION_DONE_EDITING object:self];
     }
 }
 
 - (IBAction)handleCancel:(id)sender
 {
-    [self.parentViewController dismissModalViewControllerAnimated:YES];
+    [self.parentViewController dismissViewControllerAnimated:YES completion:nil];
     
     [[NSNotificationCenter defaultCenter] postNotificationName:HK_FORM_NOTIFICATION_CANCELED_EDITING object:self];
 }
diff --git a/iOS/Classes/HKFormTableViewCell.m b/iOS/Classes/HKFormTableViewCell.m
@@ -40,12 +40,12 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
 		self.formSeparator.backgroundColor = [UIColor lightGrayColor];
 		
 		self.formLabel = [[[UILabel alloc] initWithFrame:flf] autorelease];
-		self.formLabel.textAlignment = UITextAlignmentRight;
+		self.formLabel.textAlignment = NSTextAlignmentRight;
 		self.formLabel.textColor = [UIColor colorWithRed:(56.0 / 255.0) green:(77.0 / 255.0) blue:(130.0 / 255.0) alpha:1.0];
 		self.formLabel.backgroundColor = [UIColor clearColor];
 		self.formLabel.font = [UIFont boldSystemFontOfSize:14.0];
 		self.formLabel.numberOfLines = 0;
-		self.formLabel.lineBreakMode = UILineBreakModeWordWrap;
+		self.formLabel.lineBreakMode = NSLineBreakByWordWrapping;
 		
 		self.formField = [[[UITextField alloc] initWithFrame:fff] autorelease];
 		self.formField.font = [UIFont boldSystemFontOfSize:14.0];

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ - (void)setQueue:(dispatch_queue_t)value`
`112`	`112`	`void HKHookRegister ( const char *hook, id object, id registrant, HKHookHandler handler )`
`113`	`113`	`{`
`114`	`114`	`NSMutableDictionary *hooks = objc_getAssociatedObject( object, &gHKHookKey );`
`115`		`- HKHook *h = [HKHook hookWithHook:hook handler:handler queue:dispatch_get_current_queue() registrant:registrant];`
	`115`	`+ HKHook *h = [HKHook hookWithHook:hook handler:handler queue:dispatch_get_main_queue() registrant:registrant];`
`116`	`116`	`NSString *key = [NSString stringWithFormat:@"%s_%p", hook, registrant];`
`117`	`117`
`118`	`118`	`if ( hooks == nil )`
Original file line number	Diff line number	Diff line change
`@@ -279,15 +279,15 @@ - (IBAction)handleDone:(id)sender`
`279`	`279`
`280`	`280`	`if ( [self ensureRequiredFieldsFilled] )`
`281`	`281`	`{`
`282`		`- [self.parentViewController dismissModalViewControllerAnimated:YES];`
	`282`	`+ [self.parentViewController dismissViewControllerAnimated:YES completion:nil];`
`283`	`283`
`284`	`284`	`[[NSNotificationCenter defaultCenter] postNotificationName:HK_FORM_NOTIFICATION_DONE_EDITING object:self];`
`285`	`285`	`}`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`- (IBAction)handleCancel:(id)sender`
`289`	`289`	`{`
`290`		`- [self.parentViewController dismissModalViewControllerAnimated:YES];`
	`290`	`+ [self.parentViewController dismissViewControllerAnimated:YES completion:nil];`
`291`	`291`
`292`	`292`	`[[NSNotificationCenter defaultCenter] postNotificationName:HK_FORM_NOTIFICATION_CANCELED_EDITING object:self];`
`293`	`293`	`}`