Merge pull request #7460 from hansemannn/TIMOB-20002

[TIMOB-20002] Fix already granted locationcallback
tidev · Nov 18, 2015 · e2e10ac · e2e10ac
2 parents adebf56 + 463fde3
commit e2e10ac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/iphone/Classes/GeolocationModule.m b/iphone/Classes/GeolocationModule.m
@@ -887,9 +887,10 @@ -(void)requestLocationPermissions:(id)args
         }
     }
 
+    [self executeAndReleaseCallbackWithCode:(errorMessage == nil) ? 0 : 1 andMessage:errorMessage];
+
     if (errorMessage != nil) {
         NSLog(@"[ERROR] %@", errorMessage);
-        [self executeAndReleaseCallbackWithCode:1 andMessage:errorMessage];
         RELEASE_TO_NIL(errorMessage);
     }
 }
@@ -1079,15 +1080,15 @@ - (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatu
     if (authorizationCallback != nil && status != kCLAuthorizationStatusNotDetermined) {
 
         int code = 0;
-        NSString* errorStr = @"";
+        NSString* errorStr = nil;
 
         switch (status) {
             case kCLAuthorizationStatusAuthorizedAlways:
             case kCLAuthorizationStatusAuthorizedWhenInUse:
                 break;
             default:
                 code = 1;
-                errorStr = @"The user is unable to allow access to location.";
+                errorStr = @"The user denied access to use location services.";
         }
 
         NSMutableDictionary * propertiesDict = [TiUtils dictionaryWithCode:code message:errorStr];

diff --git a/iphone/Classes/MediaModule.m b/iphone/Classes/MediaModule.m
@@ -969,8 +969,10 @@ -(void)requestCameraPermissions:(id)arg
     KrollCallback * callback = arg;
     TiThreadPerformOnMainThread(^(){
         [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted){
+
+            NSString *errorMessage = granted ? @"The user denied access to use the camera." : nil;
             KrollEvent * invocationEvent = [[KrollEvent alloc] initWithCallback:callback
-                                                                    eventObject:[TiUtils dictionaryWithCode:(granted ? 0 : 1) message:nil]
+                                                                    eventObject:[TiUtils dictionaryWithCode:(granted ? 0 : 1) message:errorMessage]
                                                                      thisObject:self];
             [[callback context] enqueue:invocationEvent];
             RELEASE_TO_NIL(invocationEvent);