aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #33 from siacs/masterChristian S.2015-09-041-1/+7
|\
| * added special error state for dns timeoutDaniel Gultsch2015-09-011-1/+7
* | copy commitsChristian S2015-08-292-11/+26
|\|
| * use build in method on >= lolipop devices to discover dns serversDaniel Gultsch2015-08-281-1/+1
| * reformating and upper bound for waiting on stanza writerDaniel Gultsch2015-08-281-8/+16
| * fixed type=timeoutDaniel Gultsch2015-08-281-0/+2
| * explictitly handle iq timeouts in bind and session iqsDaniel Gultsch2015-08-261-2/+7
* | Version 1.6.5Christian S2015-08-262-37/+10
|\|
| * moved actual iq callback out of synchronized find callback blockDaniel Gultsch2015-08-261-3/+7
| * remove unused imports.Michael2015-08-251-26/+0
| * fixed session timeDaniel Gultsch2015-08-251-7/+2
| * fixed regression with mlinks stream managment. fixes #1206Daniel Gultsch2015-08-241-1/+1
* | Merge pull request #27 from siacs/developmentChristian S.2015-08-244-49/+69
|\|
| * Merge branch 'master' into developmentDaniel Gultsch2015-08-234-8/+8
| |\
| | * introduce special iq type for internal timeouts. always use != result to chec...Daniel Gultsch2015-08-234-10/+10
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-231-10/+10
| |\|
| | * reformatingDaniel Gultsch2015-08-231-3/+1
| | * deal with another set of stream:features after bindDaniel Gultsch2015-08-231-7/+9
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-231-31/+51
| |\|
| | * remove callbacks directly from iteratorDaniel Gultsch2015-08-231-2/+2
| | * don't make subsequent iq request when original stanza returned an errorDaniel Gultsch2015-08-231-30/+45
| | * modified clearIqCallbacks into 2-step processDaniel Gultsch2015-08-231-10/+15
* | | copy commitsChristian S2015-08-191-31/+41
|\| |
| * | simulate old behaviour with messages being set to waiting while offlineDaniel Gultsch2015-08-191-2/+10
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-161-29/+31
| |\|
| | * deal with broken frameworksDaniel Gultsch2015-08-161-4/+1
| | * synchronize packetCallbacksDaniel Gultsch2015-08-161-25/+30
* | | Merge branch 'siacs/development' into developmentChristian S2015-08-156-60/+52
|\| |
| * | fully depend on smDaniel Gultsch2015-08-156-60/+52
| |/
* | version 1.6.0 beta 3Christian S2015-08-123-62/+52
|\|
| * do not touch pictures that are already in the right formatDaniel Gultsch2015-08-111-19/+25
| * put wake locks on out of band file transfersDaniel Gultsch2015-08-102-25/+17
| * report wrong file size in otr encrypted jingle file transfers to be compatibl...Daniel Gultsch2015-08-101-2/+6
| * fixed image preview in notfications for images that arrived over jingleDaniel Gultsch2015-08-081-6/+4
| * removed dead codeDaniel Gultsch2015-08-081-10/+0
* | copy commitsChristian S2015-08-081-34/+51
|\|
| * don't request ack for iq stanzas before stream managment is initializedDaniel Gultsch2015-08-081-2/+2
| * request server-ACKs for iq stanzasDaniel Gultsch2015-08-061-33/+37
| * fail old/invalid iq stanzas on bindDaniel Gultsch2015-08-061-0/+13
* | copy commitsChristian S2015-08-027-31/+119
|\|
| * enable axolotl encryption for jingle supported file transfersDaniel Gultsch2015-08-015-85/+94
| * use gcm for file encryption over httpDaniel Gultsch2015-07-293-4/+77
| * rewrote dns fallbackDaniel Gultsch2015-07-241-0/+3
| * switch/case can't deal with null pointersDaniel Gultsch2015-07-231-0/+3
* | copy commitsChristian S2015-07-232-5/+5
|\|
| * Add INACTIVE state for removed keysAndreas Straub2015-07-212-5/+5
|/
* rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-201-5/+1
* Optimize importsAndreas Straub2015-07-206-17/+17
* Ask for key trust when sending messagesAndreas Straub2015-07-191-0/+5
* Added PEP and message protocol layersAndreas Straub2015-07-191-0/+5