aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-14 17:39:03 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-15 15:34:12 +0100
commit4ab558715cc279515894d8ad28053716d3d61ad2 (patch)
treeed51ba8c60bd278c65d4440cb170a760e4ac65e0 /src/main/java/eu/siacs/conversations
parentaf2922adeac1b5dd6e4f30e930ad54171b5511a9 (diff)
adepted conversationadapter to deal with files
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java24
1 files changed, 21 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index b3df8d72b..b1aea2094 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -6,6 +6,7 @@ import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Conversation;
import eu.siacs.conversations.entities.Downloadable;
+import eu.siacs.conversations.entities.DownloadableFile;
import eu.siacs.conversations.entities.Message;
import eu.siacs.conversations.ui.ConversationActivity;
import eu.siacs.conversations.ui.XmppActivity;
@@ -75,7 +76,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
convName.setTypeface(null, Typeface.NORMAL);
}
- if (message.getType() == Message.TYPE_IMAGE
+ if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE
|| message.getDownloadable() != null) {
Downloadable d = message.getDownloadable();
if (conversation.isRead()) {
@@ -89,13 +90,25 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
if (d.getStatus() == Downloadable.STATUS_CHECKING) {
mLastMessage.setText(R.string.checking_image);
} else if (d.getStatus() == Downloadable.STATUS_DOWNLOADING) {
- mLastMessage.setText(R.string.receiving_image);
+ if (message.getType() == Message.TYPE_FILE) {
+ mLastMessage.setText(getContext().getString(R.string.receiving_file,d.getMimeType(), d.getProgress()));
+ } else {
+ mLastMessage.setText(getContext().getString(R.string.receiving_image, d.getProgress()));
+ }
} else if (d.getStatus() == Downloadable.STATUS_OFFER) {
- mLastMessage.setText(R.string.image_offered_for_download);
+ if (message.getType() == Message.TYPE_FILE) {
+ mLastMessage.setText(R.string.file_offered_for_download);
+ } else {
+ mLastMessage.setText(R.string.image_offered_for_download);
+ }
} else if (d.getStatus() == Downloadable.STATUS_OFFER_CHECK_FILESIZE) {
mLastMessage.setText(R.string.image_offered_for_download);
} else if (d.getStatus() == Downloadable.STATUS_DELETED) {
mLastMessage.setText(R.string.image_file_deleted);
+ } else if (message.getImageParams().width > 0) {
+ mLastMessage.setVisibility(View.GONE);
+ imagePreview.setVisibility(View.VISIBLE);
+ activity.loadBitmap(message, imagePreview);
} else {
mLastMessage.setText("");
}
@@ -103,6 +116,11 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
imagePreview.setVisibility(View.GONE);
mLastMessage.setVisibility(View.VISIBLE);
mLastMessage.setText(R.string.encrypted_message_received);
+ } else if (message.getType() == Message.TYPE_FILE && message.getImageParams().width <= 0) {
+ DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
+ mLastMessage.setVisibility(View.VISIBLE);
+ imagePreview.setVisibility(View.GONE);
+ mLastMessage.setText(getContext().getString(R.string.file,file.getMimeType()));
} else {
mLastMessage.setVisibility(View.GONE);
imagePreview.setVisibility(View.VISIBLE);