github/cordova-plugin-camera
github/cordova-plugin-camera
3
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-camera.git synced 2025-01-19 03:42:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ios): tempFilePath called twice if using CameraUsesGeolocation (#612)

Browse Source
This commit is contained in:
jcesarmobile 2020-06-25 18:23:01 +02:00 committed by GitHub
parent ba4f77468f
commit d89c25cd82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ios/CDVCamera.m
View File

@ -383,6 +383,7 @@ static NSString* toBase64(NSData* data) {
} }
[[self locationManager] startUpdatingLocation]; [[self locationManager] startUpdatingLocation];
} }
data = nil;
} }
} }
break; break;
@ -396,15 +397,10 @@ static NSString* toBase64(NSData* data) {
- (NSString*)tempFilePath:(NSString*)extension - (NSString*)tempFilePath:(NSString*)extension
{ {
NSString* docsPath = [NSTemporaryDirectory()stringByStandardizingPath]; NSString* docsPath = [NSTemporaryDirectory()stringByStandardizingPath];
NSFileManager* fileMgr = [[NSFileManager alloc] init]; // recommended by Apple (vs [NSFileManager defaultManager]) to be threadsafe
NSString* filePath;
// unique file name // unique file name
NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970]; NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
NSNumber *timeStampObj = [NSNumber numberWithDouble: timeStamp]; NSNumber *timeStampObj = [NSNumber numberWithDouble: timeStamp];
do { NSString* filePath = [NSString stringWithFormat:@"%@/%@%ld.%@", docsPath, CDV_PHOTO_PREFIX, [timeStampObj longValue], extension];
filePath = [NSString stringWithFormat:@"%@/%@%ld.%@", docsPath, CDV_PHOTO_PREFIX, [timeStampObj longValue], extension];
} while ([fileMgr fileExistsAtPath:filePath]);
return filePath; return filePath;
} }