Skip to content

feat!: remove nativeFetchMessages (appears deprecated) #1643

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

Draft
erisu wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −23
Draft

feat!: remove nativeFetchMessages (appears deprecated) #1643

Show file tree
Hide file tree
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
17 changes: 0 additions & 17 deletions CordovaLib/Classes/Public/CDVCommandQueue.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,23 +91,6 @@ - (void)enqueueCommandBatch:(NSString*)batchJSON
}
}

- (void)fetchCommandsFromJs
{
__weak CDVCommandQueue* weakSelf = self;
NSString* js = @"cordova.require('cordova/exec').nativeFetchMessages()";

[_viewController.webViewEngine evaluateJavaScript:js
completionHandler:^(id obj, NSError* error) {
if ((error == nil) && [obj isKindOfClass:[NSString class]]) {
NSString* queuedCommandsJSON = (NSString*)obj;
CDV_EXEC_LOG(@"Exec: Flushed JS->native queue (hadCommands=%d).", [queuedCommandsJSON length] > 0);
[weakSelf enqueueCommandBatch:queuedCommandsJSON];
// this has to be called here now, because fetchCommandsFromJs is now async (previously: synchronous)
[self executePending];
}
}];
}

- (void)executePending
{
// Make us re-entrant-safe.
Expand Down
1 change: 0 additions & 1 deletion CordovaLib/include/Cordova/CDVCommandQueue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
- (void)resetRequestId;
- (void)enqueueCommandBatch:(NSString*)batchJSON;

- (void)fetchCommandsFromJs;
- (void)executePending;
- (BOOL)execute:(CDVInvokedUrlCommand*)command;

Expand Down
6 changes: 1 addition & 5 deletions cordova-js-src/exec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,18 +134,14 @@ iOSExec.nativeEvalAndFetch = function (func) {

function cordovaExec () {
var cexec = require('cordova/exec');
var cexec_valid = (typeof cexec.nativeFetchMessages === 'function') && (typeof cexec.nativeEvalAndFetch === 'function') && (typeof cexec.nativeCallback === 'function');
var cexec_valid = (typeof cexec.nativeEvalAndFetch === 'function') && (typeof cexec.nativeCallback === 'function');
return (cexec_valid && execProxy !== cexec) ? cexec : iOSExec;
}

function execProxy () {
cordovaExec().apply(null, arguments);
}

execProxy.nativeFetchMessages = function () {
return cordovaExec().nativeFetchMessages.apply(null, arguments);
};

execProxy.nativeEvalAndFetch = function () {
return cordovaExec().nativeEvalAndFetch.apply(null, arguments);
};
Expand Down
Loading