aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp (follow)
Commit message (Expand)AuthorAgeFilesLines
* do not query service info from main server againiNPUTmice2014-12-011-5/+3
* work around to not confuse irc transport with real conference serversiNPUTmice2014-11-211-2/+7
* brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-203-1/+133
* better exception handling in XmppConnection.connect. (never return without th...iNPUTmice2014-11-181-39/+15
* avoided some null pointersiNPUTmice2014-11-171-2/+6
* better error checking in ssl switch overiNPUTmice2014-11-161-5/+9
* small modifications for changing an account status in XmppConnectioniNPUTmice2014-11-151-8/+6
* Merge pull request #668 from SamWhited/auth-pinningDaniel Gultsch2014-11-152-44/+60
|\
| * Set security error status on TLS cert mismatchSam Whited2014-11-151-6/+7
| * Add incompatible server statusSam Whited2014-11-151-0/+1
| * Add security error statusSam Whited2014-11-151-1/+2
| * Make account status an enumSam Whited2014-11-152-26/+26
| * Add auth method pinningSam Whited2014-11-151-13/+26
* | fixed some disco / carbon related bugsiNPUTmice2014-11-151-29/+43
|/
* better cleanup after unsuccesful transfersiNPUTmice2014-11-153-1/+35
* fixed description in notifications and conversation overviewiNPUTmice2014-11-151-3/+10
* fixed resending for files as welliNPUTmice2014-11-151-0/+1
* made file transfers cancelableiNPUTmice2014-11-153-20/+48
* progress for ibb transfersiNPUTmice2014-11-154-13/+25
* some mime and pgp fixes for file transferiNPUTmice2014-11-151-1/+20
* support for pgp filesiNPUTmice2014-11-151-0/+2
* progress for http images as well. fixed open button for sent filesiNPUTmice2014-11-151-2/+6
* bug fixes and various improvements for file transferiNPUTmice2014-11-151-7/+4
* basic arbitrary file transferiNPUTmice2014-11-152-55/+84
* Improve auth error handling and state machineSam Whited2014-11-151-8/+7
* Add SCRAM-SHA1 supportSam Whited2014-11-142-299/+322
* Merge pull request #656 from SamWhited/authrefactorDaniel Gultsch2014-11-121-29/+20
|\
| * Refactor authentication codeSam Whited2014-11-121-29/+20
* | Make sure we're storing the display JID as UnicodeSam Whited2014-11-121-2/+3
|/
* made Jid class parse otr session idsiNPUTmice2014-11-101-0/+10
* more refactoring for presence selection. removed getTo, getFrom and getJid fr...iNPUTmice2014-11-101-1/+1
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-094-45/+45
* refactored code to always contain full jid for counterpartiNPUTmice2014-11-091-1/+1
* return null if from ist not set in abstract stanzaiNPUTmice2014-11-091-12/+17
* Check for illegal arguments to the toASCII funcSam Whited2014-11-092-3/+17
* Fix issue with IDN SRV recordsSam Whited2014-11-091-2/+3
* Create avatar's for JID's w/o localpartsSam Whited2014-11-091-1/+1
* Fix JID parsing errorSam Whited2014-11-091-1/+1
* It builds again!Sam Whited2014-11-091-5/+1
* Update another chunk of stuff to use JID objectsSam Whited2014-11-091-0/+4
* Update more files to use JID objectsSam Whited2014-11-097-47/+72
* Move a chunk of classes over to using JID objectsSam Whited2014-11-094-117/+118
* Use factories to generate JIDsSam Whited2014-11-091-18/+22
* Improve JID error handlingSam Whited2014-11-092-9/+57
* Add first attempt at JID classSam Whited2014-11-091-0/+151
* got rid of MTM and mRandom variable in favor of using a reference to serviceiNPUTmice2014-11-091-12/+7
* check if socket was null before doing ssl connectiNPUTmice2014-11-081-46/+42
* more error handling in xmppconnectioniNPUTmice2014-11-031-66/+78
* Merge branch 'gradle' into developmentSam Whited2014-10-303-50/+46
* Make conversations the root projectSam Whited2014-10-2233-0/+3387