Commit Graph

2477 Commits

Author SHA1 Message Date
manuroe fc55dfb55c SecurityVC: Hide the cross-signing section 2020-06-30 15:56:05 +02:00
manuroe 13cbfc9741 SecurityVC: Secure backup replaces messages backup 2020-06-30 15:54:58 +02:00
manuroe 15e2c0c90d Merge remote-tracking branch 'origin/riot_3361' into riot_3361 2020-06-30 14:32:16 +02:00
manuroe 84c96a4785 Secure backup: Fixed Stève's remarks 2020-06-30 14:32:12 +02:00
manuroe e8e40f1286 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 353d56ac50 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 06c21ecf06 Secure backup: Create and delete key backup with 4S 2020-06-30 14:02:47 +02:00
manuroe e2477bc9f4 AuthVC: Remove NEW_CROSS_SIGNING_FLOW
because we consider riot-web ready
2020-06-26 18:37:15 +02:00
ismailgulek 6c2c2faea2 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
2020-06-26 17:33:09 +03:00
SBiOSoftWhare a433e3647e Fix merge issue with secure backup refactoring. 2020-06-26 14:36:27 +02:00
SBiOSoftWhare b1908231f7 Merge branch 'develop' into riot_3293
# Conflicts:
#	CHANGES.rst
#	Riot/Generated/Strings.swift
2020-06-26 14:30:21 +02:00
SBiOSoftWhare dfb5627126 Refactoring secure backup references. 2020-06-26 14:13:37 +02:00
SBiOSoftWhare f353d69c14 Refactoring secure backup references. 2020-06-26 14:01:33 +02:00
SBiOSoftWhare f3f1654007 Refactoring secure backup references. 2020-06-26 13:07:53 +02:00
manuroe 6e6ea6b672 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:43:26 +02:00
manuroe 34bf39679b Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:38:58 +02:00
manuroe 68642f150f Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:36:57 +02:00
manuroe f2d41b6b8c AuthenticatedSessionViewControllerFactory: Update with Steve's remarks 2020-06-26 12:29:30 +02:00
manuroe c00d482ba7 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:22:43 +02:00
manuroe 2abecd28a6 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:21:41 +02:00
manuroe 85c3921bbb Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:21:34 +02:00
manuroe d538a31847 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:21:24 +02:00
manuroe bbdb8d790b Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:21:16 +02:00
manuroe e37d2cef0d SecurityVC: Start cleaning 2020-06-26 07:56:56 +02:00
manuroe 8fd9d815cb AuthenticatedSessionViewControllerFactory: Add hasSupport 2020-06-26 07:56:10 +02:00
manuroe df188da49b Security: Plug UX for cross-signing setup
part of #3299
2020-06-26 07:42:37 +02:00
manuroe b378080857 Add AuthenticatedSessionViewControllerFactory to set up a authenticated flow for a given CS API request 2020-06-26 07:38:38 +02:00
manuroe 47cb148537 SecurityVC: Plug Secure Backup setup flow 2020-06-25 20:23:40 +02:00
SBiOSoftWhare 7c749a026f Fix refactoring. 2020-06-25 17:52:36 +02:00
SBiOSoftWhare 057890dd52 Fix Manu's remarks. 2020-06-25 17:31:46 +02:00
manuroe 75b80248d8 Merge branch 'develop' into riot_3296 2020-06-25 17:20:47 +02:00
manuroe ddda57feff 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 539c1feb5a 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 122edffb63 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 85ab663503 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 d80f0e6316 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 ed15566b4e 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 40bdba8ac0 AuthenticationViewController: Fix refact. 2020-06-25 16:30:47 +02:00
SBiOSoftWhare 2c30d7daa2 RecentsDataSource: Handle secure key backup banner display logic. 2020-06-25 16:01:32 +02:00
SBiOSoftWhare e6c9a3da59 HomeVC: Handle secure setup key backup flow presentation. 2020-06-25 11:47:52 +02:00
SBiOSoftWhare 86239881d2 MXSession+Riot: Use vc prefix as other extensions. 2020-06-25 10:23:24 +02:00
SBiOSoftWhare a18ad3deec Key backup banner: Update UI and strings. 2020-06-25 09:50:44 +02:00
SBiOSoftWhare d4578ed166 Merge branch 'develop' into riot_3344 2020-06-24 21:57:37 +02:00
SBiOSoftWhare 414a925290 Fix Nad's remarks. 2020-06-24 18:29:52 +02:00
manuroe 5b66370889 E2E by default: Do not bootstrap cross-signing automatically
if hs setting is disabled
2020-06-24 17:09:23 +02:00
manuroe b28fcebd57 E2E by default: Disable it if the HS admin disabled it
#3305
2020-06-24 17:08:14 +02:00
manuroe a41eedadc1 SecurityVC: Use NEW_CROSS_SIGNING_FLOW to not break things 2020-06-24 11:43:50 +02:00
manuroe 4fe62f1195 SecurityVC: Add warning if we do not have the MSK 2020-06-24 11:43:50 +02:00
manuroe 774a32f5bf SecurityVC: Add Secure backup status 2020-06-24 11:43:41 +02:00
SBiOSoftWhare d3277abc1f Fix rebase. 2020-06-23 18:40:30 +02:00