aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/ui/adapter (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-1/+1
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
| * Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-294-9/+12
| |
| * Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-271-2/+23
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-121-3/+3
| |\ | |/ |/|
| * Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-111-4/+5
| |
| * Fixes FS#139: Do not merge messages at allsteckbrief2016-03-111-6/+6
| |
| * reset link and highlight colors to system defaultsteckbrief2016-03-081-17/+20
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-6/+54
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-066-152/+309
| |\ | |/ |/|
| * Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-01-151-2/+12
| |
| * Moved all avatar related work to AvatarServicesteckbrief2016-01-134-11/+13
| | | | | | | | | | | | | | - fetchAvatar, fetchAvatarPep, fetchAvatarVcard, checkForAvatar moved from XmppConnectionService to AvatarService - Several unused imports removed - XmppSendUtil introduced to enable presencePacket and iqPacket sending without using XmppConnectionService since the account has everything needed - UiUpdateHelper introduced to enable UI updates without using XmppConnectionService directly
| * Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-101-1/+1
| |
| * Implements FS#67: Introduce central logging class to use log prefix, new ↵steckbrief2015-11-201-1/+1
| | | | | | | | activity to show logcat output and button to copy contents
| * FileBackend splitted into several util classes for separate concerns: ↵steckbrief2015-11-061-7/+3
| | | | | | | | AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
| * Implements FS#26: Introduction of dialog to choose whether to resize a ↵steckbrief2015-11-032-20/+22
| | | | | | | | picture or not
| * Access to preferences moved to global utility class ↵steckbrief2015-10-213-9/+7
| | | | | | | | ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed.
* | Changed access to presences according to new Presence representation in Csteckbrief2016-02-231-3/+3
| |
* | Imports organizedsteckbrief2016-02-121-1/+0
| |
* | fixed importstrz/1.5.2.2lookshe2015-10-051-3/+3
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-055-1146/+0
|/ | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
* Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵steckbrief2015-10-042-1/+66
| | | | | | | Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added
* Fixes FS#49: Highlight the selected conversation in liststeckbrief2015-09-021-4/+6
|
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-162-8/+2
| | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
* resolve of some compiler errorslookshe2015-08-131-0/+1
|
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-114-86/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java src/main/java/de/thedevstack/conversationsplus/entities/Account.java src/main/java/de/thedevstack/conversationsplus/entities/Contact.java src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java src/main/java/de/thedevstack/conversationsplus/entities/Message.java src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java src/main/java/eu/siacs/conversations/crypto/OtrEngine.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java src/main/java/eu/siacs/conversations/http/HttpConnection.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/res/layout/activity_about.xml
* Show Online status in contact list with respect to SHOW_ONLINE_STATUS preferencesteckbrief2015-06-191-2/+5
|
* Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-0/+4
|
* renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-195-0/+1133
"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed