aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl (follow)
Commit message (Collapse)AuthorAgeFilesLines
* FileTransfer reworked (first steps - functionality as is), HttpUploadsteckbrief2016-05-291-2/+3
| | | | | | | | | | | 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
* XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-091-1/+2
| | | | XmppConnectionService.attachLocationToConversation moved to ConversationUtil
* Merge branch 'trz/rebase' into trz/renamelookshe2016-04-173-4/+20
| | | | | | | | | | | | | | | | 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
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-083-133/+171
|
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-069-0/+2242