aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Added columns to fileparams table: url, original file name, key and ivtrz/beta-5steckbrief2017-01-048-6/+178
| | | | | 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-2062-143/+2900
|\
| * Fixes FS#29: Own Avatar not loadedsteckbrief2016-09-291-3/+9
| |
| * Implements FS#235: Deletion of remote files uploaded via httpuploadsteckbrief2016-09-2936-631/+775
| |
| * Fixes FS#230: Uncaught NullPointerException in DNSHelpersteckbrief2016-08-261-7/+12
| |
| * Fixes conditions for cplus db upgradessteckbrief2016-08-231-2/+2
| |
| * Javadoc added and access to xmppConnectionService movedsteckbrief2016-08-232-5/+14
| |
| * Fixes FS#229: prompt for confirmation before deleting a filesteckbrief2016-08-232-9/+39
| |
| * Confirmation dialog added before sending delete command for remote filesteckbrief2016-08-236-23/+84
| |
| * services.filetransfer.httpupload moved to new namespace ↵steckbrief2016-08-2311-11/+11
| | | | | | | | services.filetransfer.http.upload; delete parts of services.filetransfer.http moved to .delete package
| * xmpp.httpupload moved to new namespace xmpp.filetransfer.http.upload; delete ↵steckbrief2016-08-2315-28/+22
| | | | | | | | 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-2220-15/+542
| | | | | | | | added
| * Merge remote-tracking branch 'remotes/origin/filetransfer'steckbrief2016-08-2246-205/+1679
| |\
| | * Related to FS#131, FS#129, FS#220:steckbrief2016-06-0614-83/+472
| | | | | | | | | | | | | | | | | | | | | - FileTransferFailureReason including types introduced. A failure can be recoverable, non-recoverable or limited recoverable - in case file transfer with the highest weight factor fails, the next file transfer method is used - improved logging - javadoc comments added
| | * FileTransfer reworked (first steps - functionality as is), HttpUploadsteckbrief2016-05-2939-199/+1165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
| * | Implements FS#227: Store password encrypted in internal databasesteckbrief2016-07-163-3/+131
| |/
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-093-3/+97
|\|
| * XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-0913-108/+132
| | | | | | | | XmppConnectionService.attachLocationToConversation moved to ConversationUtil
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-239-13/+397
|\| | | | | | | | | | | | | | | | | 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
| * Fixes FS#204: Observe all used directoriessteckbrief2016-04-238-48/+138
| | | | | | | | | | | | | | - Implementing the FileObserver in a separate class, with mask to watch only deletions not everything - Add observation of all directories which could contain a sent/received file - Change observers if the folder names are changed via settings - markMessage method moved from XmppConnectionService to MessageUtil
| * Related to FS#134: check if oldversion is smaller then new version on ↵steckbrief2016-04-231-2/+1
| | | | | | | | upgrading c+ db
| * Removed download decision MUST if the message contains jabber:x:oob:oob/urlsteckbrief2016-04-191-3/+0
| |
| * Persist Message.treatAsDownloadablesteckbrief2016-04-192-2/+15
| |
| * Related to FS#134: Set Message flags according to httpupload hintsteckbrief2016-04-193-0/+9
| |
| * Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-1820-188/+384
| |\ | | | | | | | | | | | | | | | Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml
| | * Implements FS#137: build flavorssteckbrief2016-04-182-50/+37
| | | | | | | | | | | | moved Config.java parameters to a flavorable configuration file
| | * Related to FS#199: Removed unnecessary build configuration variable to hide ↵steckbrief2016-04-182-6/+3
| | | | | | | | | | | | disable button on foreground service notification
| | * Related to FS#199: Removed unnecessary differentiation between a ↵steckbrief2016-04-183-16/+1
| | | | | | | | | | | | conversation with the own account
| | * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-1720-134/+361
| | |\ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1711-20/+367
| |/ | | | | | | | | | | | | 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)
| * Fixed null pointer exception in case of IOException before uploading file to ↵steckbrief2016-04-161-2/+7
| | | | | | | | http host
| * Fixes FS#197: Decrease verbosity of logging of 'skipping duplicate message'steckbrief2016-04-071-1/+1
| |
* | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-172-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle gradle/wrapper/gradle-wrapper.properties src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-073-6/+124
|\| | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
| * Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-073-6/+122
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-061-0/+43
|\| | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
| * Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferencessteckbrief2016-04-0612-144/+134
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-0517-53/+196
| |\ | |/ |/|
| * Fixes FS#180: Conference notification icon missinglookshe2016-04-011-1/+6
| |
| * Fixes FS#179: Avoid showing always empty list of ressources for mucssteckbrief2016-03-301-1/+3
| |
| * Logging for FS#80 to identify calling methodlookshe2016-03-303-0/+6
| |
| * Fixes FS#172: Conversations list not updated on status changessteckbrief2016-03-291-20/+9
| |
| * Removed unnecessary importsteckbrief2016-03-291-1/+0
| |
* | fixed installation error "W/PackageManager: Can't install because provider ↵trz/beta-1lookshe2016-04-031-20/+0
| | | | | | | | name de.thedevstack.conversationsplus (in package eu.siacs.conversations) is already used by de.thedevstack.conversationsplus"
* | fixed build errorlookshe2016-04-031-0/+2
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-0/+75
|\| | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
| * Avoid unnecessary text change on activate account buttonsteckbrief2016-03-291-2/+3
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 01:16:24 +0000