Skip to content
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

fix(ios): avoid crash on registerPlugins on Xcode 11.4 #2414

Merged
merged 1 commit into from
Mar 9, 2020
+21 −20
Merged

fix(ios): avoid crash on registerPlugins on Xcode 11.4 #2414

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
41 changes: 21 additions & 20 deletions ios/Capacitor/Capacitor/CAPBridge.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ enum BridgeError: Error {
public var scheme: String
// Whether the app is active
private var isActive = true
// Wheter to inject the Cordova files
private var injectCordovaFiles = false

// Background dispatch queue for plugin calls
public var dispatchQueue = DispatchQueue(label: "bridge")
Expand Down Expand Up @@ -207,16 +209,6 @@ enum BridgeError: Error {
* their JS.
*/
func setupCordovaCompatibility() {
var injectCordovaFiles = false
var numClasses = UInt32(0);
let classes = objc_copyClassList(&numClasses)
for i in 0..<Int(numClasses) {
let c: AnyClass = classes![i]
if class_getSuperclass(c) == CDVPlugin.self {
injectCordovaFiles = true
break
}
}
if injectCordovaFiles {
exportCordovaJS()
registerCordovaPlugins()
Expand Down Expand Up @@ -246,20 +238,29 @@ enum BridgeError: Error {
* Register all plugins that have been declared
*/
func registerPlugins() {
var numClasses = UInt32(0);
let classes = objc_copyClassList(&numClasses)
let classCount = objc_getClassList(nil, 0)
let classes = UnsafeMutablePointer<AnyClass?>.allocate(capacity: Int(classCount))

let releasingClasses = AutoreleasingUnsafeMutablePointer<AnyClass>(classes)
let numClasses: Int32 = objc_getClassList(releasingClasses, classCount)

for i in 0..<Int(numClasses) {
let c: AnyClass = classes![i]
if class_conformsToProtocol(c, CAPBridgedPlugin.self) {
let pluginClassName = NSStringFromClass(c)
let pluginType = c as! CAPPlugin.Type
let bridgeType = c as! CAPBridgedPlugin.Type

registerPlugin(pluginClassName, bridgeType.jsName(), pluginType)
if let c: AnyClass = classes[i] {
if class_getSuperclass(c) == CDVPlugin.self {
injectCordovaFiles = true
}
if class_conformsToProtocol(c, CAPBridgedPlugin.self) {
let pluginClassName = NSStringFromClass(c)
let pluginType = c as! CAPPlugin.Type
let bridgeType = c as! CAPBridgedPlugin.Type

registerPlugin(pluginClassName, bridgeType.jsName(), pluginType)
}
}
}
classes.deallocate()
}

/**
* Register a single plugin.
*/
Expand Down