aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rename' into trz/rebasesteckbrief2017-01-111-22/+51
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-201-11/+8
|\|
* | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-59/+84
|\ \
| * | republish avatar if server offers non-persistent pep :-(Daniel Gultsch2016-04-111-7/+9
| * | don't throw IO exception at end of streamDaniel Gultsch2016-04-101-1/+0
| * | moved authentication into seperate method. force close socket before changing...Daniel Gultsch2016-04-101-38/+44
| * | transform nimbuzz workaround into a more general 'waitForDisco' conditionDaniel Gultsch2016-04-091-6/+11
| * | add required disco#items query to timeout listDaniel Gultsch2016-04-081-1/+4
| * | switched around info and items query to avoid race conditionDaniel Gultsch2016-04-041-1/+1
| * | made sure the disco#items query has returned before finalizing the bindDaniel Gultsch2016-04-041-12/+24
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-061-1/+2
|\ \ \ | | |/ | |/|
* | | Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-8/+34
|\ \ \ | | |/ | |/|
| * | check max http file size when attaching filesDaniel Gultsch2016-04-011-2/+15
| * | add methods to check max file size for http uploadDaniel Gultsch2016-03-311-8/+21
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-3/+7
|\| |
| * | be more careful to avoid creating multiple connectionsDaniel Gultsch2016-03-201-3/+7
* | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-2/+2
|\| |
| * | log reason for bind failureDaniel Gultsch2016-03-111-2/+2
* | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-14/+1
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-29/+47
|\| |
| * | fixed regression that caused messages in muc not being sendDaniel Gultsch2016-02-171-1/+1
| * | optional mode to close tcp connection when going into backgroundDaniel Gultsch2016-02-141-20/+38
| * | client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-9/+5
* | | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-49/+47
|\| |
| * | use TLSv1.2 as SSL context on supported plattformsDaniel Gultsch2016-02-031-1/+1
| * | cache server capsDaniel Gultsch2016-02-031-1/+16
| * | Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...Daniel Gultsch2016-02-021-47/+30
| |\ \
| | * | Factor out a representation of XEP-0030 resultsStephen Paul Weber2016-01-231-47/+30
* | | | Imports organizedsteckbrief2016-02-121-14/+2
* | | | Simplification of DNS requests.steckbrief2016-02-121-63/+48
* | | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-380/+760
|\| | |
| * | | be more careful with resetting the stream idDaniel Gultsch2016-01-291-2/+1
| * | | expert setting to trigger extended connection optionsDaniel Gultsch2016-01-251-2/+11
| |/ /
| * | reset stanza queue when resetting xmppconnectionDaniel Gultsch2016-01-231-0/+1
| * | added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-2/+3
| * | reuse same xmppconnection for reconnectsDaniel Gultsch2016-01-161-0/+8
| * | nimbuzz.com: don't wait for disco replies to set account to onlineDaniel Gultsch2016-01-151-11/+26
| * | throw security exception instead of going to next srv entryDaniel Gultsch2016-01-121-1/+3
| * | move some ssl socket modifiers into a seperate helper classDaniel Gultsch2016-01-121-56/+5
| * | Implement XEP-0368: SRV records for XMPP over TLSmoparisthebest2016-01-111-54/+149
| * | reworked that loop that iterates over various serversreworked_host_finder_loopDaniel Gultsch2016-01-111-16/+10
| * | throw exception at the end of the streamDaniel Gultsch2015-12-171-128/+122
| * | timeout service discovery after 20sDaniel Gultsch2015-12-151-7/+42
| * | wait with status change to online after all disco queries have been madeDaniel Gultsch2015-12-091-5/+14
| * | add error state for unavailable tor networkDaniel Gultsch2015-12-011-6/+2
| * | refactored socks5 connection code. make jingle transport use that new codeDaniel Gultsch2015-12-011-23/+6
| * | do socks5 connect manuallyDaniel Gultsch2015-12-011-14/+34
| * | initial tor supportDaniel Gultsch2015-12-011-5/+13
| * | detect server identity and added muc-workaround for slackDaniel Gultsch2015-11-261-2/+34
| * | pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-1/+1