aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/xmpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'trz/rename' into trz/rebasesteckbrief2017-01-111-13/+16
|\
| * Improved error handling for filetransfer:http:delete, Check for httpupload ↵steckbrief2017-01-112-34/+66
| | | | | | | | feature available extended to include filetransfer:http as well, method to check if http upload is available moved from data class 'Account' to 'AccountUtil'
| * Merge branch 'trz/rebase' into trz/renamesteckbrief2017-01-051-1/+1
| |\ | |/ |/|
* | Added columns to fileparams table: url, original file name, key and ivtrz/beta-5steckbrief2017-01-041-1/+1
| | | | | | | | | | auto download of files moved from MessageParser to MessageAdapter download and open file representation cleaned up
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-2024-6/+716
|\|
| * xmpp.httpupload moved to new namespace xmpp.filetransfer.http.upload; delete ↵steckbrief2016-08-238-8/+10
| | | | | | | | parts of xmpp.filetransfer.http moved to .delete package
| * Improved error handling for httpuploadsteckbrief2016-08-221-4/+7
| |
| * Basic filetransfer http delete implementation; Exceptions for IqPacketError ↵steckbrief2016-08-2211-12/+260
| | | | | | | | added
| * FileTransfer reworked (first steps - functionality as is), HttpUploadsteckbrief2016-05-2914-17/+346
| | | | | | | | | | | | | | | | | | | | | | separated, some bugfixes - HttpUpload moved into own package - FileTransfer managed by a central manager class, several FileTransferService implementation can be used - Security initializations moved to ConversationsPlusApplication - Access to PowerManager moved to ConversationsPlusApplication - Removed unused code fragments - Access to HttpConnectionManager is now static
| * Fixed javadoc of HttpUploadHintsteckbrief2016-05-261-1/+11
| |
| * Fixed javadoc of PubSub Element Generation/Parsingsteckbrief2016-05-263-5/+114
| |
| * XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-092-9/+8
| | | | | | | | XmppConnectionService.attachLocationToConversation moved to ConversationUtil
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-0/+15
|\| | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
| * Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-181-59/+84
| |\ | | | | | | | | | | | | | | | Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml
| | * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-59/+84
| | |\ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java src/main/res/values-bg/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
| * | DatabaseBackend updated to serve Conversatiosn Database version and ↵steckbrief2016-04-171-0/+15
| |/ | | | | | | | | | | | | 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)
| * Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferencessteckbrief2016-04-061-1/+2
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-053-13/+43
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-252-6/+8
| |\ | |/ |/|
| * Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-2/+2
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-121-33/+29
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-4/+4
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-071-1/+2
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0622-559/+1032
| |\ | |/ |/|
| * Fixed minor class cast issuesteckbrief2016-01-161-4/+4
| |
* | Imports organizedsteckbrief2016-02-122-2/+0
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-1546-4122/+20
|/ | | | Cast problem fixed
* Introducing some specialized IqPacketGeneratorssteckbrief2016-01-156-0/+276
| | | | | | - IqPacketGenerator - PubSubPacketGenerator - AvatarPacketGenerator
* Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵steckbrief2015-12-161-1/+2
| | | | distinguishes between image resizing and compressing/saving
* Removed stupid DNS query codesteckbrief2015-12-111-55/+23
|
* Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-105-6/+7
|
* Implements FS#67: Introduce central logging class to use log prefix, new ↵steckbrief2015-11-205-97/+97
| | | | activity to show logcat output and button to copy contents
* FileBackend splitted into several util classes for separate concerns: ↵steckbrief2015-11-063-9/+10
| | | | AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
* Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in ↵steckbrief2015-10-231-3/+3
| | | | values for the setting fixed, preferences involved in the decision for auto downloading image links moved to global Utility Class
* Access to preferences moved to global utility class ↵steckbrief2015-10-211-11/+0
| | | | ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed.
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-119-226/+399
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1940-0/+3973
"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 20:03:40 +0000