Skip to content

Fixes #209 - retrieval of keyWindow/rootViewController. #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndLen23 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes #209 - retrieval of keyWindow/rootViewController. #210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions ios/Classes/SwiftFlutterContactsPlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,24 @@ public enum FlutterContacts {

@available(iOS 9.0, *)
public class SwiftFlutterContactsPlugin: NSObject, FlutterPlugin, FlutterStreamHandler, CNContactViewControllerDelegate, CNContactPickerDelegate {
private let rootViewController: UIViewController
private var keyWindow: UIWindow? {
if #available(iOS 13, *) {
// Get key window from currently active scene
return UIApplication.shared.connectedScenes
.filter { $0.activationState == .foregroundActive }
.compactMap { $0 as? UIWindowScene }
.flatMap { $0.windows }
.first { $0.isKeyWindow }
} else {
// Fallback to old way from application delgate
return UIApplication.shared.delegate!.window!
}
}
private var rootViewController: UIViewController {
let window = keyWindow
assert(window != nil)
return window!.rootViewController!
}
private var externalResult: FlutterResult?

public static func register(with registrar: FlutterPluginRegistrar) {
Expand All @@ -432,16 +449,11 @@ public class SwiftFlutterContactsPlugin: NSObject, FlutterPlugin, FlutterStreamH
name: "github.com/QuisApp/flutter_contacts/events",
binaryMessenger: registrar.messenger()
)
let rootViewController = UIApplication.shared.delegate!.window!!.rootViewController!
let instance = SwiftFlutterContactsPlugin(rootViewController)
let instance = SwiftFlutterContactsPlugin()
registrar.addMethodCallDelegate(instance, channel: channel)
eventChannel.setStreamHandler(instance)
}

init(_ rootViewController: UIViewController) {
self.rootViewController = rootViewController
}

public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
switch call.method {
case "requestPermission":
Expand Down