Merge remote-tracking branch 'refs/remotes/origin/imageloader'

5 files changed, 70 insertions, 120 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 478bd5f05..5d249d863 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -20,18 +20,14 @@ import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Point;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.nfc.NdefMessage;
 import android.nfc.NdefRecord;
 import android.nfc.NfcAdapter;
 import android.nfc.NfcEvent;
-import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -42,7 +38,6 @@ import android.preference.PreferenceManager;
 import android.text.InputType;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -53,6 +48,12 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.DecodeFormat;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+import com.bumptech.glide.load.resource.bitmap.FileDescriptorBitmapDecoder;
+import com.bumptech.glide.load.resource.bitmap.VideoBitmapDecoder;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
 import com.google.zxing.WriterException;
@@ -62,13 +63,10 @@ import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 
 import net.java.otr4j.session.SessionID;
 
-import java.io.FileNotFoundException;
-import java.lang.ref.WeakReference;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.RunnableFuture;
 
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
@@ -1171,106 +1169,33 @@ public abstract class XmppActivity extends Activity {
 		return xmppConnectionService.getAvatarService();
 	}
 
-	class BitmapWorkerTask extends AsyncTask<Message, Void, Bitmap> {
-		private final WeakReference<ImageView> imageViewReference;
-		private Message message = null;
-
-		public BitmapWorkerTask(ImageView imageView) {
-			imageViewReference = new WeakReference<>(imageView);
-		}
-
-		@Override
-		protected Bitmap doInBackground(Message... params) {
-			if (isCancelled()) {
-				return null;
-			}
-			message = params[0];
-			try {
-				return xmppConnectionService.getFileBackend().getThumbnail(
-						message, (int) (metrics.density * 288), false);
-			} catch (FileNotFoundException e) {
-				return null;
-			}
-		}
-
-		@Override
-		protected void onPostExecute(Bitmap bitmap) {
-			if (bitmap != null && !isCancelled()) {
-				final ImageView imageView = imageViewReference.get();
-				if (imageView != null) {
-					imageView.setImageBitmap(bitmap);
-					imageView.setBackgroundColor(0x00000000);
-				}
-			}
-		}
-	}
-
 	public void loadBitmap(Message message, ImageView imageView) {
-		Bitmap bm;
-		try {
-			bm = xmppConnectionService.getFileBackend().getThumbnail(message,
-					(int) (metrics.density * 288), true);
-		} catch (FileNotFoundException e) {
-			bm = null;
-		}
-		if (bm != null) {
-			cancelPotentialWork(message, imageView);
-			imageView.setImageBitmap(bm);
-			imageView.setBackgroundColor(0x00000000);
-		} else {
-			if (cancelPotentialWork(message, imageView)) {
-				imageView.setBackgroundColor(0xff333333);
-				imageView.setImageDrawable(null);
-				final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
-				final AsyncDrawable asyncDrawable = new AsyncDrawable(
-						getResources(), null, task);
-				imageView.setImageDrawable(asyncDrawable);
-				try {
-					task.execute(message);
-				} catch (final RejectedExecutionException ignored) {
-					ignored.printStackTrace();
-				}
-			}
-		}
-	}
-
-	public static boolean cancelPotentialWork(Message message, ImageView imageView) {
-		final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
-
-		if (bitmapWorkerTask != null) {
-			final Message oldMessage = bitmapWorkerTask.message;
-			if (oldMessage == null || message != oldMessage) {
-				bitmapWorkerTask.cancel(true);
-			} else {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private static BitmapWorkerTask getBitmapWorkerTask(ImageView imageView) {
-		if (imageView != null) {
-			final Drawable drawable = imageView.getDrawable();
-			if (drawable instanceof AsyncDrawable) {
-				final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
-				return asyncDrawable.getBitmapWorkerTask();
-			}
-		}
-		return null;
-	}
-
-	static class AsyncDrawable extends BitmapDrawable {
-		private final WeakReference<BitmapWorkerTask> bitmapWorkerTaskReference;
-
-		public AsyncDrawable(Resources res, Bitmap bitmap,
-				BitmapWorkerTask bitmapWorkerTask) {
-			super(res, bitmap);
-			bitmapWorkerTaskReference = new WeakReference<>(
-					bitmapWorkerTask);
-		}
-
-		public BitmapWorkerTask getBitmapWorkerTask() {
-			return bitmapWorkerTaskReference.get();
-		}
+		File bm;
+		bm = xmppConnectionService.getFileBackend().getFile(message, true);
+		Glide.with(this)
+                .load(bm)
+                .override(288, 288)
+                .fitCenter()
+                //.centerCrop()
+                .diskCacheStrategy(DiskCacheStrategy.RESULT)
+                .into(imageView);
+		//Log.d(Config.LOGTAG,"Load image with glide");
+	}
+
+	public void loadVideoPreview(Message message, ImageView imageView) {
+		BitmapPool bitmapPool = Glide.get(getApplicationContext()).getBitmapPool();
+		int microSecond = 1000000;// 1st second of video
+		VideoBitmapDecoder videoBitmapDecoder = new VideoBitmapDecoder(microSecond);
+		FileDescriptorBitmapDecoder fileDescriptorBitmapDecoder = new FileDescriptorBitmapDecoder(videoBitmapDecoder, bitmapPool, DecodeFormat.PREFER_ARGB_8888);
+		File vp = xmppConnectionService.getFileBackend().getFile(message, true);
+		Glide.with(getApplicationContext())
+				.load(vp)
+				.asBitmap()
+				.override(288,288)
+                .fitCenter()
+                //.centerCrop()
+				.diskCacheStrategy(DiskCacheStrategy.RESULT)
+				.videoDecoder(fileDescriptorBitmapDecoder)
+				.into(imageView);
 	}
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index b671a6f43..8fe1d029a 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -485,6 +485,25 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		viewHolder.image.setOnLongClickListener(openContextMenu);
 	}
 
+	private void displayVideoMessage(ViewHolder viewHolder,
+									  final Message message) {
+		viewHolder.aw_player.setVisibility(View.GONE);
+		if (viewHolder.download_button != null) {
+			viewHolder.download_button.setVisibility(View.GONE);
+		}
+		viewHolder.messageBody.setVisibility(View.GONE);
+		viewHolder.image.setVisibility(View.VISIBLE);
+		activity.loadVideoPreview(message, viewHolder.image);
+		viewHolder.image.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				openDownloadable(message);
+			}
+		});
+		viewHolder.image.setOnLongClickListener(openContextMenu);
+	}
+
 	private void loadMoreMessages(Conversation conversation) {
 		conversation.setLastClearHistory(0);
 		conversation.setHasMessagesLeftOnServer(true);
@@ -631,6 +650,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			});
 
 		final Transferable transferable = message.getTransferable();
+		String mimeType = message.getMimeType();
 		if (transferable != null && transferable.getStatus() != Transferable.STATUS_UPLOADING) {
 			if (transferable.getStatus() == Transferable.STATUS_OFFER) {
 				displayDownloadableMessage(viewHolder,message,activity.getString(R.string.download_x_file, UIHelper.getFileDescriptionString(activity, message)));
@@ -645,10 +665,13 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			if (message.getFileParams().width > 0) {
 				displayImageMessage(viewHolder,message);
 			} else {
-                String mimeType = message.getMimeType();
-                if (mimeType != null) {
-                    if (message.getMimeType().startsWith("audio/"))
-                        displayAudioMessage(viewHolder, message, position);
+				if (mimeType != null) {
+					if (message.getMimeType().startsWith("audio/")) {
+						displayAudioMessage(viewHolder, message, position);
+					} else if (message.getMimeType().startsWith("video/")) {
+						displayVideoMessage(viewHolder, message);
+                        //ToDo add overlay e.g. play button
+					}
                     else displayOpenableMessage(viewHolder, message);
                 } else displayOpenableMessage(viewHolder, message);
 			}
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 88f2cbb28..a66345e17 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -13,7 +13,7 @@
         android:layout_above="@+id/snackbar"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:background="@color/background_floating_material_light"
+        android:background="@color/grey200"
         android:divider="@null"
         android:dividerHeight="0dp"
         android:listSelector="@android:color/transparent"
@@ -30,7 +30,7 @@
         android:layout_alignParentLeft="true"
         android:background="@color/grey200"
         android:clickable="true"
-        android:paddingTop="4dp"
+        android:paddingTop="2dp"
         android:paddingLeft="2dp"
         android:paddingBottom="2dp">
 
@@ -61,7 +61,7 @@
             android:layout_height="48dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="?android:selectableItemBackground"
+            android:background="@color/grey200"
             android:src="@drawable/ic_send_text_offline" />
     </RelativeLayout>
 
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 77d560297..14aea096f 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -46,9 +46,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="4dp"
-                app:riv_corner_radius="5dp"
                 android:adjustViewBounds="true"
-                android:background="@color/black87"
+                app:riv_border_width="1dp"
+                app:riv_border_color="@color/black12"
+                app:riv_corner_radius="5dp"
                 android:scaleType="centerCrop" />
 
             <TextView
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 8d3c0416c..2617c1212 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -47,9 +47,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="4dp"
-                app:riv_corner_radius="5dp"
                 android:adjustViewBounds="true"
-                android:background="@color/black87"
+                app:riv_border_width="1dp"
+                app:riv_border_color="@color/black12"
+                app:riv_corner_radius="5dp"
                 android:scaleType="centerCrop" />
 
             <TextView