aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.6.3' into trz/rebasetrz/merge_1.6.3lookshe2015-08-2476-1090/+4967
|\
| * open files with capital extensions as well. fixes #1354Daniel Gultsch2015-08-231-1/+1
| * bugfix: next encryption is now being properly detected1.6.2Daniel Gultsch2015-08-232-3/+2
| * introduce special iq type for internal timeouts. always use != result to chec...Daniel Gultsch2015-08-237-20/+18
| * reformatingDaniel Gultsch2015-08-231-3/+1
| * deal with another set of stream:features after bindDaniel Gultsch2015-08-231-7/+9
| * Add error handling to OMEMO PEP codeAndreas Straub2015-08-231-116/+131
| * remove callbacks directly from iteratorDaniel Gultsch2015-08-231-2/+2
| * don't make subsequent iq request when original stanza returned an errorDaniel Gultsch2015-08-232-51/+67
| * modified clearIqCallbacks into 2-step processDaniel Gultsch2015-08-233-19/+23
| * fixed nasty 'stuck at sending' bug that got introduced in 32826ec29d28668b7f3...Daniel Gultsch2015-08-191-0/+1
| * check if inputstream is null before cropping avatar imagesDaniel Gultsch2015-08-191-0/+6
| * catch package manager has died exceptionDaniel Gultsch2015-08-191-1/+1
| * deal with broken frameworksDaniel Gultsch2015-08-161-4/+1
| * catch broken base64 in avatarsDaniel Gultsch2015-08-161-5/+1
| * synchronize packetCallbacksDaniel Gultsch2015-08-161-25/+30
| * catch null pointer in ScramSHA1 saslDaniel Gultsch2015-08-161-0/+3
| * Merge branch 'development'Daniel Gultsch2015-08-151-0/+10
| |\
| | * Display error message if all contact keys purgedAndreas Straub2015-08-151-0/+10
| * | Merge branch 'development'Daniel Gultsch2015-08-1574-901/+4637
| |\|
| | * provide extra interface to close sockets. fixes #1330Daniel Gultsch2015-08-152-2/+11
| | * show HTTP upload availability on Edit account screenhlad2015-08-141-0/+7
| | * do not touch pictures that are already in the right formatDaniel Gultsch2015-08-116-51/+218
| | * use same code that is used to open files for imagesDaniel Gultsch2015-08-111-4/+1
| | * changed color of 'whispered' prefixDaniel Gultsch2015-08-111-2/+1
| | * put wake locks on out of band file transfersDaniel Gultsch2015-08-105-25/+32
| | * report wrong file size in otr encrypted jingle file transfers to be compatibl...Daniel Gultsch2015-08-103-3/+10
| | * provide more detailed error toasts for http file downloadDaniel Gultsch2015-08-101-37/+58
| | * fixed image preview in notfications for images that arrived over jingleDaniel Gultsch2015-08-081-6/+4
| | * renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-084-7/+7
| | * removed dead codeDaniel Gultsch2015-08-081-10/+0
| | * don't request ack for iq stanzas before stream managment is initializedDaniel Gultsch2015-08-081-2/+2
| | * Increase number of published prekeys for releaseAndreas Straub2015-08-071-1/+1
| | * request server-ACKs for iq stanzasDaniel Gultsch2015-08-061-33/+37
| | * fail old/invalid iq stanzas on bindDaniel Gultsch2015-08-061-0/+13
| | * hide multi-end and otr encryption in conferencesDaniel Gultsch2015-08-061-2/+3
| | * Improve TrustKeysActivity slider responsivenessAndreas Straub2015-08-051-11/+11
| | * added config.java variable to hide openpgp as an encryption methodDaniel Gultsch2015-08-053-0/+4
| | * added Config.java varibale to lock account creation to specfic domainDaniel Gultsch2015-08-037-33/+108
| | * lets try jpeg for a whileDaniel Gultsch2015-08-011-1/+1
| | * use content-type in http slot request and stick with during uploadDaniel Gultsch2015-08-012-2/+8
| | * fixed calculated file size in http slot requestDaniel Gultsch2015-08-011-15/+13
| | * Let UNTRUSTED/UNDECIDED keys become INACTIVEAndreas Straub2015-08-019-116/+138
| | * enable axolotl encryption for jingle supported file transfersDaniel Gultsch2015-08-0110-138/+223
| | * Provide process function for key transport messageAndreas Straub2015-07-314-19/+84
| | * Refactor axolotl message processing workflowAndreas Straub2015-07-317-157/+121
| | * Reformat codeAndreas Straub2015-07-313-86/+87
| | * Change to new wire protocol versionAndreas Straub2015-07-315-73/+112
| | * added missing carbon column message table create statementDaniel Gultsch2015-07-311-0/+1
| | * improved 'next encryption' selectionDaniel Gultsch2015-07-316-73/+69