Skip to content

Commit

Permalink
clean code
Browse files Browse the repository at this point in the history
  • Loading branch information
@ConstantinKV
ConstantinKV committed Feb 3, 2021
1 parent 8998170 commit abf32ee
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 deletions.
8 changes: 4 additions & 4 deletions Example/saltedge-ios.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; };
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
95316E0325CAAD0400FAB796 /* UIWindowExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95316E0225CAAD0400FAB796 /* UIWindowExtensions.swift */; };
95316E0325CAAD0400FAB796 /* UIApplicationExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95316E0225CAAD0400FAB796 /* UIApplicationExtensions.swift */; };
9D0E7BA222F426C9002D4DE9 /* MainTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D0E7BA122F426C9002D4DE9 /* MainTabBarViewController.swift */; };
9D98546D230FF7C300913C3D /* InteractiveAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D98546C230FF7C300913C3D /* InteractiveAlertView.swift */; };
AE05129D201F3EE1000E5F64 /* OptionsButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE05129C201F3EE1000E5F64 /* OptionsButton.swift */; };
Expand Down Expand Up @@ -72,7 +72,7 @@
85538029745105922B2922DF /* SaltEdge-iOS-Swift.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = "SaltEdge-iOS-Swift.podspec"; path = "../SaltEdge-iOS-Swift.podspec"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
9091C52E7B273302ABC0152C /* Pods_saltedge_ios_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_saltedge_ios_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9272D600EC690297D58E6E14 /* Pods-saltedge-ios_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-saltedge-ios_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-saltedge-ios_Example/Pods-saltedge-ios_Example.debug.xcconfig"; sourceTree = "<group>"; };
95316E0225CAAD0400FAB796 /* UIWindowExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIWindowExtensions.swift; sourceTree = "<group>"; };
95316E0225CAAD0400FAB796 /* UIApplicationExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIApplicationExtensions.swift; sourceTree = "<group>"; };
9D0E7BA122F426C9002D4DE9 /* MainTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarViewController.swift; sourceTree = "<group>"; };
9D536B3222526F4E00410CF2 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../CHANGELOG.md; sourceTree = "<group>"; };
9D98546C230FF7C300913C3D /* InteractiveAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InteractiveAlertView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -272,7 +272,7 @@
AE299B4220178F440033FCFB /* UserDefaultsHelper.swift */,
AEEF47A2201B82CE0076CD98 /* StringExtensions.swift */,
FAC9BA6D22B2402200310F6B /* LocaleExtensions.swift */,
95316E0225CAAD0400FAB796 /* UIWindowExtensions.swift */,
95316E0225CAAD0400FAB796 /* UIApplicationExtensions.swift */,
);
path = Utils;
sourceTree = "<group>";
Expand Down Expand Up @@ -531,7 +531,7 @@
AE299B492017A8F80033FCFB /* TransactionsViewController.swift in Sources */,
AE299B4E2017AD4E0033FCFB /* TransactionTableViewCell.swift in Sources */,
AEEF47A3201B82CE0076CD98 /* StringExtensions.swift in Sources */,
95316E0325CAAD0400FAB796 /* UIWindowExtensions.swift in Sources */,
95316E0325CAAD0400FAB796 /* UIApplicationExtensions.swift in Sources */,
AE9F52CA20164A7A0057FE09 /* CreateViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
5 changes: 2 additions & 3 deletions Example/saltedge-ios/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
if let connectionSecret = url.connectionSecret {
UserDefaultsHelper.append(connectionSecret: connectionSecret)
}
if let safariVc = UIWindow.topViewController as? SFSafariViewController {

if let safariVc = UIApplication.topViewController as? SFSafariViewController {
safariVc.dismiss(animated: true)
}

if let connectVC = connectViewController {
connectVC.dismiss(animated: true)

let alert = UIAlertController(title: "Redirect", message: "Redirect finished.", preferredStyle: .alert)
alert.addAction(UIAlertAction(title: "Close", style: .default, handler: nil))
Expand Down
5 changes: 2 additions & 3 deletions ...ltedge-ios/Utils/UIWindowExtensions.swift → ...e-ios/Utils/UIApplicationExtensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@

import UIKit

extension UIWindow {
extension UIApplication {
static var topViewController: UIViewController? {
let appDelegate = UIApplication.shared.delegate as! AppDelegate
return appDelegate.window?.rootViewController as? UITabBarController
return shared.windows.first?.rootViewController
}
}
2 changes: 1 addition & 1 deletion Example/saltedge-ios/View Controllers/ConnectViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ final class ConnectViewController: UIViewController {
vc.preferredBarTintColor = .systemBlue
vc.preferredControlTintColor = .white
}
UIWindow.topViewController?.present(vc, animated: true, completion: nil)
UIApplication.topViewController?.present(vc, animated: true)
}

private func createSession() {
Expand Down
2 changes: 1 addition & 1 deletion saltedge-ios-swift/Classes/API/HTTPService.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ struct HTTPService<T: Decodable> {
}
}

if (SERequestManager.shared.sslPinningEnabled) {
if SERequestManager.shared.sslPinningEnabled {
TrustKitHelper.setup { error in
if let error = error {
completion?(.failure(error))
Expand Down

0 comments on commit abf32ee

Please sign in to comment.