Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | 3 | -0/+48 | |
|\ \ | ||||||
| * | | Update license string with libraries | Andreas Straub | 2015-08-15 | 1 | -0/+4 | |
| | | | ||||||
| * | | Display error message if all contact keys purged | Andreas Straub | 2015-08-15 | 3 | -0/+44 | |
| |/ | ||||||
* | | Merge branch 'development' | Daniel Gultsch | 2015-08-15 | 188 | -1200/+5258 | |
|\| | ||||||
| * | 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 | 3 | -0/+28 | |
| | | ||||||
| * | 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 | 2 | -38/+61 | |
| | | ||||||
| * | fixed image preview in notfications for images that arrived over jingle | Daniel Gultsch | 2015-08-08 | 1 | -6/+4 | |
| | | ||||||
| * | decreased right hand side padding in contact keys | Daniel Gultsch | 2015-08-08 | 1 | -1/+3 | |
| | | ||||||
| * | renamed multi-end / axolotl to OMEMO | Daniel Gultsch | 2015-08-08 | 8 | -26/+25 | |
| | | ||||||
| * | 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 | |
| | | ||||||
| * | changed text selection color | Daniel Gultsch | 2015-08-05 | 3 | -0/+3 | |
| | | ||||||
| * | added Config.java varibale to lock account creation to specfic domain | Daniel Gultsch | 2015-08-03 | 9 | -33/+112 | |
| | | ||||||
| * | sync translations with transifex | Daniel Gultsch | 2015-08-03 | 24 | -71/+14 | |
| | | ||||||
| * | lets try jpeg for a while | Daniel Gultsch | 2015-08-01 | 1 | -1/+1 | |
| | | ||||||
| * | temporarily renamed new encryption method to 'Multi-End' until a better name ↵ | Daniel Gultsch | 2015-08-01 | 1 | -10/+10 | |
| | | | | | | | | has been found | |||||
| * | use content-type in http slot request and stick with during upload | Daniel Gultsch | 2015-08-01 | 2 | -2/+8 | |
| | | ||||||
| * | fixed calculated file size in http slot request | Daniel Gultsch | 2015-08-01 | 1 | -15/+13 | |
| | | ||||||
| * | Let UNTRUSTED/UNDECIDED keys become INACTIVE | Andreas Straub | 2015-08-01 | 9 | -116/+138 | |
| | | ||||||
| * | enable axolotl encryption for jingle supported file transfers | Daniel Gultsch | 2015-08-01 | 10 | -138/+223 | |
| | | ||||||
| * | Provide process function for key transport message | Andreas Straub | 2015-07-31 | 4 | -19/+84 | |
| | | ||||||
| * | Refactor axolotl message processing workflow | Andreas Straub | 2015-07-31 | 7 | -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 code | Andreas Straub | 2015-07-31 | 3 | -86/+87 | |
| | | ||||||
| * | Change to new wire protocol version | Andreas Straub | 2015-07-31 | 5 | -73/+112 | |
| | | ||||||
| * | added missing carbon column message table create statement | Daniel Gultsch | 2015-07-31 | 1 | -0/+1 | |
| | | | | | | | | fixes #1310 | |||||
| * | improved 'next encryption' selection | Daniel Gultsch | 2015-07-31 | 6 | -73/+69 | |
| | | ||||||
| * | removed expert setting to 'force encryption'. merged certifcate and ↵ | Daniel Gultsch | 2015-07-31 | 2 | -83/+75 | |
| | | | | | | | | encryption settings into same category | |||||
| * | Fix session logic: enforce same type of encryption | Andreas Straub | 2015-07-30 | 2 | -25/+34 | |
| | | ||||||
| * | fixed some colors in message adapter | Daniel Gultsch | 2015-07-30 | 5 | -28/+33 | |
| | | ||||||
| * | use gcm for file encryption over http | Daniel Gultsch | 2015-07-29 | 6 | -104/+127 | |
| | | ||||||
| * | Reset lock color for non-axolotl messages | Andreas Straub | 2015-07-29 | 1 | -0/+2 | |
| | | ||||||
| * | Highlight selected message's fingerprint in list | Andreas Straub | 2015-07-29 | 7 | -13/+34 | |
| | | ||||||
| * | Rerender message bubbles on encryption change | Andreas Straub | 2015-07-29 | 1 | -0/+1 | |
| | | ||||||
| * | Tag carbon messages in parser, adapt session logic | Andreas Straub | 2015-07-29 | 4 | -7/+32 | |
| | | | | | | | | | | | | Messages sent from another device of the own account are now explicitly tagged as carboned message. The session detection logic now uses this tag to find "session borders". | |||||
| * | Fix NPE: consider unknown keys UNDECIDED | Andreas Straub | 2015-07-29 | 1 | -1/+2 | |
| | | ||||||
| * | Color plaintext messages in encrypted sessions red | Andreas Straub | 2015-07-29 | 1 | -0/+30 | |
| | | | | | | | | | | | | | | | | | | Plaintext messages that were received while in an encrypted session are now colored red. We define "in an encrypted session" if a) the last message sent by our own device before the message under consideration (or any message received between then and now) was encrypted AND b) the next message will be sent encrypted or the next message sent after the one under consideration was sent encrypted |