From 02b3a023966c1456c7da0832daf598e9e22d85d9 Mon Sep 17 00:00:00 2001 From: Marino Faggiana Date: Mon, 3 Oct 2022 16:10:36 +0200 Subject: remove old code Signed-off-by: Marino Faggiana --- iOSClient/AppDelegate.swift | 7 ------- iOSClient/Login/NCLoginWeb.swift | 11 +---------- iOSClient/Utility/CCUtility.h | 3 --- iOSClient/Utility/CCUtility.m | 11 ----------- 4 files changed, 1 insertion(+), 31 deletions(-) diff --git a/iOSClient/AppDelegate.swift b/iOSClient/AppDelegate.swift index 30652ccad..552d8b0bb 100644 --- a/iOSClient/AppDelegate.swift +++ b/iOSClient/AppDelegate.swift @@ -60,8 +60,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD var shares: [tableShare] = [] var timerErrorNetworking: Timer? - var errorITMS90076: Bool = false - private var privacyProtectionWindow: UIWindow? func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { @@ -110,11 +108,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD } } - // ITMS-90076: Potential Loss of Keychain Access - if let account = NCManageDatabase.shared.getActiveAccount(), CCUtility.getPassword(account.account).isEmpty, NCUtility.shared.getVersionApp(withBuild: false).starts(with: "4.4") { - errorITMS90076 = true - } - // Activate user account if let activeAccount = NCManageDatabase.shared.getActiveAccount() { diff --git a/iOSClient/Login/NCLoginWeb.swift b/iOSClient/Login/NCLoginWeb.swift index f99a6dc0c..ddcf43b28 100644 --- a/iOSClient/Login/NCLoginWeb.swift +++ b/iOSClient/Login/NCLoginWeb.swift @@ -144,16 +144,7 @@ class NCLoginWeb: UIViewController { // Stop timer error network appDelegate.timerErrorNetworking?.invalidate() - // ITMS-90076: Potential Loss of Keychain Access - if appDelegate.errorITMS90076, !CCUtility.getPresentErrorITMS90076() { - - let message = "\n" + NSLocalizedString("_ITMS-90076_", comment: "") - let alertController = UIAlertController(title: titleView, message: message, preferredStyle: .alert) - alertController.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { _ in })) - present(alertController, animated: true, completion: { - CCUtility.setPresentErrorITMS90076(true) - }) - } else if let account = NCManageDatabase.shared.getActiveAccount(), CCUtility.getPassword(account.account).isEmpty { + if let account = NCManageDatabase.shared.getActiveAccount(), CCUtility.getPassword(account.account).isEmpty { let message = "\n" + NSLocalizedString("_password_not_present_", comment: "") let alertController = UIAlertController(title: titleView, message: message, preferredStyle: .alert) diff --git a/iOSClient/Utility/CCUtility.h b/iOSClient/Utility/CCUtility.h index 96ed5e538..82193eb15 100644 --- a/iOSClient/Utility/CCUtility.h +++ b/iOSClient/Utility/CCUtility.h @@ -180,9 +180,6 @@ + (BOOL)getRemovePhotoCameraRoll; + (void)setRemovePhotoCameraRoll:(BOOL)set; -+ (BOOL)getPresentErrorITMS90076; -+ (void)setPresentErrorITMS90076:(BOOL)set; - + (BOOL)getPlayerPlay; + (void)setPlayerPlay:(BOOL)set; diff --git a/iOSClient/Utility/CCUtility.m b/iOSClient/Utility/CCUtility.m index 59dd8d8d2..47a3144cd 100644 --- a/iOSClient/Utility/CCUtility.m +++ b/iOSClient/Utility/CCUtility.m @@ -723,17 +723,6 @@ [UICKeyChainStore setString:sSet forKey:@"removePhotoCameraRoll" service:NCGlobal.shared.serviceShareKeyChain]; } -+ (BOOL)getPresentErrorITMS90076 -{ - return [[UICKeyChainStore stringForKey:@"errorITMS90076" service:NCGlobal.shared.serviceShareKeyChain] boolValue]; -} - -+ (void)setPresentErrorITMS90076:(BOOL)set -{ - NSString *sSet = (set) ? @"true" : @"false"; - [UICKeyChainStore setString:sSet forKey:@"errorITMS90076" service:NCGlobal.shared.serviceShareKeyChain]; -} - + (BOOL)getPlayerPlay { return [[UICKeyChainStore stringForKey:@"playerPlay" service:NCGlobal.shared.serviceShareKeyChain] boolValue]; -- cgit v1.2.3