Commit graph

2590 commits

Author SHA1 Message Date
David Baker
9f306a2422 Fix padlock icons on text messages
Port d54c80dba0804c716d45a0e6a4713a80102d5326 from e2e_release branch
2016-11-18 10:39:32 +00:00
manuroe
dd993e1cdb i18n: Remove "File transfers are not yet encrypted." from the e2e enabling popup as we support it 2016-11-18 09:21:41 +01:00
giomfo
5f78a8d25d Version ++
Update Podfile.lock
2016-11-17 18:08:18 +01:00
giomfo
b465114e9a Upgrade vector ios version: 0.3.0 2016-11-17 17:49:31 +01:00
giomfo
b35da3217b Settings: Add olm version 2016-11-17 14:16:11 +01:00
giomfo
e90bed24fc Prepare new release v0.3.0 Changes 2016-11-17 11:56:07 +01:00
giomfo
a7f5042f0d String: Update encryption string 2016-11-17 09:42:59 +01:00
David Baker
98581851e2 Merge pull request #786 from vector-im/dbkr/dont_clobber_attachment_urls
Don't clobber thumbnail url on MXKAttachment
2016-11-16 17:21:03 +00:00
manuroe
2de540e32c Merge pull request #794 from vector-im/app_update_for_e2e
Crypto: Show a popup when people updates their app and did not have a device id
2016-11-16 18:11:15 +01:00
manuroe
09f1a33431 Crypto: Show a popup when people updates their app and did not have a device id 2016-11-16 17:16:42 +01:00
giomfo
ad8b2a4446 Merge pull request #793 from vector-im/vector_723
End-to-end encryption UI/UX
2016-11-16 16:55:31 +01:00
giomfo
4253e06b20 End-to-end encryption UI/UX
#723

- prompt user before verifying a device
2016-11-16 16:45:31 +01:00
giomfo
d1c8bd249b Enhancement - Encryption device information:
Hide the Verify and Block buttons when the device is the current one.
2016-11-16 15:53:52 +01:00
giomfo
016f1b3467 Merge pull request #791 from vector-im/fix_encryption_icon_offset
Bug Fix - Chat screen: the vertical offset on encryption icon due to …
2016-11-16 15:43:31 +01:00
manuroe
d5f6cea0bf Merge pull request #792 from vector-im/enable_voip_in_encrypted_room
Crypto: Enable voip in encrypted 1:1 room
2016-11-16 15:43:13 +01:00
giomfo
2315fa0608 Bug Fix - Chat screen: the vertical offset on encryption icon due to the timestamp 2016-11-16 15:36:35 +01:00
manuroe
9ca702ca27 Crypto: Enable voip in encrypted 1:1 room 2016-11-16 15:35:46 +01:00
manuroe
1a9c93bd74 Merge pull request #790 from vector-im/enabled_e2e_by_default
Crypto: Enable e2e by default
2016-11-16 15:04:33 +01:00
manuroe
a461f12f31 i18n: s/in beta/experimental/ 2016-11-16 13:53:45 +01:00
manuroe
ee776218d9 Crypto: Enable e2e by default
Once enabled, it is still not possible to disable it but do some cleaning in case of disabling in case we change our mind on this button.
2016-11-16 13:52:38 +01:00
manuroe
db2bac7f27 Crypto: Enable e2e by default
Once enabled, it is still not possible to disable it but do some cleaning in case of disabling in case we change our mind on this button.
2016-11-16 13:40:04 +01:00
giomfo
24cfc0803d Merge pull request #789 from vector-im/fake_encrypted_event
Bug Fix: unencrypted outgoing messages are displayed with the verifie…
2016-11-16 12:40:54 +01:00
giomfo
a8daff33e3 Bug Fix: unencrypted outgoing messages are displayed with the verified icon 2016-11-16 11:49:25 +01:00
giomfo
da7ba26933 Merge pull request #788 from vector-im/vector_723
End-to-end encryption UI/UX
2016-11-16 10:48:04 +01:00
giomfo
e7281e4165 End-to-end encryption UI/UX
#723

- fix Manu's comment
2016-11-16 10:46:25 +01:00
giomfo
4c882811f9 End-to-end encryption UI/UX
#723

- Display device information when user taps on the encryption icon.
- Add this option in event context menu
2016-11-16 09:31:58 +01:00
David Baker
25d7fc1f6b Don't clobber thumbnail url on MXKAttachment
Goes with https://github.com/matrix-org/matrix-ios-kit/pull/191

This might cause a file search view to use larger thumbnails than
it did previously, although I'm not actually sure this is wired up
anywhere. If it is, I'd rather find the place they're used and
switch it to use getThumbnailUrlForSize with the size it wants.
2016-11-15 16:30:20 +00:00
David Baker
e674ccb4ac Merge pull request #780 from vector-im/dbkr/encrypted_attachments
Don't disable the upload button in encrypted rooms
2016-11-15 09:21:12 +00:00
giomfo
3e629c6834 End-to-end encryption UI/UX
#723

- fix Manu's comments
2016-11-15 09:46:47 +01:00
David Baker
4ce8f38e07 Don't disable the upload button in encrypted rooms
Attachments will be sent encrypted with the corresponding
matrixkit / matrix-ios-sdk branches.
2016-11-11 17:31:44 +00:00
giomfo
c852e72480 End-to-end encryption UI/UX
#723

- Add an unencrypted icon in the composer of a non-crypto room
2016-11-10 16:23:43 +01:00
giomfo
5692037925 End-to-end encryption UI/UX
#723

-Prompt the user to log in again when no device id is available.
2016-11-10 16:11:51 +01:00
giomfo
e312a08369 Disable voip call on members/contacts details.
Contact details: Start voice call failed silently #745
2016-11-10 15:21:28 +01:00
giomfo
00e72f959e Merge pull request #774 from vector-im/vector_723
End-to-end encryption UI/UX
2016-11-10 10:25:50 +01:00
giomfo
853885e46b End-to-end encryption UI/UX
#723

Patch: Display the verified icon on outgoing messages in the encrypted rooms (until #773 is fixed)
2016-11-10 10:24:59 +01:00
giomfo
6dc7d71c2e Merge pull request #769 from vector-im/vector_723
End-to-end encryption UI/UX
2016-11-09 11:00:36 +01:00
giomfo
92ca7493ca End-to-end encryption UI/UX
#723

- Let user send clear attachments in encrypted rooms
2016-11-09 10:58:11 +01:00
giomfo
d85c6809fa Merge pull request #763 from vector-im/vector_723
End-to-end encryption UI/UX
2016-11-08 18:26:13 +01:00
giomfo
1ecd0a8f18 End-to-end encryption UI/UX
#723

- Disable attachments and call options in encrypted room
2016-11-08 18:25:21 +01:00
giomfo
3397539fae Merge pull request #762 from vector-im/vector_723
Vector 723
2016-11-08 17:59:31 +01:00
giomfo
7267551958 End-to-end encryption UI/UX
#723

Bubble cells for encrypted event: add more padding around the encryption icon.
2016-11-08 17:55:49 +01:00
giomfo
cb5d333bbe End-to-end encryption UI/UX
#723

- Define bubbles cells used to displayed encrypted events
2016-11-08 17:31:24 +01:00
giomfo
4559998689 Merge pull request #758 from vector-im/vector_723
End-to-end encryption UI/UX
2016-11-07 21:15:41 +01:00
manuroe
5233ff7be5 Crypto: Once crypto is enabled, it is enabled until the user logs out 2016-11-07 18:11:34 +01:00
manuroe
b1f668d8ea Crypto: Once crypto is enabled, it is enabled until the user logs out 2016-11-07 18:02:19 +01:00
giomfo
3383f5f680 End-to-end encryption UI/UX
#723

- Prompt user before turning on the room encryption
- Check power level before displaying toggle button
2016-11-07 16:31:48 +01:00
giomfo
5ff022ca9b Merge pull request #757 from vector-im/vector_723
End-to-end encryption UI/UX
2016-11-07 15:47:58 +01:00
manuroe
277c1d1ef3 Crypto: Refresh room data source when changing e2e user settings 2016-11-07 15:07:14 +01:00
giomfo
3a77967085 End-to-end encryption UI/UX
#723

- Chat screen: Display a padlock in the bottom tool bar in case of encrypted room.
2016-11-07 11:36:32 +01:00
giomfo
9cab08e8f3 fix compilation warning 2016-11-04 15:45:21 +01:00