Commit Graph

1035 Commits

Author SHA1 Message Date
SBiOSoftWhare c4f2b59f76 Merge develop into prepare_riot_2231 2019-04-25 15:59:32 +02:00
manuroe 6913fb0c55 Merge pull request #2372 from vector-im/riot_2323
E2E: SAS Verification
2019-04-24 14:51:04 +02:00
manuroe da1e401dc8 Merge pull request #2372 from vector-im/riot_2323
E2E: SAS Verification
2019-04-24 14:51:04 +02:00
J. Ryan Stinnett b826f7ac8d Clarify key backup details when backup exists but is not trusted
This ports the wording changes from Riot Web
https://github.com/matrix-org/matrix-react-sdk/pull/2917.

"Use key backup" as button text feels like it's telling me I haven't set it up
at all. This changes to "Connect this device ..." which seems more reassuring
and applies for both the "add to backup" and "restore from backup" use cases.

This also updates the backup status text for the case where a backup exists, but
it's not being used by the current device so that it's much more clear that you
have a backup at least.
2019-04-18 13:30:32 +01:00
J. Ryan Stinnett 4bbb38cc84 Clarify key backup details when backup exists but is not trusted
This ports the wording changes from Riot Web
https://github.com/matrix-org/matrix-react-sdk/pull/2917.

"Use key backup" as button text feels like it's telling me I haven't set it up
at all. This changes to "Connect this device ..." which seems more reassuring
and applies for both the "add to backup" and "restore from backup" use cases.

This also updates the backup status text for the case where a backup exists, but
it's not being used by the current device so that it's much more clear that you
have a backup at least.
2019-04-18 13:30:32 +01:00
manuroe 66f8308451 SettingsVC: Remove dead code using EncryptionInfoView 2019-04-17 08:57:16 +02:00
manuroe 6b9e313654 SettingsVC: Remove dead code using EncryptionInfoView 2019-04-17 08:57:16 +02:00
SBiOSoftWhare 8610dafc45 Update SettingsKeyBackupTableViewSection to prepare restore button removal when all keys are stored on device. 2019-04-11 10:40:26 +02:00
SBiOSoftWhare c1301fdfda Update SettingsKeyBackupTableViewSection to prepare restore button removal when all keys are stored on device. 2019-04-11 10:40:26 +02:00
SBiOSoftWhare 414d9d1a6e [SettingsViewController] Avoid some crashes when reload rows animated. 2019-04-10 14:50:47 +02:00
SBiOSoftWhare 69c65c42ce [SettingsViewController] Avoid some crashes when reload rows animated. 2019-04-10 14:50:47 +02:00
SBiOSoftWhare 066e2f5739 Do not mention key backup on sign out when there is no keys to backup 2019-03-05 15:53:58 +01:00
SBiOSoftWhare 2a80a2ee04 Do not mention key backup on sign out when there is no keys to backup 2019-03-05 15:53:58 +01:00
SBiOSoftWhare 103aaa3a0a Fix SwiftLint warnings 2019-02-27 10:07:51 +01:00
SBiOSoftWhare 9ab0b74007 Fix SwiftLint warnings 2019-02-27 10:07:51 +01:00
manuroe e7ccd9718c Fix crash in Settings in 0.8.1
#2295
2019-02-25 16:00:47 +01:00
manuroe 9e19b03bec Fix crash in Settings in 0.8.1
#2295
2019-02-25 16:00:47 +01:00
SBiOSoftWhare b09c0c5f19 Apply new lineBreakColor where needed 2019-02-18 12:53:13 +01:00
SBiOSoftWhare e747e2d6dc Apply new lineBreakColor where needed 2019-02-18 12:53:13 +01:00
SBiOSoftWhare afc33c789b Update KeyBackupSetupCoordinator to handle coming from sign out info 2019-02-15 19:06:08 +01:00
SBiOSoftWhare b7670532ee Update KeyBackupSetupCoordinator to handle coming from sign out info 2019-02-15 19:06:08 +01:00
SBiOSoftWhare 6acbdf82bb Fix sign out warning presentation on iPad 2019-02-15 12:42:07 +01:00
SBiOSoftWhare c5f9205259 Fix sign out warning presentation on iPad 2019-02-15 12:42:07 +01:00
manuroe ac02db96c2 Merge pull request #2246 from vector-im/settings_backup_update_copy
Backup settings: Update wording and rendering to match riot-web
2019-02-14 19:18:56 +01:00
manuroe dec54fdec1 Merge pull request #2246 from vector-im/settings_backup_update_copy
Backup settings: Update wording and rendering to match riot-web
2019-02-14 19:18:56 +01:00
SBiOSoftWhare a1ac108bd3 Update SignOutAlertPresenter to handle backup in progress case 2019-02-14 18:06:37 +01:00
SBiOSoftWhare 31419276ee Update SignOutAlertPresenter to handle backup in progress case 2019-02-14 18:06:37 +01:00
manuroe 879af41aa0 Backup settings: Update wording and rendering to match riot-web
Verify button has been removed and replaced by "Use key backup", which makes a restore, because we trust on decrypt now.
2019-02-14 17:47:59 +01:00
manuroe 51f2312ccd Backup settings: Update wording and rendering to match riot-web
Verify button has been removed and replaced by "Use key backup", which makes a restore, because we trust on decrypt now.
2019-02-14 17:47:59 +01:00
SBiOSoftWhare 2846b0ad7d Handle sign out alert present present in SettingsViewController 2019-02-14 16:04:08 +01:00
SBiOSoftWhare 55c6608e1d Handle sign out alert present present in SettingsViewController 2019-02-14 16:04:08 +01:00
SBiOSoftWhare 66540207c1 Create a sign out alert presenter 2019-02-14 16:03:07 +01:00
SBiOSoftWhare 59cf9837e6 Create a sign out alert presenter 2019-02-14 16:03:07 +01:00
manuroe 7c370e5feb Key backup: Check backup update on the homeserver
when opening the home or the settings screen in order to display the right banner and settings.
2019-02-06 17:34:16 +01:00
manuroe 1eccc61869 Key backup: Check backup update on the homeserver
when opening the home or the settings screen in order to display the right banner and settings.
2019-02-06 17:34:16 +01:00
manuroe a5d0e089fd key backup settings: Fix Steve's comment 2019-01-31 21:22:10 +01:00
manuroe 3599d97e14 key backup settings: Fix Steve's comment 2019-01-31 21:22:10 +01:00
manuroe d5a3447bc8 key backup settings: Fix Steve's comment 2019-01-31 21:15:50 +01:00
manuroe 0bbf046ed4 key backup settings: Fix Steve's comment 2019-01-31 21:15:50 +01:00
manuroe 4b60ed76be key backup settings: Manage checking state 2019-01-31 18:48:35 +01:00
manuroe b53c6f77ca key backup settings: Manage checking state 2019-01-31 18:48:35 +01:00
manuroe f415c99786 key backup settings: Manage backup created from the device 2019-01-31 18:41:00 +01:00
manuroe 42a91d7aa8 key backup settings: Manage backup created from the device 2019-01-31 18:41:00 +01:00
manuroe b90f624594 key backup settings: Make it look like more to https://github.com/vector-im/riot-meta/issues/251#issuecomment-458566684
2/2

Manage not trusted backup
2019-01-31 18:19:20 +01:00
manuroe 6de109b332 key backup settings: Make it look like more to https://github.com/vector-im/riot-meta/issues/251#issuecomment-458566684
2/2

Manage not trusted backup
2019-01-31 18:19:20 +01:00
manuroe 7f209eb8f2 key backup settings: Make it look like more to https://github.com/vector-im/riot-meta/issues/251#issuecomment-458566684
1/2
2019-01-31 16:58:41 +01:00
manuroe b2062f22af key backup settings: Make it look like more to https://github.com/vector-im/riot-meta/issues/251#issuecomment-458566684
1/2
2019-01-31 16:58:41 +01:00
manuroe caca3c0bd3 key backup settings: Fix cell reuse mechanism 2019-01-31 15:45:43 +01:00
manuroe 2707971e68 key backup settings: Fix cell reuse mechanism 2019-01-31 15:45:43 +01:00
manuroe f15c0f952f key backup settings: Make it display loading wheel and error 2019-01-31 10:19:27 +01:00