Deactivate CLLocation Manager when in Background

hoccer · Feb 2, 2012 · 6addb06 · 6addb06
1 parent 27ba2fd
commit 6addb06
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/Hoccer/Crypto/RSA.m b/Hoccer/Crypto/RSA.m
@@ -33,7 +33,7 @@ + (RSA*)sharedInstance {
         instance = [[RSA alloc] init];
         if ([instance getPrivateKeyRef] == nil || [instance getPublicKeyRef] == nil) {
             NSLog(@"There are no keys! PANIC!");
-            //[instance generateKeyPairKeys];
+            [instance generateKeyPairKeys];
         }
     }); 
     //[instance getCertificate];

diff --git a/Hoccer/HoccerClient/EnvironmentController/HCEnvironmentManager.h b/Hoccer/HoccerClient/EnvironmentController/HCEnvironmentManager.h
@@ -62,6 +62,8 @@
 - (BOOL)hasLocation;
 - (BOOL)hasBSSID;
 - (BOOL)hasEnvironment;
+- (void)deactivateLocation;
+- (void)activateLocation;
 + (NSError *)messageForLocationInformation: (NSDictionary *)hoccabilityInfo;
 
 @end
diff --git a/Hoccer/HoccerClient/EnvironmentController/HCEnvironmentManager.m b/Hoccer/HoccerClient/EnvironmentController/HCEnvironmentManager.m
@@ -146,6 +146,13 @@ - (void)updateHoccability {
 	}
 }
 
+- (void)deactivateLocation{
+    [locationManager stopUpdatingLocation];
+}
+- (void)activateLocation{
+    [locationManager startUpdatingLocation];
+}
+
 + (NSError *)messageForLocationInformation: (NSDictionary *)hoccabilityInfo {
 	NSInteger hoc = [[hoccabilityInfo objectForKey:@"quality"] intValue];
 

diff --git a/Hoccer/HoccerClient/HCLinccer.m b/Hoccer/HoccerClient/HCLinccer.m
@@ -235,7 +235,8 @@ - (void)storePublicKey:(NSString *)theKey forClient:(NSDictionary *)client clien
 
 - (void)reactivate {
     isRegistered = NO;
-
+    [environmentController activateLocation];
+
 	[self updateEnvironment];
     self.groupId = nil;
 }
@@ -251,9 +252,11 @@ - (void)disconnect {
 	}
 	[self.updateTimer invalidate];
 	self.updateTimer = nil;
-
+	[environmentController deactivateLocation];
 	[httpClient deleteURI:[uri stringByAppendingPathComponent:@"/environment"]
 				  success:@selector(httpClientDidDelete:)];
+
+
 }
 
 
@@ -467,8 +470,10 @@ - (void)updateEnvironment {
     if ([[NSUserDefaults standardUserDefaults] boolForKey:@"autoKey"]){
         NSData *pubKey = [[RSA sharedInstance] getPublicKeyBits];
         NSString *pubKeyAsString = [pubKey asBase64EncodedString];
-        [environment setObject:pubKeyAsString forKey:@"pubkey"];
-    }
+        if (pubKeyAsString){
+            [environment setObject:pubKeyAsString forKey:@"pubkey"];
+        }
+        }
 
     NSString *enviromentAsString = [environment yajl_JSONString];