Skip to content

Commit

Permalink
Formatting and conditional statement changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielamitay
danielamitay committed Dec 7, 2013
1 parent f9fb9d6 commit a998fd0
Showing 1 changed file with 76 additions and 94 deletions.
170 changes: 76 additions & 94 deletions iHasApp/iHasApp.m
View file
Expand Up @@ -52,14 +52,14 @@ - (void)detectAppIdsWithIncremental:(void (^)(NSArray *appIds))incrementalBlock
incrementalBlock(incrementalAppIds.allKeys);
});
}
/* Unhappy with this implementation */
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.1f * NSEC_PER_SEC),
dispatch_get_main_queue(), ^{
if (operationQueue.operationCount == 0 && successBlock && !successBlockExecuted) {
successBlockExecuted = TRUE;
successBlock(successfulAppIds.allKeys);
}
});
// Unhappy with this implementation
dispatch_time_t delay = dispatch_time(DISPATCH_TIME_NOW, 0.1f * NSEC_PER_SEC);
dispatch_after(delay, dispatch_get_main_queue(), ^{
if (operationQueue.operationCount == 0 && successBlock && !successBlockExecuted) {
successBlockExecuted = TRUE;
successBlock(successfulAppIds.allKeys);
}
});
}];
}
} failure:failureBlock];
Expand All @@ -74,36 +74,36 @@ - (void)detectAppDictionariesWithIncremental:(void (^)(NSArray *appDictionaries)
__block NSInteger netAppIncrements = 0;
NSMutableArray *successfulAppDictionaries = [[NSMutableArray alloc] init];
[self detectAppIdsWithIncremental:^(NSArray *appIds) {
netAppIncrements += 1;
netAppIncrements++;
[self retrieveAppDictionariesForAppIds:appIds
withSuccess:^(NSArray *appDictionaries) {
[successfulAppDictionaries addObjectsFromArray:appDictionaries];
incrementalBlock(appDictionaries);
netAppIncrements -= 1;
/* Unhappy with this implementation */
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.1f * NSEC_PER_SEC),
dispatch_get_main_queue(), ^{
if (appIdDetectionComplete &&
!netAppIncrements &&
successBlock &&
!successBlockExecuted) {
successBlockExecuted = TRUE;
successBlock(successfulAppDictionaries);
}
});
netAppIncrements--;
// Unhappy with this implementation
dispatch_time_t delay = dispatch_time(DISPATCH_TIME_NOW, 0.1f * NSEC_PER_SEC);
dispatch_after(delay, dispatch_get_main_queue(), ^{
if (appIdDetectionComplete &&
!netAppIncrements &&
successBlock &&
!successBlockExecuted) {
successBlockExecuted = TRUE;
successBlock(successfulAppDictionaries);
}
});
} withFailure:^(NSError *error) {
netAppIncrements -= 1;
/* Unhappy with this implementation */
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.1f * NSEC_PER_SEC),
dispatch_get_main_queue(), ^{
if (appIdDetectionComplete &&
!netAppIncrements &&
successBlock &&
!successBlockExecuted) {
successBlockExecuted = TRUE;
successBlock(successfulAppDictionaries);
}
});
netAppIncrements--;
// Unhappy with this implementation
dispatch_time_t delay = dispatch_time(DISPATCH_TIME_NOW, 0.1f * NSEC_PER_SEC);
dispatch_after(delay, dispatch_get_main_queue(), ^{
if (appIdDetectionComplete &&
!netAppIncrements &&
successBlock &&
!successBlockExecuted) {
successBlockExecuted = TRUE;
successBlock(successfulAppDictionaries);
}
});
}];
} withSuccess:^(NSArray *appIds) {
appIdDetectionComplete = TRUE;
Expand Down Expand Up @@ -132,35 +132,30 @@ - (void)retrieveAppDictionariesForAppIds:(NSArray *)appIds
NSData *result = [NSURLConnection sendSynchronousRequest:request
returningResponse:&response
error:&connectionError];
if (connectionError) {
if (failureBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
failureBlock(connectionError);
});
}
if (connectionError && failureBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
failureBlock(connectionError);
});
} else {
NSError *jsonError = nil;
NSDictionary *jsonDictionary = [NSJSONSerialization JSONObjectWithData:result
options:NSJSONReadingMutableLeaves
error:&jsonError];
if (jsonError) {
if (failureBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
failureBlock(jsonError);
});
}
} else {
if (successBlock) {
NSArray *results = [jsonDictionary objectForKey:@"results"];
dispatch_async(dispatch_get_main_queue(), ^{
successBlock(results);
});
}
if (jsonError && failureBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
failureBlock(jsonError);
});
} else if (successBlock) {
NSArray *results = [jsonDictionary objectForKey:@"results"];
dispatch_async(dispatch_get_main_queue(), ^{
successBlock(results);
});
}
}
});
}


#pragma mark - Internal methods

- (void)retrieveSchemeAppsDictionaryWithSuccess:(void (^)(NSDictionary *schemeAppsDictionary))successBlock
Expand All @@ -176,40 +171,32 @@ - (void)retrieveSchemeAppsDictionaryFromLocalWithSuccess:(void (^)(NSDictionary
dispatch_async(retrieval_thread, ^{
NSBundle *selfBundle = [NSBundle bundleForClass:[self class]];
NSString *appSchemesDictionaryPath = [selfBundle pathForResource:@"schemeApps" ofType:@"json"];
if (!appSchemesDictionaryPath) {
if (failureBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
failureBlock(nil);
});
}
if (!appSchemesDictionaryPath && failureBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
failureBlock(nil);
});
} else {
NSError *dataError = nil;
NSData *schemeAppsData = [NSData dataWithContentsOfFile:appSchemesDictionaryPath
options:NSDataReadingMappedIfSafe
error:&dataError];
if (dataError) {
if (failureBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
failureBlock(dataError);
});
}
if (dataError && failureBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
failureBlock(dataError);
});
} else {
NSError *jsonError = nil;
NSDictionary *schemeAppsDictionary = [NSJSONSerialization JSONObjectWithData:schemeAppsData
options:NSJSONReadingMutableLeaves
error:&jsonError];
if (jsonError) {
if (failureBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
failureBlock(jsonError);
});
}
} else {
if (successBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
successBlock(schemeAppsDictionary);
});
}
if (jsonError && failureBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
failureBlock(jsonError);
});
} else if (successBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
successBlock(schemeAppsDictionary);
});
}
}
}
Expand All @@ -230,29 +217,23 @@ - (void)retrieveSchemeAppsDictionaryFromWebWithSuccess:(void (^)(NSDictionary *s
NSData *result = [NSURLConnection sendSynchronousRequest:request
returningResponse:&response
error:&connectionError];
if (connectionError) {
if (failureBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
failureBlock(connectionError);
});
}
if (connectionError && failureBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
failureBlock(connectionError);
});
} else {
NSError *jsonError = nil;
NSDictionary *schemeAppsDictionary = [NSJSONSerialization JSONObjectWithData:result
options:NSJSONReadingMutableLeaves
error:&jsonError];
if (jsonError) {
if (failureBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
failureBlock(jsonError);
});
}
} else {
if (successBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
successBlock(schemeAppsDictionary);
});
}
if (jsonError && failureBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
failureBlock(jsonError);
});
} else if (successBlock) {
dispatch_async(dispatch_get_main_queue(), ^{
successBlock(schemeAppsDictionary);
});
}
}
});
Expand All @@ -277,6 +258,7 @@ - (NSArray *)subarraysOfArray:(NSArray *)array withCount:(NSInteger)subarraySize
return arrayOfArrays;
}


#pragma mark - Property methods

- (NSString *)country {
Expand Down

0 comments on commit a998fd0

Please sign in to comment.