Commit Graph

2777 Commits

Author SHA1 Message Date
manuroe 7498d86797 SecurityVC: Hide the cross-signing section 2020-06-30 15:56:05 +02:00
manuroe 1703ec8ab4 SecurityVC: Secure backup replaces messages backup 2020-06-30 15:54:58 +02:00
manuroe 6e44ab9ac7 Merge remote-tracking branch 'origin/riot_3361' into riot_3361 2020-06-30 14:32:16 +02:00
manuroe a90ecc82ae Secure backup: Fixed Stève's remarks 2020-06-30 14:32:12 +02:00
manuroe 968b4a05e2 Update Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-30 14:31:22 +02:00
manuroe 4e419d870c Secure backup setup: Manage the case when the user has already a key backup
but we do not have the private key
2020-06-30 14:15:18 +02:00
manuroe 7e97422624 Secure backup: Create and delete key backup with 4S 2020-06-30 14:02:47 +02:00
manuroe 3abdc1cbe6 AuthVC: Remove NEW_CROSS_SIGNING_FLOW
because we consider riot-web ready
2020-06-26 18:37:15 +02:00
ismailgulek b1acd2ad24 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
2020-06-26 17:33:09 +03:00
SBiOSoftWhare e96ff90f01 Fix merge issue with secure backup refactoring. 2020-06-26 14:36:27 +02:00
SBiOSoftWhare ede85f9806 Merge branch 'develop' into riot_3293
# Conflicts:
#	CHANGES.rst
#	Riot/Generated/Strings.swift
2020-06-26 14:30:21 +02:00
SBiOSoftWhare a11e740d53 Refactoring secure backup references. 2020-06-26 14:13:37 +02:00
SBiOSoftWhare b044488517 Refactoring secure backup references. 2020-06-26 14:01:33 +02:00
SBiOSoftWhare 1ef5ea0379 Refactoring secure backup references. 2020-06-26 13:07:53 +02:00
manuroe 8280d6f244 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:43:26 +02:00
manuroe ee11480ec9 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:38:58 +02:00
manuroe 3c0f9ea05b Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:36:57 +02:00
manuroe 72e0b2896c AuthenticatedSessionViewControllerFactory: Update with Steve's remarks 2020-06-26 12:29:30 +02:00
manuroe 79c4c39c88 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:22:43 +02:00
manuroe b919fd7ea9 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:21:41 +02:00
manuroe e2fbd56010 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:21:34 +02:00
manuroe 2474d2b145 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:21:24 +02:00
manuroe 90cc4d4c1e Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:21:16 +02:00
manuroe 60686a2060 SecurityVC: Start cleaning 2020-06-26 07:56:56 +02:00
manuroe 0dde018c77 AuthenticatedSessionViewControllerFactory: Add hasSupport 2020-06-26 07:56:10 +02:00
manuroe 023480a6bf Security: Plug UX for cross-signing setup
part of #3299
2020-06-26 07:42:37 +02:00
manuroe d0121ecd52 Add AuthenticatedSessionViewControllerFactory to set up a authenticated flow for a given CS API request 2020-06-26 07:38:38 +02:00
manuroe fa1c18a9bf SecurityVC: Plug Secure Backup setup flow 2020-06-25 20:23:40 +02:00
SBiOSoftWhare 27ca10a665 Fix refactoring. 2020-06-25 17:52:36 +02:00
SBiOSoftWhare a028e71aff Fix Manu's remarks. 2020-06-25 17:31:46 +02:00
manuroe 70a2aef338 Merge branch 'develop' into riot_3296 2020-06-25 17:20:47 +02:00
manuroe 998c602614 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:17:04 +02:00
manuroe 0b59c68269 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:51 +02:00
manuroe 86b1154a56 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:44 +02:00
manuroe 07878eeb20 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:32 +02:00
manuroe 4c7067e8c6 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:25 +02:00
manuroe c60eb0c140 Update Riot/Modules/Settings/Security/SecurityViewController.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-25 17:16:03 +02:00
SBiOSoftWhare 8c047b47f5 AuthenticationViewController: Fix refact. 2020-06-25 16:30:47 +02:00
SBiOSoftWhare e87f8245d1 RecentsDataSource: Handle secure key backup banner display logic. 2020-06-25 16:01:32 +02:00
SBiOSoftWhare f9db5550b7 HomeVC: Handle secure setup key backup flow presentation. 2020-06-25 11:47:52 +02:00
SBiOSoftWhare fa152d77c9 MXSession+Riot: Use vc prefix as other extensions. 2020-06-25 10:23:24 +02:00
SBiOSoftWhare 29988e2f9e Key backup banner: Update UI and strings. 2020-06-25 09:50:44 +02:00
SBiOSoftWhare 788fea0045 Merge branch 'develop' into riot_3344 2020-06-24 21:57:37 +02:00
SBiOSoftWhare c5dd2f414b Fix Nad's remarks. 2020-06-24 18:29:52 +02:00
manuroe f2644161e3 E2E by default: Do not bootstrap cross-signing automatically
if hs setting is disabled
2020-06-24 17:09:23 +02:00
manuroe 05cb15d623 E2E by default: Disable it if the HS admin disabled it
#3305
2020-06-24 17:08:14 +02:00
manuroe 7d2b80e129 SecurityVC: Use NEW_CROSS_SIGNING_FLOW to not break things 2020-06-24 11:43:50 +02:00
manuroe 643d4e3fba SecurityVC: Add warning if we do not have the MSK 2020-06-24 11:43:50 +02:00
manuroe a24d3f47b9 SecurityVC: Add Secure backup status 2020-06-24 11:43:41 +02:00
SBiOSoftWhare 858549aa96 Fix rebase. 2020-06-23 18:40:30 +02:00