aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
|\|
| * changed http upload namespace to reflect the one in the XEPDaniel Gultsch2015-09-141-1/+1
* | Version 1.6.9Christian S2015-09-121-0/+1
|\|
| * increased dns timeoutDaniel Gultsch2015-09-101-0/+1
* | Merge pull request #34 from siacs/masterChristian S.2015-09-051-9/+21
|\|
| * ignore timeout exceptions on secondary dns requestsDaniel Gultsch2015-09-051-9/+21
* | copy commitsChristian S2015-08-291-7/+40
|\|
| * use build in method on >= lolipop devices to discover dns serversDaniel Gultsch2015-08-281-7/+40
* | Version 1.6.5Christian S2015-08-261-3/+5
|\|
| * catch some db query exceptionsDaniel Gultsch2015-08-251-3/+5
* | Merge pull request #27 from siacs/developmentChristian S.2015-08-241-1/+1
|\|
| * open files with capital extensions as well. fixes #1354Daniel Gultsch2015-08-231-1/+1
* | copy commitsChristian S2015-08-191-1/+1
|\|
| * catch package manager has died exceptionDaniel Gultsch2015-08-191-1/+1
* | version 1.6.0 beta 3Christian S2015-08-121-0/+144
|\|
| * do not touch pictures that are already in the right formatDaniel Gultsch2015-08-111-0/+144
* | copy commitsChristian S2015-08-021-10/+6
|\|
| * changed logging. (work around logcat null pointerDaniel Gultsch2015-07-281-1/+0
| * rewrote dns fallbackDaniel Gultsch2015-07-241-9/+6
* | copy commitsChristian S2015-07-207-45/+43
|\|
| * Optimize importsAndreas Straub2015-07-206-40/+39
| * Adapt prettifyFingerprint() to axolotl FP sizesAndreas Straub2015-07-191-5/+4
* | show contact name also in locations shared in MUCsChristian S2015-07-171-1/+13
* | copy commitsChristian S2015-07-161-1/+2
|\|
| * made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-161-1/+2
* | changed 'checking_image' to 'checking_file'Christian S2015-07-141-1/+1
* | Merge branch 'development' of https://github.com/siacs/Conversations into sia...Christian S2015-07-143-12/+13
|\|
| * null check otr fingerprint before displayDaniel Gultsch2015-07-111-1/+3
| * renamed downloadable to transferableDaniel Gultsch2015-07-101-10/+9
| * print stack trace instead of writing error message to log in case of unknown ...Daniel Gultsch2015-07-091-1/+1
* | Merge remote-tracking branch 'origin/patch-1' into developmentChristian S2015-07-081-1/+1
|\|
| * show contacts name in non anonymous mucs. fixes #1213Daniel Gultsch2015-07-051-2/+6