Move check for path starting with slash in getUriStringForFilePath()

livecodepanos · livecodepanos · commit a4df589c3303 · 2019-03-18T10:23:50.000+02:00
diff --git a/engine/src/java/com/runrev/android/Engine.java b/engine/src/java/com/runrev/android/Engine.java
@@ -2047,18 +2047,7 @@ public void showCamera()
 			return;
 		}
 
-        // getPath() returns a path starting with /, e.g. /storage/emulated/0/Android/data/<app_id>/cache/..
-        // This path is appended to content://<app_id>.fileprovider/share/, resulting in an URI like:
-        //
-        // content://<app_id>.fileprovider//storage/emulated/0/Android/data/<app_id>/cache/..
-        //
-        // This is not a problem in general, but in _some_ devices (e.g. Huawei nova e3) this URI is
-        // normalized to:
-        //
-        // content://<app_id>.fileprovider/storage/emulated/0/Android/data/<app_id>/cache/..
-        //
-        // This results in the URI not being found. So use .substring(1) to remove the first slash
-		String t_path = m_temp_image_file.getPath().substring(1);
+		String t_path = m_temp_image_file.getPath();
 
 		Uri t_uri;
 		t_uri = FileProvider.getProvider(getContext()).addPath(t_path, t_path, "image/jpeg", true, ParcelFileDescriptor.MODE_WRITE_ONLY);
diff --git a/engine/src/java/com/runrev/android/FileProvider.java b/engine/src/java/com/runrev/android/FileProvider.java
@@ -87,6 +87,18 @@ private String getFilePath(String p_path)
 
 	private String getUriStringForFilePath(String p_path)
 	{
+        // If p_path begins with slash, then the resulting URI will be like e.g. :
+        
+        // content://<app_id>.fileprovider//storage/emulated/0/Android/data/<app_id>/cache/..
+        //
+        // This is not a problem in general, but in _some_ devices (e.g. Huawei nova e3) this URI is
+        // normalized to:
+        //
+        // content://<app_id>.fileprovider/storage/emulated/0/Android/data/<app_id>/cache/..
+        //
+        // This results in the URI not being found. So use .substring(1) to remove the first slash, if any
+        if (p_path.charAt(0) == '/')
+            p_path = p_path.substring(1);
 		return m_content_uri_base + "/" + p_path;
 	}
 
