Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into developmentdevelopment | Daniel Gultsch | 2015-08-23 | 1 | -1/+1 |
|\ | |||||
| * | open files with capital extensions as well. fixes #1354 | Daniel Gultsch | 2015-08-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 2 | -3/+2 |
|\| | |||||
| * | bugfix: next encryption is now being properly detected1.6.2 | Daniel Gultsch | 2015-08-23 | 2 | -3/+2 |
| | | |||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 7 | -18/+16 |
|\| | |||||
| * | introduce special iq type for internal timeouts. always use != result to ↵ | Daniel Gultsch | 2015-08-23 | 7 | -20/+18 |
| | | | | | | | | check for error in callbacks | ||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 1 | -10/+10 |
|\| | |||||
| * | reformating | Daniel Gultsch | 2015-08-23 | 1 | -3/+1 |
| | | |||||
| * | deal with another set of stream:features after bind | Daniel Gultsch | 2015-08-23 | 1 | -7/+9 |
| | | |||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 5 | -177/+212 |
|\| | |||||
| * | Add error handling to OMEMO PEP code | Andreas Straub | 2015-08-23 | 1 | -116/+131 |
| | | | | | | | | Log received errors and abort processing | ||||
| * | remove callbacks directly from iterator | Daniel Gultsch | 2015-08-23 | 1 | -2/+2 |
| | | |||||
| * | don't make subsequent iq request when original stanza returned an error | Daniel Gultsch | 2015-08-23 | 2 | -51/+67 |
| | | |||||
| * | modified clearIqCallbacks into 2-step process | Daniel Gultsch | 2015-08-23 | 3 | -19/+23 |
| | | |||||
* | | simulate old behaviour with messages being set to waiting while offline | Daniel Gultsch | 2015-08-19 | 2 | -3/+10 |
| | | |||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-19 | 1 | -0/+1 |
|\| | |||||
| * | fixed nasty 'stuck at sending' bug that got introduced in ↵ | Daniel Gultsch | 2015-08-19 | 1 | -0/+1 |
| | | | | | | | | 32826ec29d28668b7f345ffcd45cd876dc980153 | ||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-19 | 2 | -1/+7 |
|\| | |||||
| * | check if inputstream is null before cropping avatar images | Daniel Gultsch | 2015-08-19 | 1 | -0/+6 |
| | | |||||
| * | catch package manager has died exception | Daniel Gultsch | 2015-08-19 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-16 | 3 | -34/+35 |
|\| | |||||
| * | deal with broken frameworks | Daniel Gultsch | 2015-08-16 | 1 | -4/+1 |
| | | |||||
| * | catch broken base64 in avatars | Daniel Gultsch | 2015-08-16 | 1 | -5/+1 |
| | | |||||
| * | synchronize packetCallbacks | Daniel Gultsch | 2015-08-16 | 1 | -25/+30 |
| | | |||||
| * | catch null pointer in ScramSHA1 sasl | Daniel Gultsch | 2015-08-16 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'depend_on_sm' into development | Daniel Gultsch | 2015-08-15 | 7 | -86/+76 |
|\ \ | |/ |/| | |||||
| * | fully depend on sm | Daniel Gultsch | 2015-08-15 | 7 | -86/+76 |
| | | |||||
* | | Merge branch 'development' | Daniel Gultsch | 2015-08-15 | 1 | -0/+10 |
|\ \ | |||||
| * | | Display error message if all contact keys purged | Andreas Straub | 2015-08-15 | 1 | -0/+10 |
| |/ | |||||
* | | Merge branch 'development' | Daniel Gultsch | 2015-08-15 | 74 | -901/+4637 |
|\| | |||||
| * | provide extra interface to close sockets. fixes #1330 | Daniel Gultsch | 2015-08-15 | 2 | -2/+11 |
| | | |||||
| * | show HTTP upload availability on Edit account screen | hlad | 2015-08-14 | 1 | -0/+7 |
| | | |||||
| * | do not touch pictures that are already in the right format | Daniel Gultsch | 2015-08-11 | 6 | -51/+218 |
| | | | | | | | | fixed #522 | ||||
| * | use same code that is used to open files for images | Daniel Gultsch | 2015-08-11 | 1 | -4/+1 |
| | | | | | | | | fixes #1323 | ||||
| * | changed color of 'whispered' prefix | Daniel Gultsch | 2015-08-11 | 1 | -2/+1 |
| | | | | | | | | fixes #1326 | ||||
| * | put wake locks on out of band file transfers | Daniel Gultsch | 2015-08-10 | 5 | -25/+32 |
| | | |||||
| * | report wrong file size in otr encrypted jingle file transfers to be ↵ | Daniel Gultsch | 2015-08-10 | 3 | -3/+10 |
| | | | | | | | | compatible with conversations > 1.6 | ||||
| * | provide more detailed error toasts for http file download | Daniel Gultsch | 2015-08-10 | 1 | -37/+58 |
| | | |||||
| * | fixed image preview in notfications for images that arrived over jingle | Daniel Gultsch | 2015-08-08 | 1 | -6/+4 |
| | | |||||
| * | renamed multi-end / axolotl to OMEMO | Daniel Gultsch | 2015-08-08 | 4 | -7/+7 |
| | | |||||
| * | removed dead code | Daniel Gultsch | 2015-08-08 | 1 | -10/+0 |
| | | |||||
| * | don't request ack for iq stanzas before stream managment is initialized | Daniel Gultsch | 2015-08-08 | 1 | -2/+2 |
| | | | | | | | | fixes #1322 | ||||
| * | Increase number of published prekeys for release | Andreas Straub | 2015-08-07 | 1 | -1/+1 |
| | | |||||
| * | request server-ACKs for iq stanzas | Daniel Gultsch | 2015-08-06 | 1 | -33/+37 |
| | | |||||
| * | fail old/invalid iq stanzas on bind | Daniel Gultsch | 2015-08-06 | 1 | -0/+13 |
| | | |||||
| * | hide multi-end and otr encryption in conferences | Daniel Gultsch | 2015-08-06 | 1 | -2/+3 |
| | | |||||
| * | Improve TrustKeysActivity slider responsiveness | Andreas Straub | 2015-08-05 | 1 | -11/+11 |
| | | | | | | | | | | | | Slider used to skip back on drag-and-drop action. The switch doesn't trigger explicit whole UI refreshes anymore, it now directly adjusts the "done" button's locked status. | ||||
| * | added config.java variable to hide openpgp as an encryption method | Daniel Gultsch | 2015-08-05 | 3 | -0/+4 |
| | | |||||
| * | added Config.java varibale to lock account creation to specfic domain | Daniel Gultsch | 2015-08-03 | 7 | -33/+108 |
| | | |||||
| * | lets try jpeg for a while | Daniel Gultsch | 2015-08-01 | 1 | -1/+1 |
| | |