StreamsOpener -> StreamOpener

Now returns a single InputStream instead of a pair
wrapped in an object

2 files changed, 5 insertions, 5 deletions

diff --git a/samples/flickr/src/com/bumptech/flickr/DirectFlickrStreamLoader.java b/samples/flickr/src/com/bumptech/flickr/DirectFlickrStreamLoader.java
index 9704523b..641d8cc4 100644
--- a/samples/flickr/src/com/bumptech/flickr/DirectFlickrStreamLoader.java
+++ b/samples/flickr/src/com/bumptech/flickr/DirectFlickrStreamLoader.java
@@ -3,7 +3,7 @@ package com.bumptech.flickr;
 import com.bumptech.flickr.api.Api;
 import com.bumptech.flickr.api.Photo;
 import com.bumptech.glide.loader.model.DirectModelStreamLoader;
-import com.bumptech.glide.loader.opener.HttpInputStreamsOpener;
+import com.bumptech.glide.loader.opener.HttpInputStreamOpener;
 import com.bumptech.glide.loader.opener.StreamOpener;
 
 /**
@@ -20,7 +20,7 @@ public class DirectFlickrStreamLoader extends DirectModelStreamLoader<Photo>{
 
     @Override
     protected StreamOpener getStreamOpener(Photo model, int width, int height) {
-        return new HttpInputStreamsOpener(flickrApi.getPhotoURL(width, height, model));
+        return new HttpInputStreamOpener(flickrApi.getPhotoURL(width, height, model));
     }
 
     @Override
diff --git a/samples/flickr/src/com/bumptech/flickr/FlickrStreamLoader.java b/samples/flickr/src/com/bumptech/flickr/FlickrStreamLoader.java
index b313dd6e..4846af96 100644
--- a/samples/flickr/src/com/bumptech/flickr/FlickrStreamLoader.java
+++ b/samples/flickr/src/com/bumptech/flickr/FlickrStreamLoader.java
@@ -3,7 +3,7 @@ package com.bumptech.flickr;
 import com.bumptech.flickr.api.Api;
 import com.bumptech.flickr.api.Photo;
 import com.bumptech.glide.loader.model.BaseModelStreamLoader;
-import com.bumptech.glide.loader.opener.FileInputStreamsOpener;
+import com.bumptech.glide.loader.opener.FileInputStreamOpener;
 
 import java.io.File;
 import java.util.concurrent.Future;
@@ -25,12 +25,12 @@ public class FlickrStreamLoader extends BaseModelStreamLoader<Photo>{
     }
 
     @Override
-    protected void doFetchModelStreams(final Photo model, int width, int height, final ModelStreamsReadyCallback cb) {
+    protected void doFetchModelStreams(final Photo model, int width, int height, final ModelStreamReadyCallback cb) {
         clear();
         current = flickrApi.downloadPhoto(model, cacheDir, new Api.PhotoCallback() {
             @Override
             public void onDownloadComplete(String path) {
-                cb.onStreamsReady(model.id, new FileInputStreamsOpener(path));
+                cb.onStreamReady(model.id, new FileInputStreamOpener(path));
             }
         });
     }