Skip to content

fix(firebase_database): Fix MissingPluginException caused by malformed EventChannel name. #7859

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

Merged
merged 4 commits into from
Jan 26, 2022
Merged

fix(firebase_database): Fix MissingPluginException caused by malformed EventChannel name. #7859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
539bac1
fix(database): fix event channel name bug
russellwheatley Jan 13, 2022
f4a0119
chore(database): rm android rtdb listener array
russellwheatley Jan 18, 2022
0ec4bbe
chore(rtdb): update iOS listener implementation
russellwheatley Jan 18, 2022
c2171ad
format
russellwheatley Jan 18, 2022
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
21 changes: 2 additions & 19 deletions ...se/android/src/main/java/io/flutter/plugins/firebase/database/FirebaseDatabasePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class FirebaseDatabasePlugin
implements FlutterFirebasePlugin, FlutterPlugin, MethodCallHandler {
protected static final HashMap<String, FirebaseDatabase> databaseInstanceCache = new HashMap<>();
private static final String METHOD_CHANNEL_NAME = "plugins.flutter.io/firebase_database";
private final Map<String, Integer> queryListenersCount = new HashMap<>();
private int listenerCount = 0;
private final Map<EventChannel, StreamHandler> streamHandlers = new HashMap<>();
private MethodChannel methodChannel;
private BinaryMessenger messenger;
Expand Down Expand Up @@ -272,28 +272,14 @@ private Task<String> observe(Map<String, Object> arguments) {
final Query query = getQuery(arguments);
final String eventChannelNamePrefix =
(String) arguments.get(Constants.EVENT_CHANNEL_NAME_PREFIX);
final String eventChannelName = eventChannelNamePrefix + "#" + listenerCount++;

int newListenersCount;
synchronized (queryListenersCount) {
Integer currentListenersCount = queryListenersCount.get(eventChannelNamePrefix);
newListenersCount = currentListenersCount == null ? 1 : currentListenersCount + 1;
queryListenersCount.put(eventChannelNamePrefix, newListenersCount);
}

final String eventChannelName = eventChannelNamePrefix + "#" + newListenersCount;
final EventChannel eventChannel = new EventChannel(messenger, eventChannelName);
final EventStreamHandler streamHandler =
new EventStreamHandler(
query,
() -> {
eventChannel.setStreamHandler(null);
synchronized (queryListenersCount) {
Integer currentListenersCount =
queryListenersCount.get(eventChannelNamePrefix);
queryListenersCount.put(
eventChannelNamePrefix,
currentListenersCount == null ? 0 : currentListenersCount - 1);
}
});

eventChannel.setStreamHandler(streamHandler);
Expand Down Expand Up @@ -476,9 +462,6 @@ public Task<Void> didReinitializeFirebaseCore() {

private void cleanup() {
removeEventStreamHandlers();
synchronized (queryListenersCount) {
queryListenersCount.clear();
}
databaseInstanceCache.clear();
}

Expand Down
30 changes: 8 additions & 22 deletions packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabasePlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
@implementation FLTFirebaseDatabasePlugin {
// Used by FlutterStreamHandlers.
NSObject<FlutterBinaryMessenger> *_binaryMessenger;
NSMutableDictionary<NSString *, NSNumber *> *_listenerCounts;
NSMutableDictionary<NSString *, FLTFirebaseDatabaseObserveStreamHandler *> *_streamHandlers;
// Used by transactions.
FlutterMethodChannel *_channel;
int _listenerCount;
}

#pragma mark - FlutterPlugin
Expand All @@ -27,8 +27,8 @@ - (instancetype)init:(NSObject<FlutterBinaryMessenger> *)messenger
if (self) {
_channel = channel;
_binaryMessenger = messenger;
_listenerCounts = [NSMutableDictionary dictionary];
_streamHandlers = [NSMutableDictionary dictionary];
_listenerCount = 0;
}
return self;
}
Expand Down Expand Up @@ -355,31 +355,17 @@ - (void)queryKeepSynced:(id)arguments withMethodCallResult:(FLTFirebaseMethodCal
- (void)queryObserve:(id)arguments withMethodCallResult:(FLTFirebaseMethodCallResult *)result {
FIRDatabaseQuery *databaseQuery = [FLTFirebaseDatabaseUtils databaseQueryFromArguments:arguments];
NSString *eventChannelNamePrefix = arguments[@"eventChannelNamePrefix"];
int newListenersCount;
@synchronized(_listenerCounts) {
NSNumber *currentListenersCount = _listenerCounts[eventChannelNamePrefix];
newListenersCount = currentListenersCount == nil ? 1 : [currentListenersCount intValue] + 1;
_listenerCounts[eventChannelNamePrefix] = @(newListenersCount);
}
_listenerCount = _listenerCount + 1;
NSString *eventChannelName =
[NSString stringWithFormat:@"%@#%d", eventChannelNamePrefix, newListenersCount];
[NSString stringWithFormat:@"%@#%i", eventChannelNamePrefix, _listenerCount];

FlutterEventChannel *eventChannel = [FlutterEventChannel eventChannelWithName:eventChannelName
binaryMessenger:_binaryMessenger];
__weak FLTFirebaseDatabasePlugin *weakSelf = self;
FLTFirebaseDatabaseObserveStreamHandler *streamHandler =
[[FLTFirebaseDatabaseObserveStreamHandler alloc]
initWithFIRDatabaseQuery:databaseQuery
andOnDisposeBlock:^() {
__strong FLTFirebaseDatabasePlugin *strongSelf = weakSelf;
[eventChannel setStreamHandler:nil];
@synchronized(strongSelf->_listenerCounts) {
NSNumber *currentListenersCount =
strongSelf->_listenerCounts[eventChannelNamePrefix];
strongSelf->_listenerCounts[eventChannelNamePrefix] =
@(currentListenersCount == nil ? 0 : [currentListenersCount intValue] - 1);
}
}];
[[FLTFirebaseDatabaseObserveStreamHandler alloc] initWithFIRDatabaseQuery:databaseQuery
andOnDisposeBlock:^() {
[eventChannel setStreamHandler:nil];
}];
[eventChannel setStreamHandler:streamHandler];
_streamHandlers[eventChannelName] = streamHandler;
result.success(eventChannelName);
Expand Down