handle null scheme in URI

guardianproject · Aug 1, 2017 · fd9dff1 · fd9dff1
1 parent df7c0bd
commit fd9dff1
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/app/src/main/java/org/witness/securesmartcam/ImageEditor.java b/app/src/main/java/org/witness/securesmartcam/ImageEditor.java
@@ -660,16 +660,13 @@ public void onClick(DialogInterface dialog, int whichButton) {
 	private void deleteOriginal() throws IOException {
 
 		if (originalImageUri != null) {
-			if (originalImageUri.getScheme().equals("file")) {
-				String origFilePath = originalImageUri.getPath();
-				File fileOrig = new File(origFilePath);
+
+			String origFilePath = originalImageUri.getPath();
+			File fileOrig = new File(origFilePath);
+
+			if (fileOrig.exists()) {
 
 				String[] columnsToSelect = {MediaStore.Images.Media._ID, MediaStore.Images.Media.DATA};
-
-				/*
-				ExifInterface ei = new ExifInterface(origFilePath);
-				long dateTaken = new Date(ei.getAttribute(ExifInterface.TAG_DATETIME)).getTime();
-				*/
 
 				Uri[] uriBases = {MediaStore.Images.Media.EXTERNAL_CONTENT_URI, MediaStore.Images.Media.INTERNAL_CONTENT_URI};