Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2016-04-03 | 1 | -0/+4 |
|\ | |||||
| * | check max http file size when attaching files | Daniel Gultsch | 2016-04-01 | 1 | -0/+4 |
| | | |||||
* | | Merge pull request #80 from siacs/master | Christian S | 2016-03-20 | 1 | -3/+4 |
|\| | | | | | copy commits | ||||
| * | don't show v\omemo keys as such if not enabled | Daniel Gultsch | 2016-03-20 | 1 | -3/+4 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-17 | 1 | -0/+1 |
|\| | |||||
| * | reworked sharewith activity to stay open during sharing | Daniel Gultsch | 2016-03-16 | 1 | -0/+1 |
| | | | | | | | | closing the activity prematuraly caused uri permissions to be revoked | ||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-13 | 1 | -1/+1 |
|\| | |||||
| * | don't show opt-out of battery optimization dialog when push is enabled | Daniel Gultsch | 2016-03-06 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-04 | 1 | -1/+15 |
|\| | |||||
| * | rename purge keys positive button to 'purge keys' | Daniel Gultsch | 2016-02-28 | 1 | -1/+1 |
| | | |||||
| * | changed single_account config into more simple lock_settings | Daniel Gultsch | 2016-02-27 | 1 | -0/+14 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-23 | 1 | -3/+14 |
|\| | |||||
| * | use extract account from intent method and final EXTRA_ACCOUNT variable | Daniel Gultsch | 2016-01-22 | 1 | -5/+4 |
| | | |||||
| * | added convenience method to extract account from intent | Daniel Gultsch | 2016-01-22 | 1 | -1/+13 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-13 | 1 | -0/+25 |
|\| | |||||
| * | check for file storage permission before selecting avatar | Daniel Gultsch | 2016-01-13 | 1 | -0/+14 |
| | | |||||
| * | Revert "Add additional warnings to OMEMO purge key function" | Daniel Gultsch | 2016-01-12 | 1 | -26/+2 |
| | | | | | | | | This reverts commit 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03. | ||||
| * | Add additional warnings to OMEMO purge key function | Andreas Straub | 2016-01-12 | 1 | -2/+26 |
| | | | | | | | | | | | | People continue to press the "don't press this" button. Maybe adding some warnings indicating that this button will not fix their problems will help... | ||||
| * | ask to be excluded from battery optimization | Daniel Gultsch | 2016-01-11 | 1 | -0/+11 |
| | | |||||
* | | copy commits | Christian S | 2016-01-04 | 1 | -0/+2 |
|\| | |||||
| * | Allow entering a JID from 'choose contact'. thanks @singpolyma | Daniel Gultsch | 2016-01-04 | 1 | -0/+2 |
| | | | | | | | | | | fixes #1611 fixes #1602 | ||||
* | | copy commits | Christian S | 2015-12-28 | 1 | -7/+14 |
|\| | |||||
| * | strip leading 0x05 off omemo fingerprints | Daniel Gultsch | 2015-12-27 | 1 | -4/+7 |
| | | |||||
| * | show certificate information | Daniel Gultsch | 2015-12-23 | 1 | -3/+7 |
| | | |||||
* | | copy commits | Christian S | 2015-11-29 | 1 | -23/+49 |
|\| | |||||
| * | Sign empty status | fiaxh | 2015-11-09 | 1 | -2/+1 |
| | | |||||
| * | Use OpenPGP-API 9.0 | fiaxh | 2015-11-09 | 1 | -23/+50 |
| | | |||||
* | | Merge pull request #47 from siacs/master | Christian S | 2015-11-01 | 1 | -6/+11 |
|\| | | | | | copy commits | ||||
| * | explicitly mark verified omemo keys in UI | Daniel Gultsch | 2015-10-31 | 1 | -6/+11 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-31 | 1 | -1/+1 |
|\| | |||||
| * | Reset the margins manually after rotating | saqura | 2015-10-26 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-16 | 1 | -0/+14 |
|\| | |||||
| * | Merge pull request #1461 from akallabeth/captcha_support | Daniel Gultsch | 2015-10-11 | 1 | -0/+6 |
| |\ | | | | | | | Implemented account registration with captcha | ||||
| | * | Captcha support. | Armin Novak | 2015-10-11 | 1 | -0/+6 |
| | | | |||||
| * | | prevent null pointer when trying to display device fingerprints of not ↵ | Daniel Gultsch | 2015-10-11 | 1 | -0/+3 |
| |/ | | | | | | | existing sessions | ||||
| * | initial UI work to allow setting up accounts from certifcates | Daniel Gultsch | 2015-10-09 | 1 | -0/+5 |
| | | |||||
* | | Version 1.6.9 | Christian S | 2015-09-12 | 1 | -11/+8 |
|\| | |||||
| * | Only show that have sessions in fingerprint list | Andreas Straub | 2015-09-06 | 1 | -11/+8 |
| | | | | | | | | | | | | | | | | | | Doesn't access database directly anymore but goes through AxolotlService now to obtain list of fingerprints associated with an Account/Contact. This should prevent orphaned keys littering the UI which previously couldn't be removed through the Clear Devices function. Together with 1c79982da84964c1d81179a0927d9cd1eadf53de this fixes #1393 | ||||
* | | version 1.6.9 beta | Christian S | 2015-09-06 | 1 | -0/+3 |
|/ | | | | * in app updater | ||||
* | use dedicated colors for primary and primary_dark | Daniel Gultsch | 2015-08-26 | 1 | -1/+1 |
| | |||||
* | renamed multi-end / axolotl to OMEMO | Daniel Gultsch | 2015-08-08 | 1 | -3/+3 |
| | |||||
* | Let UNTRUSTED/UNDECIDED keys become INACTIVE | Andreas Straub | 2015-08-01 | 1 | -12/+18 |
| | |||||
* | fixed some colors in message adapter | Daniel Gultsch | 2015-07-30 | 1 | -1/+1 |
| | |||||
* | Highlight selected message's fingerprint in list | Andreas Straub | 2015-07-29 | 1 | -8/+20 |
| | |||||
* | 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 | 1 | -9/+9 |
| | | | | | | | 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. | ||||
* | Disable trust toggle completely for INACTIVE keys | Andreas Straub | 2015-07-22 | 1 | -0/+1 |
| | |||||
* | Add INACTIVE state for removed keys | Andreas Straub | 2015-07-21 | 1 | -4/+20 |
| | | | | | | | | | | | | | We introduce a new trust state: INACTIVE. This state is intended for old keys that have been removed. When a TRUSTED device is removed from the PEP devicelist, it's status will be set to INACTIVE. INACTIVE keys are shown in the UI as greyed out, non-interactible key rows. Messages are not encrypted for INACTIVE devices. When an INACTIVE device reappears in PEP, or a message is received from an INACTIVE device, it is set back to trusted. | ||||
* | allow for private messages being started from muc details in anonymous mucs | Daniel Gultsch | 2015-07-21 | 1 | -4/+9 |
| | |||||
* | Add purge axolotl key option | Andreas Straub | 2015-07-20 | 1 | -4/+33 |
| | | | | Can now long-press a key to permanently purge it. |