Assume string starting with '/' are file paths.

Fixes #161.
bumptech · Sep 28, 2014 · f9f9d2b · f9f9d2b
1 parent b51cd25
commit f9f9d2b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/library/src/androidTest/java/com/bumptech/glide/load/model/stream/StringLoaderTest.java b/library/src/androidTest/java/com/bumptech/glide/load/model/stream/StringLoaderTest.java
@@ -30,6 +30,7 @@ public class StringLoaderTest {
     private StreamStringLoader stringLoader;
     private ModelLoader<Uri, InputStream> uriLoader;
 
+    @SuppressWarnings("unchecked")
     @Before
     public void setUp() throws Exception {
         uriLoader = mock(ModelLoader.class);
@@ -46,6 +47,17 @@ public void testHandlesPaths() throws IOException {
         verify(uriLoader).getResourceFetcher(eq(Uri.fromFile(f)), eq(IMAGE_SIDE), eq(IMAGE_SIDE));
     }
 
+    @Test
+    public void testCanHandleComplexFilePaths() {
+        assumeTrue(!Util.isWindows());
+        String testPath = "/storage/emulated/0/DCIM/Camera/IMG_20140520_100001:nopm:.jpg,mimeType=image/jpeg,"
+                + "2448x3264,orientation=0,date=Tue";
+        stringLoader.getResourceFetcher(testPath, IMAGE_SIDE, IMAGE_SIDE);
+
+        Uri expected = Uri.fromFile(new File(testPath));
+        verify(uriLoader).getResourceFetcher(eq(expected), eq(IMAGE_SIDE), eq(IMAGE_SIDE));
+    }
+
     @Test
     public void testHandlesFileUris() throws IOException {
         File f = Robolectric.application.getCacheDir();

diff --git a/library/src/main/java/com/bumptech/glide/load/model/StringLoader.java b/library/src/main/java/com/bumptech/glide/load/model/StringLoader.java
@@ -20,12 +20,21 @@ public StringLoader(ModelLoader<Uri, T> uriLoader) {
 
     @Override
     public DataFetcher<T> getResourceFetcher(String model, int width, int height) {
-        Uri uri = Uri.parse(model);
-
-        final String scheme = uri.getScheme();
-        if (scheme == null) {
-            uri = Uri.fromFile(new File(model));
+        Uri uri;
+        if (model.startsWith("/")) {
+            uri = toFileUri(model);
+        } else {
+            uri = Uri.parse(model);
+            final String scheme = uri.getScheme();
+            if (scheme == null) {
+                uri = toFileUri(model);
+            }
         }
+
         return uriLoader.getResourceFetcher(uri, width, height);
     }
+
+    private static Uri toFileUri(String path) {
+        return Uri.fromFile(new File(path));
+    }
 }