Merge

Author: nostra13

library/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6

library/AndroidManifest.xml

@@ -6,6 +6,6 @@
 
     <uses-sdk
         android:minSdkVersion="5"
-        android:targetSdkVersion="16" />
+        android:targetSdkVersion="19" />
 
 </manifest>

library/src/com/nostra13/universalimageloader/core/download/BaseImageDownloader.java

@@ -17,14 +17,17 @@
 
 import android.content.ContentResolver;
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.CompressFormat;
 import android.net.Uri;
-import android.provider.ContactsContract;
-
+import android.provider.MediaStore;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.assist.ContentLengthInputStream;
 import com.nostra13.universalimageloader.utils.IoUtils;
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -39,7 +42,6 @@
  * {@link URLConnection} is used to retrieve image stream from network.
  *
  * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
- * @see HttpClientImageDownloader
  * @since 1.8.0
  */
 public class BaseImageDownloader implements ImageDownloader {
@@ -57,8 +59,7 @@ public class BaseImageDownloader implements ImageDownloader {
 
 	protected static final String CONTENT_CONTACTS_URI_PREFIX = "content://com.android.contacts/";
 
-	private static final String ERROR_UNSUPPORTED_SCHEME = "UIL doesn't support scheme(protocol) by default [%s]. "
-			+ "You should implement this support yourself (BaseImageDownloader.getStreamFromOtherSource(...))";
+	private static final String ERROR_UNSUPPORTED_SCHEME = "UIL doesn't support scheme(protocol) by default [%s]. " + "You should implement this support yourself (BaseImageDownloader.getStreamFromOtherSource(...))";
 
 	protected final Context context;
 	protected final int connectTimeout;
@@ -171,11 +172,20 @@ protected InputStream getStreamFromFile(String imageUri, Object extra) throws IO
 	protected InputStream getStreamFromContent(String imageUri, Object extra) throws FileNotFoundException {
 		ContentResolver res = context.getContentResolver();
 		Uri uri = Uri.parse(imageUri);
-		if (imageUri.startsWith(CONTENT_CONTACTS_URI_PREFIX)) {
-			return ContactsContract.Contacts.openContactPhotoInputStream(res, uri);
-		} else {
-			return res.openInputStream(uri);
+
+		if (isVideoUri(uri)) {
+			Long origId = Long.valueOf(uri.getLastPathSegment());
+			Bitmap bitmap = MediaStore.Video.Thumbnails
+					.getThumbnail(res, origId, MediaStore.Images.Thumbnails.MINI_KIND, null);
+			if (bitmap != null) {
+				ByteArrayOutputStream bos = new ByteArrayOutputStream();
+				bitmap.compress(CompressFormat.PNG, 0, bos);
+				byte[] bmpData = bos.toByteArray();
+				return new ByteArrayInputStream(bmpData);
+			}
 		}
+
+		return res.openInputStream(uri);
 	}
 
 	/**
@@ -222,4 +232,14 @@ protected InputStream getStreamFromDrawable(String imageUri, Object extra) {
 	protected InputStream getStreamFromOtherSource(String imageUri, Object extra) throws IOException {
 		throw new UnsupportedOperationException(String.format(ERROR_UNSUPPORTED_SCHEME, imageUri));
 	}
+
+	private boolean isVideoUri(Uri uri) {
+		String mimeType = context.getContentResolver().getType(uri);
+
+		if (mimeType == null) {
+			return false;
+		}
+
+		return mimeType.startsWith("video/");
+	}
 }