From cb4069f0f213ed1a38ce074d981b0c367dc2cdfd Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Wed, 15 Oct 2014 19:32:12 +0200 Subject: [PATCH] refactored file download status. make image http download available for carbon copied (sent) messages as well --- res/layout/message_sent.xml | 8 ++ .../siacs/conversations/crypto/PgpEngine.java | 6 +- .../conversations/entities/Conversation.java | 7 +- .../conversations/entities/Downloadable.java | 14 ++- .../entities/DownloadableFile.java | 4 +- .../siacs/conversations/entities/Message.java | 55 +++++----- .../conversations/http/HttpConnection.java | 88 +++++++++------ .../http/HttpConnectionManager.java | 11 +- .../conversations/parser/MessageParser.java | 5 +- .../persistance/DatabaseBackend.java | 2 +- .../persistance/FileBackend.java | 10 +- .../services/AbstractConnectionManager.java | 5 +- .../ui/ConferenceDetailsActivity.java | 3 +- .../ui/ContactDetailsActivity.java | 9 +- .../ui/ConversationActivity.java | 3 +- .../ui/ConversationFragment.java | 9 +- .../ui/ManageAccountActivity.java | 6 +- .../ui/adapter/ConversationAdapter.java | 102 ++++++++++-------- .../ui/adapter/KnownHostsAdapter.java | 4 +- .../ui/adapter/MessageAdapter.java | 46 +++----- .../conversations/xmpp/XmppConnection.java | 2 +- .../xmpp/jingle/JingleConnection.java | 85 +++++++++------ .../xmpp/jingle/JingleConnectionManager.java | 2 +- .../xmpp/jingle/JingleInbandTransport.java | 3 +- 24 files changed, 276 insertions(+), 213 deletions(-) diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml index 28f3ddc63..e3e9b673e 100644 --- a/res/layout/message_sent.xml +++ b/res/layout/message_sent.xml @@ -45,6 +45,14 @@ android:textColor="@color/primarytext" android:textIsSelectable="true" android:textSize="?attr/TextSizeBody" /> + +