aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* use build in method on >= lolipop devices to discover dns serverslolipop_dns_server_discoveryDaniel Gultsch2015-08-282-8/+41
|
* reformating and upper bound for waiting on stanza writerDaniel Gultsch2015-08-281-8/+16
|
* fixed type=timeoutDaniel Gultsch2015-08-281-0/+2
|
* added XEP number for http file uploadDaniel Gultsch2015-08-278-8/+41
|
* use dedicated colors for primary and primary_darkDaniel Gultsch2015-08-266-9/+10
|
* version bump to 1.6.6 and changelog1.6.6Daniel Gultsch2015-08-262-2/+5
|
* fixed highlight text color for white chat bubblesDaniel Gultsch2015-08-261-0/+1
|
* Fix error handling for announce check retrievalAndreas Straub2015-08-261-3/+3
| | | | | Only aborts when a timeout was received. Error conditions (most notably item-not-found) are interpreted as no other devices existing.
* explictitly handle iq timeouts in bind and session iqsDaniel Gultsch2015-08-261-2/+7
|
* Only announce device after publishing bundleAndreas Straub2015-08-262-8/+19
|
* moved actual iq callback out of synchronized find callback blockDaniel Gultsch2015-08-261-3/+7
|
* be more restrictive about marking messages as sent_received in muc parserDaniel Gultsch2015-08-262-8/+18
|
* Revert "improved compatibility with muc components that change the message id"Daniel Gultsch2015-08-261-3/+2
| | | | This reverts commit df86b0fc47cb7af8e97826f97d0e202405cff414.
* version bump to 1.6.5 + changelog1.6.5Daniel Gultsch2015-08-262-2/+5
|
* Fix key publishingAndreas Straub2015-08-261-72/+68
| | | | | | | Remove invalid check for result code, which prevented publishing if the node was empty to begin with. Fix pepBroken check
* version bump to 1.6.4 and changelog1.6.4Daniel Gultsch2015-08-252-2/+7
|
* Add more logging to pep attemp counter logicAndreas Straub2015-08-251-0/+1
|
* Limit number of PEP publish triesAndreas Straub2015-08-251-9/+42
| | | | | | If PEP publish tries are repeatedly triggered by empty PEP updates, stop attempting to publish after 3 tries. This should work around broken PEP implementations in older ejabberd and OpenFire versions.
* Merge pull request #1365 from betheg/remove_importsDaniel Gultsch2015-08-254-30/+1
|\ | | | | remove unused imports.
| * remove unused imports.Michael2015-08-254-30/+1
| |
* | Merge pull request #1364 from betheg/jdk15onDaniel Gultsch2015-08-251-1/+1
|\ \ | |/ |/| update bcprov-jdk15on to v1.52
| * update bcprov-jdk15on to v1.52Michael2015-08-251-1/+1
| |
* | Pass through device IDs when updating own listAndreas Straub2015-08-251-17/+17
| |
* | cleared up some error messages in axolotl service and execute ↵Daniel Gultsch2015-08-251-3/+7
| | | | | | | | publishOwnDevicesWhenNeeded() only if processing our own jid
* | catch some db query exceptionsDaniel Gultsch2015-08-251-3/+5
| |
* | additonal null checks in file backendDaniel Gultsch2015-08-251-0/+3
| |
* | fixed session timeDaniel Gultsch2015-08-251-7/+2
|/
* Merge pull request #1363 from betheg/minidnsDaniel Gultsch2015-08-251-1/+1
|\ | | | | update minidns to v0.1.7
| * update minidns to v0.1.7Michael2015-08-251-1/+1
|/
* Merge pull request #1362 from betheg/roundedimageviewDaniel Gultsch2015-08-251-1/+1
|\ | | | | update roundedimageview to v2.2.0
| * update roundedimageview to v2.2.0Michael2015-08-251-1/+1
|/
* Merge branch 'betheg-sdk_version' into developmentDaniel Gultsch2015-08-242-7/+7
|\
| * Merge branch 'sdk_version' of https://github.com/betheg/Conversations into ↵Daniel Gultsch2015-08-242-7/+7
|/| | | | | | | betheg-sdk_version
| * add the the previously deleted build-tools.Michael2015-08-241-0/+3
| |
| * update travis.ymlMichael2015-08-241-4/+2
| |
| * update android sdk and support library.Michael2015-08-241-6/+5
| | | | | | | | | | make use of the archivesBaseName and rename only 'zipaligned' release build.
* | version bump to 1.7.0-betaDaniel Gultsch2015-08-241-2/+2
| |
* | increased carbon grace period to 90sDaniel Gultsch2015-08-241-1/+1
| |
* | pulled translations from transifexDaniel Gultsch2015-08-2425-49/+18
| |
* | renamed plain text to unencrypted. fixes #1331Daniel Gultsch2015-08-2428-53/+53
| |
* | fixed regression with mlinks stream managment. fixes #1206Daniel Gultsch2015-08-241-1/+1
| |
* | added setting to allow for white backgrounds in incoming message bubblesDaniel Gultsch2015-08-2427-36/+234
| |
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-241-1/+1
|\ \ | |/ |/|
| * catch invalid base64 in axolotl key parsingDaniel Gultsch2015-08-241-1/+1
| |
* | Merge branch 'master' into developmentdevelopmentDaniel Gultsch2015-08-233-2/+5
|\|
| * version bump to 1.6.3 and changelog1.6.3Daniel Gultsch2015-08-232-2/+5
| |
| * open files with capital extensions as well. fixes #1354Daniel Gultsch2015-08-231-1/+1
| |
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-232-3/+2
|\|
| * bugfix: next encryption is now being properly detected1.6.2Daniel Gultsch2015-08-232-3/+2
| |
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-232-1/+4
|\|