Commit Graph

71 Commits

Author SHA1 Message Date
Frank Rotermund f9409804b1 Merge commit 'a7b7fffd00663340f1684fa8d096dc20b4c9719e' into feature/basis_update_192
# Conflicts:
#	Config/AppVersion.xcconfig
#	Config/BuildSettings.swift
#	DesignKit/Source/ColorsSwiftUI.swift
#	DesignKit/Source/FontsSwiftUI.swift
#	DesignKit/Source/ThemeV2.swift
#	DesignKit/Variants/Colors/Dark/DarkColors.swift
#	DesignKit/Variants/Colors/Light/LightColors.swift
#	Podfile.lock
#	Riot/Assets/de.lproj/InfoPlist.strings
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
#	Riot/Managers/PushNotification/PushNotificationService.m
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Communities/Home/GroupHomeViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/SetPinCode/PinCodePreferences.swift
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
#	fastlane/Fastfile
#	project.yml
2022-09-19 14:42:25 +02:00
Frank Rotermund 226e55caf7 MESSENGER-3304 string in separate files 2022-09-19 11:53:45 +02:00
ismailgulek 073eb73302 Adapt api changes from key backup module 2022-08-11 13:52:01 +03:00
Arnaud Ringenbach 4c5ae7e4da Add cancellable property to secureBackup/recovery coordinators 2022-03-09 10:41:48 +01:00
Arnaud Ringenbach 644aac224b Add cancellable property to secureBackup/recovery coordinators 2022-03-09 10:41:48 +01:00
Stefan Ceriu 1ab7643de1 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Stefan Ceriu 4b1eb75fd3 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Doug a4075c89cb Fix class keyword deprecation warnings everywhere!
Using 'class' keyword for protocol inheritance is deprecated; use 'AnyObject' instead
2021-07-09 17:05:43 +01:00
Doug 29d7262e38 Fix class keyword deprecation warnings everywhere!
Using 'class' keyword for protocol inheritance is deprecated; use 'AnyObject' instead
2021-07-09 17:05:43 +01:00
manuroe 9302517410 Cleaning 2021-06-16 16:11:32 +02:00
manuroe 748faf2eb4 Cleaning 2021-06-16 16:11:32 +02:00
manuroe 5e2d75a2fb Key Backup setup: Create the key backup using 4S if it exists 2021-06-16 08:18:23 +02:00
manuroe 43152f2b1d Key Backup setup: Create the key backup using 4S if it exists 2021-06-16 08:18:23 +02:00
manuroe cecb1b0bed XcodeGen: Remove old files, probably residual from a git mv 2021-02-16 08:44:26 +01:00
manuroe f79ca290d6 XcodeGen: Remove old files, probably residual from a git mv 2021-02-16 08:44:26 +01:00
SBiOSoftWhare 2de47ea160 Remove some Swift warnings. 2020-09-01 11:57:30 +02:00
SBiOSoftWhare cbba38b72b Remove some Swift warnings. 2020-09-01 11:57:30 +02:00
manuroe 51cf40d3a0 Clarify key backup details when backup exists but is not trusted in banner too
This follows changes made by https://github.com/vector-im/riot-ios/pull/2375
2019-04-24 10:23:27 +02:00
manuroe 7ac7365bea Clarify key backup details when backup exists but is not trusted in banner too
This follows changes made by https://github.com/vector-im/riot-ios/pull/2375
2019-04-24 10:23:27 +02: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
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 48505f5d25 Handle manual export in key backup setup intro screen 2019-02-15 19:04:54 +01:00
SBiOSoftWhare dc470aac67 Handle manual export in key backup setup intro screen 2019-02-15 19:04:54 +01:00
SBiOSoftWhare 251daf7e7e Use new lineBreakColor in KeyBackupSetupSuccessFromRecoveryKeyViewController 2019-02-13 15:26:51 +01:00
SBiOSoftWhare 03175e0d31 Use new lineBreakColor in KeyBackupSetupSuccessFromRecoveryKeyViewController 2019-02-13 15:26:51 +01:00
SBiOSoftWhare a58656f50b Remove former key backup setup success scene 2019-02-13 15:02:31 +01:00
SBiOSoftWhare e83f0415d7 Remove former key backup setup success scene 2019-02-13 15:02:31 +01:00
SBiOSoftWhare b99ff02ab8 Update KeyBackupSetupCoordinator, handle new success controllers 2019-02-13 14:58:16 +01:00
SBiOSoftWhare cbb9dff74b Update KeyBackupSetupCoordinator, handle new success controllers 2019-02-13 14:58:16 +01:00
SBiOSoftWhare a4cff07872 Update key backup setup passphrase scene 2019-02-13 14:58:16 +01:00
SBiOSoftWhare 4f7adadc1d Update key backup setup passphrase scene 2019-02-13 14:58:16 +01:00
SBiOSoftWhare 352a0e9a48 Update KeyBackupSetupIntroViewController 2019-02-13 14:58:16 +01:00
SBiOSoftWhare 8f1caabe01 Update KeyBackupSetupIntroViewController 2019-02-13 14:58:16 +01:00
SBiOSoftWhare af1de2bb5b Create new key backup setup success view controllers 2019-02-13 14:58:16 +01:00
SBiOSoftWhare 1bbf657ddb Create new key backup setup success view controllers 2019-02-13 14:58:16 +01:00
manuroe 048455190a Reskin: Replace separatorColor with lineBreakColor, the color introduced in the new uniformed palette 2019-02-13 09:39:32 +01:00
manuroe 214af86039 Reskin: Replace separatorColor with lineBreakColor, the color introduced in the new uniformed palette 2019-02-13 09:39:32 +01:00
manuroe 0a73f23be6 Reskin: Use same color names as in https://app.zeplin.io/project/5c122fa790c5b4241ffa6be7/screen/5c619592daff2f1241d82e75 2019-02-12 19:06:22 +01:00
manuroe 29aa20f810 Reskin: Use same color names as in https://app.zeplin.io/project/5c122fa790c5b4241ffa6be7/screen/5c619592daff2f1241d82e75 2019-02-12 19:06:22 +01:00
manuroe cab2ef3534 Key backup: Fix some recovery setup bugs 2019-01-31 20:00:38 +01:00
manuroe 25c69eb44c Key backup: Fix some recovery setup bugs 2019-01-31 20:00:38 +01:00
SBiOSoftWhare 6acb6995d7 Create KeyBackupSetupCoordinatorBridgePresenter which enables to start KeyBackupSetupCoordinator from a view controller 2019-01-30 11:14:03 +01:00
SBiOSoftWhare 4997b710cc Create KeyBackupSetupCoordinatorBridgePresenter which enables to start KeyBackupSetupCoordinator from a view controller 2019-01-30 11:14:03 +01:00
SBiOSoftWhare a66a950639 Make small improvements on KeyBackupSetupCoordinator and KeyBackupSetupPassphraseViewController 2019-01-30 11:14:03 +01:00
SBiOSoftWhare 5b1a0ec874 Make small improvements on KeyBackupSetupCoordinator and KeyBackupSetupPassphraseViewController 2019-01-30 11:14:03 +01:00
SBiOSoftWhare 2913c7fbca Remove a Swift 4.2 API usage as project use Swift 4.0 for the moment. 2019-01-23 15:31:31 +01:00
SBiOSoftWhare 69d1b6872a Remove a Swift 4.2 API usage as project use Swift 4.0 for the moment. 2019-01-23 15:31:31 +01:00
SBiOSoftWhare 811b5c5b3a Add commodity methods on OperationQueue and use them in key backup setup view models. 2019-01-23 12:11:30 +01:00