Invalid JSON fix

yo-han · Aug 9, 2013 · d7d58a2 · d7d58a2
1 parent 0adb060
commit d7d58a2
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/Traktable.xcodeproj/project.pbxproj b/Traktable.xcodeproj/project.pbxproj
@@ -661,7 +661,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/Traktable\"",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = Traktable;
 				WRAPPER_EXTENSION = app;
 			};
@@ -685,7 +685,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/Traktable\"",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = Traktable;
 				WRAPPER_EXTENSION = app;
 			};

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/johan.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/johan.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Traktable/AppDelegate.m b/Traktable/AppDelegate.m
@@ -46,7 +46,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
     _video = [[ITVideo alloc] init];
     _library = [[ITLibrary alloc] init];
 
-    if(![self.api testAccount]) {
+    if(![self.api username] || ![self.api testAccount]) {
 
         [self noAuthAlert];
         [self displayPreferences:self];

diff --git a/Traktable/ITApi.m b/Traktable/ITApi.m
@@ -187,9 +187,17 @@ - (NSDictionary *)callURLSync:(NSString *)requestUrl withParameters:(NSDictionar
 
     NSURLResponse *response = nil;
     NSData *data = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:nil];
-
-    NSDictionary *responseDict = [[SBJsonParser alloc] objectWithData:data];
 
+    id responseDict = nil;
+
+    responseDict = [[SBJsonParser alloc] objectWithData:data];
+
+    Class hasNSJSON = NSClassFromString(@"NSJSONSerialization");
+
+    if(hasNSJSON != nil) {
+        responseDict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
+    }
+
     return responseDict;
 }
 
@@ -217,7 +225,15 @@ - (void)callURL:(NSString *)requestUrl withParameters:(NSDictionary *)params com
             return;
         }
 
-        NSDictionary *responseDict = [[SBJsonParser alloc] objectWithData:data];
+        id responseDict = nil;
+
+        responseDict = [[SBJsonParser alloc] objectWithData:data];
+
+        Class hasNSJSON = NSClassFromString(@"NSJSONSerialization");
+
+        if(hasNSJSON != nil) {
+            responseDict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
+        }
 
         completionBlock(responseDict, nil);        
     });
@@ -251,7 +267,7 @@ - (BOOL)testAccount {
 
     NSString *url = [NSString stringWithFormat:@"%@/account/test/%@", kApiUrl, [self apiKey]];
     NSDictionary *data = [self callURLSync:url withParameters:params];
-
+    NSLog(@"%@",data);
     if([[data objectForKey:@"status"] isEqualToString:@"failure"])
         return NO;
     else

diff --git a/Traktable/ITLibrary.m b/Traktable/ITLibrary.m
@@ -32,7 +32,6 @@ @implementation ITLibrary
 - (id)init {
 
     iTunesBridge = [SBApplication applicationWithBundleIdentifier:@"com.apple.iTunes"];
-    ITApi *api = [ITApi new];
 
     NSString *appSupportPath = [ITLibrary applicationSupportFolder];
     [self createDir:appSupportPath];
@@ -41,7 +40,7 @@ - (id)init {
 
     bool b = [self dbExists];
 
-    if([api testAccount] && b == NO) {
+    if(b == NO) {
 
         [self resetDb];
     }