Andreas Straub aaa8fe8978 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 ...		2015-07-20 15:13:14 +02:00
..
java/eu/siacs/conversations	Merge branch 'CryptoNextBeta' into development	2015-07-20 15:13:14 +02:00
res	Merge branch 'CryptoNextBeta' into development	2015-07-20 15:13:14 +02:00
AndroidManifest.xml	Ask for key trust when sending messages	2015-07-19 22:27:26 +02:00