aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #80 from siacs/masterChristian S2016-03-201-4/+5
|\ | | | | copy commits
| * show room nick for /me command in sent muc messages. fixes #1773Daniel Gultsch2016-03-201-4/+5
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-03-171-1/+10
|\|
| * Check if path for URI is accessiblefiaxh2016-03-151-1/+10
| | | | | | | | | | The path extracted from the Cursor might not be accessible for Conversations. FileUtils accesses URI information through the ContentProvider, so this wouldn't be noticed. Fixes sharing from open-keychain's TemporaryContentProvider
* | Merge branch 'siacs/master' into developmentChristian S2016-03-051-1/+4
|\|
| * mark oob messages and always display download buttonDaniel Gultsch2016-03-041-1/+4
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-02-271-1/+3
|\|
| * Retry decryption from message menufiaxh2016-02-231-1/+3
| |
* | Add device name to client infoArtem Shipovskiy2016-02-041-0/+4
| |
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-042-2/+28
|\|
| * use TLSv1.2 as SSL context on supported plattformsDaniel Gultsch2016-02-031-0/+11
| |
| * prefer dns servers from networsk with the default routeDaniel Gultsch2016-01-291-2/+17
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-01-231-27/+45
|\|
| * catch security exception when user prevents access to address bookDaniel Gultsch2016-01-201-27/+45
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-01-133-77/+163
|\|
| * move some ssl socket modifiers into a seperate helper classDaniel Gultsch2016-01-121-0/+62
| |
| * Implement XEP-0368: SRV records for XMPP over TLSmoparisthebest2016-01-111-50/+71
| |
| * ask to be excluded from battery optimizationDaniel Gultsch2016-01-111-27/+29
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-01-101-0/+3
|\|
| * null check in getOriginalPathDaniel Gultsch2016-01-041-0/+3
| |
* | copy commitsChristian S2015-12-291-1/+1
|\|
| * handle null names in getColorForNameDaniel Gultsch2015-12-291-1/+1
| |
* | copy commitsChristian S2015-12-281-23/+52
|\|
| * lower case all fingerprints. fixes #1521Daniel Gultsch2015-12-271-1/+2
| |
| * code cleanupDaniel Gultsch2015-12-231-22/+0
| |
| * show certificate informationDaniel Gultsch2015-12-231-0/+50
| |
| * ask for contact permissions when first opening StartConversationActivityDaniel Gultsch2015-12-071-0/+11
| |
| * avoid some NPEsDaniel Gultsch2015-12-041-2/+3
| |
| * add error state for unavailable tor networkDaniel Gultsch2015-12-011-4/+9
| |
| * refactored socks5 connection code. make jingle transport use that new codeDaniel Gultsch2015-12-011-0/+52
| |
* | ask for contact permissions when first opening StartConversationActivityDaniel Gultsch2015-12-121-0/+11
| |
* | avoid some NPEsDaniel Gultsch2015-12-041-2/+3
| |
* | add error state for unavailable tor networkDaniel Gultsch2015-12-041-4/+9
| |
* | refactored socks5 connection code. make jingle transport use that new codeDaniel Gultsch2015-12-041-0/+52
| |
* | copy commitsChristian S2015-11-291-21/+0
|\|
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-21/+0
| |
* | show own name in sent locationsChristian S2015-11-141-0/+2
| |
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-312-0/+36
|\|
| * show encryption type in warned/red messagesDaniel Gultsch2015-10-281-0/+15
| |
| * Reset the margins manually after rotatingsaqura2015-10-261-0/+21
| |
* | copy commitsChristian S2015-10-171-4/+24
|\|
| * introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-161-4/+24
| | | | | | | | cleaned up TrustKeysActivity to automatically close if there is nothing to do
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-161-0/+19
|\|
| * add menu item in account details to renew certificateDaniel Gultsch2015-10-111-0/+19
| |
* | Version 1.6.10Christian S2015-09-201-1/+8
|\|
| * let DnsHelper provide a fallback solutionDaniel Gultsch2015-09-191-1/+8
| |
* | copy commitsChristian S2015-09-182-6/+16
|\|
| * introduced Config variable to use legacy namespace for http uploadDaniel Gultsch2015-09-171-1/+3
| |
| * fixed rare NPE in DnsHelper. fixed spelling and added loggingDaniel Gultsch2015-09-171-5/+13
| |
* | Merge branch 'siacs/master' into developmentChristian S2015-09-151-1/+1
|\|