github/cordova-plugin-camera
github/cordova-plugin-camera
3
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-camera.git synced 2025-02-24 15:22:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Plugin uses Android Log class and not Cordova LOG class

Browse Source
This commit is contained in:
Simon MacDonald 2016-08-22 15:52:52 -04:00
parent 9f159d757a
commit 6e19147b09
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/android/CameraLauncher.java
View File

@ -57,7 +57,6 @@ import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.util.Base64; import android.util.Base64;
import android.util.Log;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PermissionInfo; import android.content.pm.PermissionInfo;
@ -426,14 +425,14 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
cropIntent, CROP_CAMERA + destType); cropIntent, CROP_CAMERA + destType);
} }
} catch (ActivityNotFoundException anfe) { } catch (ActivityNotFoundException anfe) {
Log.e(LOG_TAG, "Crop operation not supported on this device"); LOG.e(LOG_TAG, "Crop operation not supported on this device");
try { try {
processResultFromCamera(destType, cameraIntent); processResultFromCamera(destType, cameraIntent);
} }
catch (IOException e) catch (IOException e)
{ {
e.printStackTrace(); e.printStackTrace();
Log.e(LOG_TAG, "Unable to write to file"); LOG.e(LOG_TAG, "Unable to write to file");
} }
} }
} }
@ -494,7 +493,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
// Double-check the bitmap. // Double-check the bitmap.
if (bitmap == null) { if (bitmap == null) {
Log.d(LOG_TAG, "I either have a null image path or bitmap"); LOG.d(LOG_TAG, "I either have a null image path or bitmap");
this.failPicture("Unable to create bitmap!"); this.failPicture("Unable to create bitmap!");
return; return;
} }
@ -537,7 +536,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
// Double-check the bitmap. // Double-check the bitmap.
if (bitmap == null) { if (bitmap == null) {
Log.d(LOG_TAG, "I either have a null image path or bitmap"); LOG.d(LOG_TAG, "I either have a null image path or bitmap");
this.failPicture("Unable to create bitmap!"); this.failPicture("Unable to create bitmap!");
return; return;
} }
@ -666,7 +665,7 @@ private void refreshGallery(Uri contentUri)
int rotate = 0; int rotate = 0;
String fileLocation = FileHelper.getRealPath(uri, this.cordova); String fileLocation = FileHelper.getRealPath(uri, this.cordova);
Log.d(LOG_TAG, "File locaton is: " + fileLocation); LOG.d(LOG_TAG, "File locaton is: " + fileLocation);
// If you ask for video or all media type you will automatically get back a file URI // If you ask for video or all media type you will automatically get back a file URI
// and there will be no attempt to resize any returned data // and there will be no attempt to resize any returned data
@ -688,7 +687,7 @@ private void refreshGallery(Uri contentUri)
} else { } else {
// If we don't have a valid image so quit. // If we don't have a valid image so quit.
if (!("image/jpeg".equalsIgnoreCase(mimeType) || "image/png".equalsIgnoreCase(mimeType))) { if (!("image/jpeg".equalsIgnoreCase(mimeType) || "image/png".equalsIgnoreCase(mimeType))) {
Log.d(LOG_TAG, "I either have a null image path or bitmap"); LOG.d(LOG_TAG, "I either have a null image path or bitmap");
this.failPicture("Unable to retrieve path to picture!"); this.failPicture("Unable to retrieve path to picture!");
return; return;
} }
@ -699,7 +698,7 @@ private void refreshGallery(Uri contentUri)
e.printStackTrace(); e.printStackTrace();
} }
if (bitmap == null) { if (bitmap == null) {
Log.d(LOG_TAG, "I either have a null image path or bitmap"); LOG.d(LOG_TAG, "I either have a null image path or bitmap");
this.failPicture("Unable to create bitmap!"); this.failPicture("Unable to create bitmap!");
return; return;
} }
@ -779,7 +778,7 @@ private void refreshGallery(Uri contentUri)
processResultFromCamera(destType, intent); processResultFromCamera(destType, intent);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
Log.e(LOG_TAG, "Unable to write to file"); LOG.e(LOG_TAG, "Unable to write to file");
} }
}// If cancelled }// If cancelled