aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into developmentDaniel Gultsch2015-08-1912-151/+397
|\
| * pulled translations from transifex1.6.0Daniel Gultsch2015-08-1912-151/+397
| |
* | simulate old behaviour with messages being set to waiting while offlineDaniel Gultsch2015-08-192-3/+10
| |
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-191-0/+1
|\|
| * fixed nasty 'stuck at sending' bug that got introduced in ↵Daniel Gultsch2015-08-191-0/+1
| | | | | | | | 32826ec29d28668b7f345ffcd45cd876dc980153
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-192-1/+7
|\|
| * 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
| |
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-163-34/+35
|\|
| * 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 'depend_on_sm' into developmentDaniel Gultsch2015-08-157-86/+76
|\ \ | |/ |/|
| * fully depend on smDaniel Gultsch2015-08-157-86/+76
| |
* | Merge branch 'development'Daniel Gultsch2015-08-153-0/+48
|\ \
| * | Update license string with librariesAndreas Straub2015-08-151-0/+4
| | |
| * | Display error message if all contact keys purgedAndreas Straub2015-08-153-0/+44
| |/
* | Merge branch 'development'Daniel Gultsch2015-08-15188-1200/+5258
|\|
| * provide extra interface to close sockets. fixes #1330Daniel Gultsch2015-08-152-2/+11
| |
| * show HTTP upload availability on Edit account screenhlad2015-08-143-0/+28
| |
| * do not touch pictures that are already in the right formatDaniel Gultsch2015-08-116-51/+218
| | | | | | | | fixed #522
| * use same code that is used to open files for imagesDaniel Gultsch2015-08-111-4/+1
| | | | | | | | fixes #1323
| * changed color of 'whispered' prefixDaniel Gultsch2015-08-111-2/+1
| | | | | | | | fixes #1326
| * 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 ↵Daniel Gultsch2015-08-103-3/+10
| | | | | | | | compatible with conversations > 1.6
| * provide more detailed error toasts for http file downloadDaniel Gultsch2015-08-102-38/+61
| |
| * fixed image preview in notfications for images that arrived over jingleDaniel Gultsch2015-08-081-6/+4
| |
| * decreased right hand side padding in contact keysDaniel Gultsch2015-08-081-1/+3
| |
| * renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-088-26/+25
| |
| * 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
| | | | | | | | fixes #1322
| * 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
| | | | | | | | | | | | 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 methodDaniel Gultsch2015-08-053-0/+4
| |
| * changed text selection colorDaniel Gultsch2015-08-053-0/+3
| |
| * added Config.java varibale to lock account creation to specfic domainDaniel Gultsch2015-08-039-33/+112
| |
| * sync translations with transifexDaniel Gultsch2015-08-0324-71/+14
| |
| * lets try jpeg for a whileDaniel Gultsch2015-08-011-1/+1
| |
| * temporarily renamed new encryption method to 'Multi-End' until a better name ↵Daniel Gultsch2015-08-011-10/+10
| | | | | | | | has been found
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | XmppAxolotlMessage is now entirely responsible for handling encryption and decryption of messages, only leveraging XmppAxolotlSession as a packing/unpacking primitive for payload keys. Removed pseudo-dead session generation code step from prepareMessage function, as sessions have been created by invoking the TrustKeysActivity for a while now. Added prepareKeyTransportMessage function, which creates a message with no payload. The key that is packed into the header keyElements can then be used for other purposes (e.g. encrypted file transfer).
| * Reformat codeAndreas Straub2015-07-313-86/+87
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 18:25:37 +0000