Commit Graph

228 Commits

Author SHA1 Message Date
ismailgulek 6c2c2faea2 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
2020-06-26 17:33:09 +03:00
ismailgulek b1acd2ad24 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 e96ff90f01 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 ede85f9806 Merge branch 'develop' into riot_3293
# Conflicts:
#	CHANGES.rst
#	Riot/Generated/Strings.swift
2020-06-26 14:30:21 +02:00
manuroe e37d2cef0d SecurityVC: Start cleaning 2020-06-26 07:56:56 +02:00
manuroe 60686a2060 SecurityVC: Start cleaning 2020-06-26 07:56:56 +02:00
manuroe df188da49b Security: Plug UX for cross-signing setup
part of #3299
2020-06-26 07:42:37 +02:00
manuroe 023480a6bf Security: Plug UX for cross-signing setup
part of #3299
2020-06-26 07:42:37 +02:00
manuroe 47cb148537 SecurityVC: Plug Secure Backup setup flow 2020-06-25 20:23:40 +02:00
manuroe fa1c18a9bf SecurityVC: Plug Secure Backup setup flow 2020-06-25 20:23:40 +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 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 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 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 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 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 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 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 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 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 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
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
manuroe a41eedadc1 SecurityVC: Use NEW_CROSS_SIGNING_FLOW to not break things 2020-06-24 11:43:50 +02:00
manuroe 7d2b80e129 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 643d4e3fba 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
manuroe a24d3f47b9 SecurityVC: Add Secure backup status 2020-06-24 11:43:41 +02:00
manuroe f7879c4238 SecurityVC: Add cross-signing reset. Stub things using test passwords 2020-06-19 09:32:27 +02:00
manuroe e50f1a0856 SecurityVC: Add cross-signing reset. Stub things using test passwords 2020-06-19 09:32:27 +02:00
manuroe 9c8d3947b7 SecurityVC: Delete a secure backup 2020-06-19 08:00:22 +02:00
manuroe 296a60a8ed SecurityVC: Delete a secure backup 2020-06-19 08:00:22 +02:00
manuroe 2e9a6783e1 SecurityVC: PoC for secure backup settings 2020-06-18 15:51:06 +02:00
manuroe 9a0dc7d460 SecurityVC: PoC for secure backup settings 2020-06-18 15:51:06 +02:00
manuroe cddc61198d SecurityVC: Factorise cell buttons 2020-06-18 11:47:53 +02:00
manuroe 1824dfa3eb SecurityVC: Factorise cell buttons 2020-06-18 11:47:53 +02:00
SBiOSoftWhare 9e3a91ea00 SecurityVC: Connect/restore key backup created with SSSS. 2020-06-15 16:30:58 +02:00
SBiOSoftWhare 7768ac8a28 SecurityVC: Connect/restore key backup created with SSSS. 2020-06-15 16:30:58 +02:00
ismailgulek 8537141ffb Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
2020-06-05 16:00:24 +03:00
ismailgulek 06a1e5b142 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
2020-06-05 16:00:24 +03:00
SBiOSoftWhare b8afa1e58b SecurityVC: Remove MXCrossSigningStateCanCrossSignAsynchronously references. 2020-06-04 17:27:54 +02:00
SBiOSoftWhare 6f29298a79 SecurityVC: Remove MXCrossSigningStateCanCrossSignAsynchronously references. 2020-06-04 17:27:54 +02:00
ismailgulek 8f2df22c52 Override preferredStatusBarStyle for missing pages and ensure setNeedsStatusBarAppearanceUpdate will be called
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-05-22 12:10:27 +03:00
ismailgulek de418e3b09 Override preferredStatusBarStyle for missing pages and ensure setNeedsStatusBarAppearanceUpdate will be called
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-05-22 12:10:27 +03:00
manuroe f64951718c Security > Sessions: Display my unverified device with a red shield 2020-04-28 16:15:31 +02:00
manuroe c600ea2bed Security > Sessions: Display my unverified device with a red shield 2020-04-28 16:15:31 +02:00
manuroe e49bceb7df Security settings: Do not ask to complete security if there is no cross-signing
Fix #3147
2020-04-24 18:49:00 +02:00
manuroe b7346395b3 Security settings: Do not ask to complete security if there is no cross-signing
Fix #3147
2020-04-24 18:49:00 +02:00