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

CB-12682: (ios, android): changes cancel error message to be consistent for ios android

Browse Source
This commit is contained in:
Sergii Stotskyi 2017-04-21 14:08:37 +03:00 committed by Sergii Stotskyi
parent 1b218cd8a0
commit c3d7e55ad4
2 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/android/CameraLauncher.java
View File

@ -783,7 +783,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
}// If cancelled }// If cancelled
else if (resultCode == Activity.RESULT_CANCELED) { else if (resultCode == Activity.RESULT_CANCELED) {
this.failPicture("Camera cancelled."); this.failPicture("No Image Selected");
} }
// If something else // If something else
@ -812,7 +812,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
// If cancelled // If cancelled
else if (resultCode == Activity.RESULT_CANCELED) { else if (resultCode == Activity.RESULT_CANCELED) {
this.failPicture("Camera cancelled."); this.failPicture("No Image Selected");
} }
// If something else // If something else
@ -831,7 +831,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
} }
}); });
} else if (resultCode == Activity.RESULT_CANCELED) { } else if (resultCode == Activity.RESULT_CANCELED) {
this.failPicture("Selection cancelled."); this.failPicture("No Image Selected");
} else { } else {
this.failPicture("Selection did not complete!"); this.failPicture("Selection did not complete!");
} }

2
src/ios/CDVCamera.m
View File

@ -569,7 +569,7 @@ static NSString* toBase64(NSData* data) {
} else if (picker.sourceType != UIImagePickerControllerSourceTypeCamera && [ALAssetsLibrary authorizationStatus] != ALAuthorizationStatusAuthorized) { } else if (picker.sourceType != UIImagePickerControllerSourceTypeCamera && [ALAssetsLibrary authorizationStatus] != ALAuthorizationStatusAuthorized) {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"has no access to assets"]; result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"has no access to assets"];
} else { } else {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"no image selected"]; result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"No Image Selected"];
} }