From 5c41769458f1e792ee5c71be1a42cacd118c8ac1 Mon Sep 17 00:00:00 2001
From: jock <jock@kotikan.com>
Date: Fri, 13 Apr 2012 16:38:02 +0100
Subject: [PATCH] Added fix for nil carriers. More detail for json exceptions.

---
 BugSense-iOS/BugSenseJSONGenerator.m | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/BugSense-iOS/BugSenseJSONGenerator.m b/BugSense-iOS/BugSenseJSONGenerator.m
index 7ab2239..e92cc9f 100644
--- a/BugSense-iOS/BugSenseJSONGenerator.m
+++ b/BugSense-iOS/BugSenseJSONGenerator.m
@@ -299,6 +299,9 @@ + (NSString *) carrierName {
         id telephonyNetworkInfo = [[[telephonyNetworkInfoClass alloc] init] autorelease];
         id carrier = objc_msgSend(telephonyNetworkInfo, sel_getUid("subscriberCellularProvider"));
         NSString *carrierName = (NSString *)objc_msgSend(carrier, sel_getUid("carrierName"));
+        if (carrierName == nil) {
+            carrierName = kCarrierNotFoundStatus;
+        }
         return carrierName;
     } else {
         return kCarrierNotFoundStatus;
@@ -570,8 +573,9 @@ + (NSData *) JSONDataFromCrashReport:(PLCrashReport *)report userDictionary:(NSD
         NSString *jsonString = 
             [[rootDictionary bs_JSONString] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
         return [jsonString dataUsingEncoding:NSUTF8StringEncoding];
-    } @catch (NSException *exception) {
+    } @catch (NSException *jsonException) {
         NSLog(kJSONErrorMsg);
+        NSLog(@"Name: %@, Reason: %@", [jsonException name], [jsonException reason]);
         return nil;
     }
 }
@@ -692,6 +696,7 @@ + (NSData *) JSONDataFromException:(NSException *)exception userDictionary:(NSDi
         return [jsonString dataUsingEncoding:NSUTF8StringEncoding];
     } @catch (NSException *jsonException) {
         NSLog(kJSONErrorMsg);
+        NSLog(@"Name: %@, Reason: %@", [jsonException name], [jsonException reason]);
         return nil;
     }
 }