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 UI API called on a background thread (#550, #530, #447) (#551)

Browse Source 
Co-authored-by: Denis Zakharov <d.zakharov@bssys.com>
This commit is contained in:
exxbrain 2020-04-09 16:54:26 +03:00 committed by GitHub
parent f33ade83e4
commit f4067e22d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ios/CDVCamera.m
View File

@ -185,6 +185,8 @@ static NSString* toBase64(NSData* data) {
- (void)showCameraPicker:(NSString*)callbackId withOptions:(CDVPictureOptions *) pictureOptions - (void)showCameraPicker:(NSString*)callbackId withOptions:(CDVPictureOptions *) pictureOptions
{ {
// Perform UI operations on the main thread
dispatch_async(dispatch_get_main_queue(), ^{
CDVCameraPicker* cameraPicker = [CDVCameraPicker createFromPictureOptions:pictureOptions]; CDVCameraPicker* cameraPicker = [CDVCameraPicker createFromPictureOptions:pictureOptions];
self.pickerController = cameraPicker; self.pickerController = cameraPicker;
@ -193,8 +195,6 @@ static NSString* toBase64(NSData* data) {
// we need to capture this state for memory warnings that dealloc this object // we need to capture this state for memory warnings that dealloc this object
cameraPicker.webView = self.webView; cameraPicker.webView = self.webView;
// Perform UI operations on the main thread
dispatch_async(dispatch_get_main_queue(), ^{
// If a popover is already open, close it; we only want one at a time. // If a popover is already open, close it; we only want one at a time.
if (([[self pickerController] pickerPopoverController] != nil) && [[[self pickerController] pickerPopoverController] isPopoverVisible]) { if (([[self pickerController] pickerPopoverController] != nil) && [[[self pickerController] pickerPopoverController] isPopoverVisible]) {
[[[self pickerController] pickerPopoverController] dismissPopoverAnimated:YES]; [[[self pickerController] pickerPopoverController] dismissPopoverAnimated:YES];