aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2015-07-201-1/+0
|\
| * Remove duplicate dependencyAndreas Straub2015-07-201-1/+0
| |
* | fixed monospace font and android LDaniel Gultsch2015-07-205-6/+13
|/
* Merge branch 'CryptoNextBeta' into developmentAndreas Straub2015-07-2082-308/+3315
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * CryptoNextBeta: (60 commits) Lock TrustKeys if no trusted keys are available Optimize imports Use MD style for key trust toggle switch Fix set/remove OnUpdateBlocklistListener Fix axolotl database migration Remove device list from EditAccount Add clear devices to overflow menu in EditAccount Ask for key trust when sending messages Encrypt files for HTTP upload in encrypted chats Refactor trust key ui and show in account details Send correct body for HTTP files Handle file transmission properly in axolotl Remove unneccessary code Fix trust status for outgoing messages Don't merge messages with different trust statuses Fix copying of axolotl keys to clipboard Add refresh icon to v21 theme Disable Axolotl option if not usable Show trust status of messages' originating session Add key trust toggle to ContactDetailsActivity ...
| * Lock TrustKeys if no trusted keys are availableCryptoNextBetaAndreas Straub2015-07-203-4/+48
| |
| * Optimize importsAndreas Straub2015-07-2047-195/+167
| |
| * Use MD style for key trust toggle switchAndreas Straub2015-07-202-7/+1
| |
| * Fix set/remove OnUpdateBlocklistListenerAndreas Straub2015-07-201-5/+5
| |
| * Fix axolotl database migrationAndreas Straub2015-07-201-2/+5
| | | | | | | | Can't call getWritableDatabase in recreateAxolotlDb()
| * Remove device list from EditAccountAndreas Straub2015-07-192-65/+0
| |
| * Add clear devices to overflow menu in EditAccountAndreas Straub2015-07-193-3/+17
| |
| * Ask for key trust when sending messagesAndreas Straub2015-07-1911-57/+580
| | | | | | | | | | | | If the contact (or the own account) has keys that have UNDECIDED trust, we now drop the user into the new TrustKeysActivity, where they have to decide for each new key whether it should be TRUSTED or UNTRUSTED.
| * Encrypt files for HTTP upload in encrypted chatsAndreas Straub2015-07-192-3/+7
| |
| * Refactor trust key ui and show in account detailsAndreas Straub2015-07-198-58/+154
| | | | | | | | | | | | | | | | | | Refactored the trust key row UI element so it can be used in multiple places. It now also uses a slider to toggle the trust state, and the redundant trust state description was removed. EditAccountActivity now shows the keys of other devices associated with that account.
| * Send correct body for HTTP filesAndreas Straub2015-07-191-1/+7
| | | | | | | | | | When using HTTP upload to send files, take care to transmit only the URL rather than the entire body, which contains metadata.
| * Handle file transmission properly in axolotlAndreas Straub2015-07-191-4/+12
| |
| * Remove unneccessary codeAndreas Straub2015-07-191-2/+1
| |
| * Fix trust status for outgoing messagesAndreas Straub2015-07-195-28/+43
| | | | | | | | | | | | Tag sent messages with own fingerprint, set own fingerprint as always trusted, include own fingerprint in database trust search, explicitly reset trust colorfilter
| * Don't merge messages with different trust statusesAndreas Straub2015-07-191-1/+7
| |
| * Fix copying of axolotl keys to clipboardSam Whited2015-07-191-1/+1
| |
| * Add refresh icon to v21 themeSam Whited2015-07-197-1/+1
| |
| * Disable Axolotl option if not usableAndreas Straub2015-07-192-33/+10
| | | | | | | | | | In MUCs or if contact is not axolotl capable, disable axolotl menu option
| * Show trust status of messages' originating sessionAndreas Straub2015-07-192-0/+17
| | | | | | | | | | Shade lock icon red if message was received in a session that has not been marked trusted by the user or fingerprint is unknown
| * Add key trust toggle to ContactDetailsActivityAndreas Straub2015-07-1913-10/+52
| | | | | | | | Can now toggle IdentityKey trust
| * Ensure that available sessions are always usedAndreas Straub2015-07-191-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any time a new session is established, call syncRosterToDisk() to ensure that on subsequent restoreFromDatabase() calls, the roster is actually available. This is important so that initAccountServices() can properly initialize the SessionMap. This prevents a race condition where after adding a new account and initiating sessions with it, if the app is killed (e.g. by reinstall) before triggering a syncRosterToDisk(), subsequent restores will not have the roster available, leading to missing XmppAxolotlSessions in the SessionMap cache. As a result of this, a new session was initiated when sending a new message, and received messages could not be tagged with the originating session's fingerprint. As an added sanity check, go to the database to confirm no records are present before creating fresh XmppAxolotlSession objects (both in the sending and receiving case).
| * Fix setIdentityKeyTrust update statementAndreas Straub2015-07-191-2/+2
| |
| * Fix IdentityKey storage modelAndreas Straub2015-07-191-2/+6
| | | | | | | | Added proper UNIQUE statement
| * Fix and expand key regeneration functionAndreas Straub2015-07-191-9/+18
| | | | | | | | | | | | Wipe session cache to prevent stale sessions being used. Wipe fetch status cache to enable recreation of sessions. Regenerate deviceId, so that foreign devices will talk to us again.
| * Display trust status in ContactDetailsActivityAndreas Straub2015-07-192-3/+18
| |
| * Overhauled Message taggingAndreas Straub2015-07-195-88/+138
| | | | | | | | | | | | Messages are now tagged with the IdentityKey fingerprint of the originating session. IdentityKeys have one of three trust states: undecided (default), trusted, and untrusted/not yet trusted.
| * Postpone initAccountService until roster loadedAndreas Straub2015-07-191-3/+1
| | | | | | | | | | The AxolotlService depends on the roster being loaded when it is initialized so that it can fill its in-memory SessionMap.
| * Fix getSubDeviceSessions SQL queryAndreas Straub2015-07-191-1/+1
| |
| * Display axolotl chat message hintAndreas Straub2015-07-192-0/+4
| |
| * Use full int range for device IDsAndreas Straub2015-07-191-1/+1
| |
| * Clean up unused constantAndreas Straub2015-07-191-1/+0
| |
| * Make some fields finalAndreas Straub2015-07-191-3/+3
| |
| * Clean up loggingAndreas Straub2015-07-195-67/+75
| | | | | | | | | | Add a fixed prefix to axolotl-related log messages, set log levels sensibly.
| * Add basic PEP managemend UI to EditAccountActivityAndreas Straub2015-07-195-4/+266
| | | | | | | | | | | | | | | | | | EditAccountActivity now show own fingerprint, and gives an option to regenerate local keying material (and wipe all sessions associated with the old keys in the process). It also now displays a list of other own devices, and gives an option to remove all but the current device.
| * Fix devicelist update handlingAndreas Straub2015-07-192-0/+6
| | | | | | | | | | | | No longer store own device ID (so that we don't encrypt messages for ourselves), verify that own device ID is present in update list (otherwise republish), reflect update in UI.
| * Refactor axolotl database recreationAndreas Straub2015-07-191-8/+14
| |
| * Adapt prettifyFingerprint() to axolotl FP sizesAndreas Straub2015-07-192-6/+5
| |
| * Fix displaying Contact IdentityKeysAndreas Straub2015-07-192-65/+2
| | | | | | | | | | Migrate ContactDetailsActivity to use new SQL IdentityKeys storage, remove dead code from Contact class.
| * Only cache session if successfully establishedAndreas Straub2015-07-191-1/+6
| | | | | | | | | | | | | | | | When receiving a message, only remember the XmppAxolotlSession wrapper if the prospective session was actually established. This prevents us from erroneously adding empty sessions that are never established using received PreKeyWhisperMessages, which would lead to errors if we try to use them for sending.
| * Return empty set on invalid PEP devicelistAndreas Straub2015-07-192-19/+20
| |
| * Trust all IdentityKeysAndreas Straub2015-07-191-2/+3
| | | | | | | | | | | | | | | | | | The trust-on-first-use policy leads to problems when receiving messages from two different devices of a contact before sending a message to them (as their IdentityKeys will not have been added yet). Since session trust will be managed externally anyway, this change is not a security problem, and will allow us to decrypt messages from yet-untrusted sessions.
| * Refresh PEP on session establishAndreas Straub2015-07-191-0/+18
| | | | | | | | | | | | | | | | We now track preKeys used to establish incoming sessions with us. On each new established session, we remove the used prekey from PEP. We have to do this because libaxolotl-java internally clears the used preKey from its storage, so we will not be able to establish any future sessions using that key.
| * Fix asynchronous axolotl message sendingAndreas Straub2015-07-192-8/+27
| | | | | | | | | | | | | | | | | | | | XmppConnectionService.sendMessage() now dispatches messages to the AxolotlService, where they only are prepared for sending and cached. AxolotlService now triggers a XmppConnectionService.resendMessage(), which then handles sending the cached message packet. This transparently fixes, e.g., handling of messages sent while we are offline.
| * Properly track message senderAndreas Straub2015-07-193-15/+16
| | | | | | | | | | | | | | Previously, the sender was assumed to be the conversation counterpart. This broke carboned own-device messages. We now track the sender properly, and also set the status (sent by one of the own devices vs received from the counterpart) accordingly.
| * Rework PEP content verificationAndreas Straub2015-07-192-48/+62
| | | | | | | | | | | | Now checks which part(s) are out of sync w/ local storage, and updates only those, rather than assuming the entire node corrupt and overwriting it all (especially relevant for preKey list)
| * Formatting fixesAndreas Straub2015-07-191-2/+2
| |