feat(core): cherrypick: expose methodName via CAPPluginCall (#7641)…

… (#7684) Co-authored-by: Robin Genz <[email protected]>
ionic-team · Sep 27, 2024 · bf6ef8e · bf6ef8e
1 parent ce30924
commit bf6ef8e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/ios/Capacitor/Capacitor/CAPPluginCall.h b/ios/Capacitor/Capacitor/CAPPluginCall.h
@@ -12,11 +12,14 @@ typedef void(^CAPPluginCallErrorHandler)(CAPPluginCallError *error);
 @property (nonatomic, assign) BOOL isSaved DEPRECATED_MSG_ATTRIBUTE("Use 'keepAlive' instead.");
 @property (nonatomic, assign) BOOL keepAlive;
 @property (nonatomic, strong) NSString *callbackId;
+@property (nonatomic, strong) NSString *methodName;
 @property (nonatomic, strong) NSDictionary *options;
 @property (nonatomic, copy) CAPPluginCallSuccessHandler successHandler;
 @property (nonatomic, copy) CAPPluginCallErrorHandler errorHandler;
 
-- (instancetype)initWithCallbackId:(NSString *)callbackId options:(NSDictionary *)options success:(CAPPluginCallSuccessHandler)success error:(CAPPluginCallErrorHandler)error;
+- (instancetype)initWithCallbackId:(NSString *)callbackId options:(NSDictionary *)options success:(CAPPluginCallSuccessHandler)success error:(CAPPluginCallErrorHandler)error DEPRECATED_MSG_ATTRIBUTE("Specify the method name as well.");
+
+- (instancetype)initWithCallbackId:(NSString *)callbackId methodName:(NSString *)methodName options:(NSDictionary *)options success:(CAPPluginCallSuccessHandler)success error:(CAPPluginCallErrorHandler)error;
 
 - (void)save DEPRECATED_MSG_ATTRIBUTE("Use the 'keepAlive' property instead.");
 @end
diff --git a/ios/Capacitor/Capacitor/CAPPluginCall.m b/ios/Capacitor/Capacitor/CAPPluginCall.m
@@ -3,8 +3,18 @@
 
 @implementation CAPPluginCall
 
-- (instancetype)initWithCallbackId:(NSString *)callbackId options:(NSDictionary *)options success:(CAPPluginCallSuccessHandler) success error:(CAPPluginCallErrorHandler) error {
+- (instancetype)initWithCallbackId:(NSString *)callbackId options:(NSDictionary *)options success:(CAPPluginCallSuccessHandler) success error:(CAPPluginCallErrorHandler) error __deprecated {
   self.callbackId = callbackId;
+  self.methodName = @"";
+  self.options = options;
+  self.successHandler = success;
+  self.errorHandler = error;
+  return self;
+}
+
+- (instancetype)initWithCallbackId:(NSString *)callbackId methodName:(NSString *)methodName options:(NSDictionary *)options success:(CAPPluginCallSuccessHandler) success error:(CAPPluginCallErrorHandler) error {
+  self.callbackId = callbackId;
+  self.methodName = methodName;
   self.options = options;
   self.successHandler = success;
   self.errorHandler = error;

diff --git a/ios/Capacitor/Capacitor/CapacitorBridge.swift b/ios/Capacitor/Capacitor/CapacitorBridge.swift
@@ -489,7 +489,7 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
         dispatchQueue.async { [weak self] in
             // let startTime = CFAbsoluteTimeGetCurrent()
 
-            let pluginCall = CAPPluginCall(callbackId: call.callbackId,
+            let pluginCall = CAPPluginCall(callbackId: call.callbackId, methodName: call.method,
                                            options: JSTypes.coerceDictionaryToJSObject(call.options,
                                                                                        formattingDatesAsStrings: plugin.shouldStringifyDatesInCalls) ?? [:],
                                            success: {(result: CAPPluginCallResult?, pluginCall: CAPPluginCall?) -> Void in