Commit graph

2661 commits

Author SHA1 Message Date
Daniel Gultsch
ac4aaf6649 version bump to 1.5.1 and changelog 2015-07-21 12:03:57 +02:00
Daniel Gultsch
33cc738d45 version bump to 1.5.1 and changelog 2015-07-21 12:03:28 +02:00
Daniel Gultsch
9fad96f55d and now do that properly 2015-07-21 12:02:15 +02:00
Daniel Gultsch
cab98f2114 and now do that properly 2015-07-21 12:01:20 +02:00
Daniel Gultsch
ac8bf16da5 end otr session when receiving failed otr message warnings 2015-07-21 12:00:01 +02:00
Daniel Gultsch
2e49372bf4 bugfix: also add no-permanent-storage to message hints 2015-07-21 11:59:52 +02:00
Daniel Gultsch
f1666f109f bugfix: changed condition of onOtrSessionEstablished being called
fixed #1263
fixed #1260
fixed #1293
2015-07-21 11:59:30 +02:00
Daniel Gultsch
31ffb7ac70 pulled new translations from transifex 2015-07-21 11:58:03 +02:00
Daniel Gultsch
4ca9c1ca79 bugfix: don't crash if aes key could not be set before jingle transfer 2015-07-21 11:55:48 +02:00
Daniel Gultsch
1465cab557 bugfix: use sendIqPacket method in service instead of invoking XmppConnection directly 2015-07-21 11:55:33 +02:00
Daniel Gultsch
c108ea2026 bugfix: accept status code 201 on http upload 2015-07-21 11:55:18 +02:00
Daniel Gultsch
530a15fc17 end otr session when receiving failed otr message warnings 2015-07-21 11:52:49 +02:00
Daniel Gultsch
9ec8c48d9a bugfix: also add no-permanent-storage to message hints 2015-07-21 11:50:32 +02:00
Daniel Gultsch
1e67042fbb bugfix: changed condition of onOtrSessionEstablished being called
fixed #1263
fixed #1260
fixed #1293
2015-07-21 11:46:56 +02:00
Daniel Gultsch
c4b1ee35c2 very subtle 2015-07-21 02:21:34 +02:00
Andreas Straub
d2d1276575 Use properly fixed numeral values in Trust enum
Why, oh God, why?! #thanksjamesgosling
2015-07-21 01:52:22 +02:00
Andreas Straub
74ff143282 Remove unused import 2015-07-21 01:17:29 +02:00
Andreas Straub
7dc7322e1c Switch payload encryption to AES-GCM
This also ensures that the IV is generated with proper randomness.
2015-07-21 01:17:14 +02:00
Andreas Straub
180e9d17e3 Also decrypt messages from UNTRUSTED sessions 2015-07-20 23:16:06 +02:00
Andreas Straub
5a089fe62e Refactor axolotl send processing/caching flow 2015-07-20 23:13:28 +02:00
Andreas Straub
4a462628af Start TrustKeysActivity if no keys are TRUSTED
If there are no UNDECIDED keys, but none of the contact's keys are
trusted, redirect the user to the TrustKeysActivity
2015-07-20 22:35:07 +02:00
Andreas Straub
a164de0d11 Do not display clear devices button if not online 2015-07-20 22:19:04 +02:00
Andreas Straub
f7630f8ac2 Add purge axolotl key option
Can now long-press a key to permanently purge it.
2015-07-20 22:18:24 +02:00
Andreas Straub
c611aba31c Fix getNumTrustedKeys 2015-07-20 22:02:54 +02:00
Daniel Gultsch
7e43203229 pulled new translations from transifex 2015-07-20 19:13:08 +02:00
Daniel Gultsch
263f5c6942 attempt to fix the delay problem 2015-07-20 18:11:33 +02:00
Daniel Gultsch
a0a2101a98 changed sizes of avatars and padding in new message bubbles 2015-07-20 16:02:18 +02:00
Raphael Pohl
24ef8503ce changed message bubble appearance 2015-07-20 16:02:17 +02:00
Daniel Gultsch
2247f8bdee rely on refreshUi/refreshUiReal and make sure it is being used everywhere 2015-07-20 15:48:58 +02:00
Daniel Gultsch
c10abcd2b2 Merge branch 'development' of github.com:siacs/Conversations into development 2015-07-20 15:43:54 +02:00
Daniel Gultsch
1b8bb06027 fixed monospace font and android L 2015-07-20 15:43:28 +02:00
Andreas Straub
4318027c02 Remove duplicate dependency 2015-07-20 15:17:11 +02:00
Andreas Straub
4b102046aa 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
Andreas Straub
ff60644446 Lock TrustKeys if no trusted keys are available 2015-07-20 14:56:41 +02:00
Andreas Straub
d5fd0a5206 Optimize imports 2015-07-20 14:26:29 +02:00
Daniel Gultsch
f0392385c4 don't show 'show contact details' context menu item when contact isn not in roster 2015-07-20 14:24:59 +02:00
Andreas Straub
6c72f9f34c Use MD style for key trust toggle switch 2015-07-20 14:14:27 +02:00
Andreas Straub
945859afdd Fix set/remove OnUpdateBlocklistListener 2015-07-20 14:12:24 +02:00
Daniel Gultsch
5fdcc970c6 Merge pull request #1289 from kriztan/patch-2
show contact details in conference details ...
2015-07-20 13:16:19 +02:00
Andreas Straub
43cabe1740 Fix axolotl database migration
Can't call getWritableDatabase in recreateAxolotlDb()
2015-07-20 13:15:49 +02:00
Daniel Gultsch
a6f8f1e76a Merge pull request #1290 from SamWhited/accent_cab
Change CAB to accent color in v21
2015-07-20 11:46:26 +02:00
Andreas Straub
3aa0b452c4 Remove device list from EditAccount 2015-07-19 23:38:09 +02:00
Sam Whited
acbfeea4b3 Change CAB to accent color in v21 2015-07-19 16:36:24 -05:00
Andreas Straub
23d2d9c303 Add clear devices to overflow menu in EditAccount 2015-07-19 23:35:03 +02:00
Andreas Straub
f8e99a9a33 Ask for key trust when sending messages
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.
2015-07-19 22:27:26 +02:00
Andreas Straub
c168af322e Encrypt files for HTTP upload in encrypted chats 2015-07-19 22:24:05 +02:00
Andreas Straub
b8534b09b7 Refactor trust key ui and show in account details
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.
2015-07-19 22:24:03 +02:00
Andreas Straub
89de141763 Send correct body for HTTP files
When using HTTP upload to send files, take care to transmit only the URL
rather than the entire body, which contains metadata.
2015-07-19 22:23:28 +02:00
Andreas Straub
8790bbe79f Handle file transmission properly in axolotl 2015-07-19 22:23:28 +02:00
Andreas Straub
4253b9b366 Remove unneccessary code 2015-07-19 22:23:28 +02:00