Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add config option to hide all encryption modes | Christian S | 2015-08-08 | 2 | -0/+2 |
| | |||||
* | modified avatar sizes | Christian S | 2015-08-08 | 3 | -493/+474 |
| | |||||
* | modified image preview size and avatar size | Christian S | 2015-08-08 | 1 | -4/+4 |
| | |||||
* | version bump to 1.6.0 beta2 | Christian S | 2015-08-08 | 1 | -1/+1 |
| | |||||
* | added one more well-known file type | Christian S | 2015-08-08 | 1 | -0/+1 |
| | |||||
* | modified settings | Christian S | 2015-08-08 | 1 | -2/+2 |
| | |||||
* | copy commits | Christian S | 2015-08-08 | 18 | -544/+675 |
|\ | |||||
| * | 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 |
| | | |||||
* | | Merge pull request #18 from siacs/development | Christian S. | 2015-08-03 | 25 | -72/+15 |
|\| | | | | | copy commits | ||||
| * | sync translations with transifex | Daniel Gultsch | 2015-08-03 | 24 | -71/+14 |
| | | |||||
| * | version bump for ShortcutBadger | Daniel Gultsch | 2015-08-03 | 1 | -1/+1 |
| | | |||||
* | | copy commits | Christian S | 2015-08-02 | 58 | -1385/+1905 |
|\| | |||||
| * | added changelog for version 1.6 | Daniel Gultsch | 2015-08-01 | 1 | -0/+6 |
| | | |||||
| * | version bump to 1.6.0-beta | Daniel Gultsch | 2015-08-01 | 1 | -2/+2 |
| | | |||||
| * | 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 | ||||
| * | Improve trust toggle responsiveness | Andreas Straub | 2015-07-29 | 1 | -6/+1 |
| | | | | | | | | Removed unnecessary UI refreshes, explicitly update UI where needed. | ||||
| * | Refactor out inner classes, cache trust store | Andreas Straub | 2015-07-29 | 10 | -709/+760 |
| | | | | | | | | | | | | | | Moves SQLiteAxolotlStore and XmppAxolotlSession into proper classes. IdentityKeys trust statuses are now cached in an LruCache to prevent hammering the database when rendering the UI. | ||||
| * | add new received message bubble drawable | Daniel Gultsch | 2015-07-29 | 17 | -0/+166 |
| | | |||||
| * | show http downloaded images in notification | Daniel Gultsch | 2015-07-29 | 1 | -2/+3 |
| | | |||||
| * | removed recursion in message.getMerged*() | Daniel Gultsch | 2015-07-28 | 1 | -13/+19 |
| | | |||||
| * | changed logging. (work around logcat null pointer | Daniel Gultsch | 2015-07-28 | 2 | -2/+1 |
| | |