diff options
| author | Andreas Straub <andy@strb.org> | 2015-07-20 15:13:14 +0200 |
|---|---|---|
| committer | Andreas Straub <andy@strb.org> | 2015-07-20 15:13:14 +0200 |
| commit | aaa8fe8978ac0513a013a9c77efef663f32eda47 (patch) | |
| tree | 16cc60f67a4fbded2eeeb7ba1001ebb1b1a004a5 /src/main/res/layout/activity_contact_details.xml | |
| parent | 9c91b9036aa57c610c26b4cdf52ee295eaa0dc95 (diff) | |
| parent | 19a0ae42d667644ee3400c92c53ad0ad093c52fe (diff) | |
Merge branch 'CryptoNextBeta' into development
* 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
...
Diffstat (limited to 'src/main/res/layout/activity_contact_details.xml')
0 files changed, 0 insertions, 0 deletions