aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Formatting of remote file status adjustedtrz/renamesteckbrief2017-01-112-3/+3
|
* Improved error handling for filetransfer:http:delete, Check for httpupload ↵steckbrief2017-01-1114-79/+160
| | | | feature available extended to include filetransfer:http as well, method to check if http upload is available moved from data class 'Account' to 'AccountUtil'
* Generic view util added to change the visibility of subclasses of Viewsteckbrief2017-01-112-2/+41
|
* Custom toast view addedsteckbrief2017-01-114-0/+123
|
* Merge branch 'trz/rebase' into trz/renamesteckbrief2017-01-0521-313/+583
|\
| * related to FS#237steckbrief2017-01-051-1/+0
| |
| * Merge remote-tracking branch 'origin/trz/rename' into trz/rebasesteckbrief2017-01-055-58/+68
| |\ | |/ |/|
| * Fixed errors with notificationstrz/beta-7steckbrief2017-01-041-3/+6
| |
| * Fixed NPE in FileParams.setKeyAndIvsteckbrief2017-01-041-11/+13
| |
| * Added columns to fileparams table: url, original file name, key and ivtrz/beta-5steckbrief2017-01-0421-310/+577
| | | | | | | | | | 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-2097-844/+3405
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-0913-111/+140
| |\ \
| * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-2321-70/+559
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-188-80/+42
| |\ \ \ \
* | | | | | Hide number of unread message counter if there are no new messagessteckbrief2016-12-291-3/+5
| | | | | |
* | | | | | Implement FS#239: Show number of unread messages in conversations overviewsteckbrief2016-12-282-44/+59
| | | | | |
* | | | | | Fixes FS#237: Enable long click in layout instead of programmaticallysteckbrief2016-10-233-15/+7
| |_|_|_|/ |/| | | |
* | | | | Fixes FS#29: Own Avatar not loadedsteckbrief2016-09-291-3/+9
| | | | |
* | | | | Implements FS#235: Deletion of remote files uploaded via httpuploadsteckbrief2016-09-2938-631/+790
| | | | |
* | | | | 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-234-9/+41
| | | | |
* | | | | 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-2222-15/+547
| | | | | | | | | | | | | | | | | | | | 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-164-3/+267
|/ / / /
* | | / XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-0913-108/+132
| |_|/ |/| | | | | | | | XmppConnectionService.attachLocationToConversation moved to ConversationUtil
* | | 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-1864-305/+554
|\ \ \ | | |/ | |/| | | | | | | | | | 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: fixed merge hickups (message correction setting removed, ↵steckbrief2016-04-182-8/+1
| | | | | | | | | | | | key for other expert settings readded)
| * | 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
| * | removed unused stringlookshe2016-04-171-1/+0
| | |
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-1764-250/+538
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * @Overrides addedtrz/merge_1.11.7lookshe2016-04-171-0/+6
| | |
| | * Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-1764-285/+538
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * always notify by default in conferencesDaniel Gultsch2016-04-142-3/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 13:56:04 +0000