aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/entities/Message.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* introduces JidUtil for Jid creation, fixes duplication of childs while ↵steckbrief2018-05-111-3/+4
| | | | adding childs with xmlns and name
* introduces new message state modelsteckbrief2018-05-051-68/+83
|
* introduces cancel status for file transfers, fixes NPE in file sharing after ↵steckbrief2018-02-161-0/+1
| | | | picture resize
* Implements FS#249: Remove code duplication for avatar creationsteckbrief2017-08-051-1/+2
|
* relates FS#241: Implementation of http download based on okhttpsteckbrief2017-02-061-2/+0
|
* Merge branch 'trz/rebase' into trz/renamesteckbrief2017-01-051-57/+5
|
* Implements FS#235: Deletion of remote files uploaded via httpuploadsteckbrief2016-09-291-140/+30
|
* Basic filetransfer http delete implementation; Exceptions for IqPacketError ↵steckbrief2016-08-221-0/+3
| | | | added
* Removed download decision MUST if the message contains jabber:x:oob:oob/urlintroduce_cplus_database_versionsteckbrief2016-04-191-3/+0
|
* Related to FS#134: Set Message flags according to httpupload hintsteckbrief2016-04-191-0/+4
|
* DatabaseBackend updated to serve Conversatiosn Database version and ↵steckbrief2016-04-171-0/+10
| | | | | | | Conversations+ Database version HttpUpload Flag introduced for message to identify if a link was sent after httpupload message hint for httpupload added (message parsing and message generating)
* Merge branch 'trz/rebase' into trz/renamelookshe2016-04-051-2/+2
|
* One more fix in Message.equals() (FS#104)lookshe2016-03-211-4/+19
|
* FS#104 - Fix Message.equals()lookshe2016-03-201-18/+14
|
* completely implements FS#161lookshe2016-03-171-9/+31
| | | | save state of treatAsDownloadable() and set on error to specified value
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-121-8/+21
|
* Fixes FS#139: Do not merge messages at allsteckbrief2016-03-111-101/+2
|
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-6/+18
|
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-061-27/+155
|
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-161-26/+36
| | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-111-130/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-0/+587
"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed