Fix on crash when device_token is null

ooni · Aug 16, 2017 · 47565c3 · 47565c3
1 parent 066a4c7
commit 47565c3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/ooniprobe/AppDelegate.mm b/ooniprobe/AppDelegate.mm
@@ -20,8 +20,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     CrashlyticsKit.delegate = self;
     [Fabric with:@[[Crashlytics class]]];
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent];
-
-    [NotificationService sharedNotificationService];
 
     [self registerNotifications];
 

diff --git a/ooniprobe/Info.plist b/ooniprobe/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.5</string>
+	<string>1.1.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>15</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/ooniprobe/Utility/NotificationService.mm b/ooniprobe/Utility/NotificationService.mm
@@ -45,6 +45,7 @@ -(id)init
 
 
 - (void)registerNotifications{
+    if (device_token == nil) return;
 
     std::vector<std::string> supported_tests_list;
     for (NSString *s in supported_tests) {

diff --git a/ooniprobe/Utility/ReachabilityManager.mm b/ooniprobe/Utility/ReachabilityManager.mm
@@ -43,8 +43,10 @@ - (id)init {
 
 - (void)reachabilityDidChange:(NSNotification *)notification {
     NSString *network_type = [self getStatus];
-    [[NotificationService sharedNotificationService] setNetwork_type:network_type];
-    [[NotificationService sharedNotificationService] registerNotifications];
+    if (![network_type isEqualToString:@"no_internet"]){
+        [[NotificationService sharedNotificationService] setNetwork_type:network_type];
+        [[NotificationService sharedNotificationService] registerNotifications];
+    }
 }
 
 - (NSString*)getStatus{
@@ -56,7 +58,6 @@ - (NSString*)getStatus{
         network_type = @"mobile";
     else if(status == NotReachable)
         network_type = @"no_internet";
-    NSLog(@"network_type %@", network_type);
     return network_type;
 }