Skip to content

Remove the class FIRMessagingRmq2PersistentStore #4045

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 5 commits into from
Oct 10, 2019
Merged

Remove the class FIRMessagingRmq2PersistentStore #4045

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99f5e4f
remove the class layer of FIRMessagingRmqManager cause it is mostly c…
charlotteliang Oct 10, 2019
c5d1007
reorder the functions for easier review
charlotteliang Oct 10, 2019
591cfac
move functions around
charlotteliang Oct 10, 2019
992485d
mark unused error code
charlotteliang Oct 10, 2019
0bf3801
remove debug macro
charlotteliang Oct 10, 2019
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
9 changes: 1 addition & 8 deletions Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#import "Firebase/Messaging/FIRMessagingClient.h"
#import "Firebase/Messaging/FIRMessagingConnection.h"
#import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
#import "Firebase/Messaging/FIRMessagingRmq2PersistentStore.h"
#import "Firebase/Messaging/FIRMessagingReceiver.h"
#import "Firebase/Messaging/FIRMessagingRmqManager.h"
#import "Firebase/Messaging/FIRMessagingSyncMessageManager.h"
Expand Down Expand Up @@ -53,12 +52,6 @@ - (NSString *)categoryForUpstreamMessages;

@interface FIRMessagingRmqManager (ExposedForTest)

@property(nonatomic, readwrite, strong) FIRMessagingRmq2PersistentStore *rmq2Store;

@end

@interface FIRMessagingRmq2PersistentStore (ExposedForTest)

- (void)removeDatabase;

@end
Expand Down Expand Up @@ -93,7 +86,7 @@ - (void)setUp {

-(void)tearDown {
if (_dataMessageManager.rmq2Manager) {
[_dataMessageManager.rmq2Manager.rmq2Store removeDatabase];
[_dataMessageManager.rmq2Manager removeDatabase];
}
[super tearDown];
}
Expand Down
12 changes: 3 additions & 9 deletions Example/Messaging/Tests/FIRMessagingRmqManagerTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,13 @@
#import "Firebase/Messaging/FIRMessagingPersistentSyncMessage.h"
#import "Firebase/Messaging/FIRMessagingRmqManager.h"
#import "Firebase/Messaging/FIRMessagingUtilities.h"
#import "Firebase/Messaging/FIRMessagingRmq2PersistentStore.h"
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"

static NSString *const kRmqDatabaseName = @"rmq-test-db";
static NSString *const kRmqDataMessageCategory = @"com.google.gcm-rmq-test";

@interface FIRMessagingRmqManager (ExposedForTest)

@property(nonatomic, readwrite, strong) FIRMessagingRmq2PersistentStore *rmq2Store;

@end

@interface FIRMessagingRmq2PersistentStore (ExposedForTest)
@interface FIRMessagingRmqManager (ExposedForTest)

- (void)removeDatabase;

Expand All @@ -53,7 +47,7 @@ - (void)setUp {
}

- (void)tearDown {
[self.rmqManager.rmq2Store removeDatabase];
[self.rmqManager removeDatabase];
[super tearDown];
}

Expand Down Expand Up @@ -221,7 +215,7 @@ - (void)testDeletingD2SMessagesFromRMQ {

// delete the acked message
NSString *rmqIDString = [NSString stringWithFormat:@"%lld", ackedMessageRmqID];
XCTAssertEqual(1, [self.rmqManager removeRmqMessagesWithRmqId:rmqIDString]);
XCTAssertEqual(1, [self.rmqManager removeRmqMessagesWithRmqIds:@[rmqIDString]]);

// should only have one message in the d2s RMQ
[self.rmqManager scanWithRmqMessageHandler:nil
Expand Down
9 changes: 1 addition & 8 deletions Example/Messaging/Tests/FIRMessagingSyncMessageManagerTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#import <XCTest/XCTest.h>

#import "Firebase/Messaging/FIRMessagingPersistentSyncMessage.h"
#import "Firebase/Messaging/FIRMessagingRmq2PersistentStore.h"
#import "Firebase/Messaging/FIRMessagingRmqManager.h"
#import "Firebase/Messaging/FIRMessagingSyncMessageManager.h"
#import "Firebase/Messaging/FIRMessagingUtilities.h"
Expand All @@ -27,12 +26,6 @@

@interface FIRMessagingRmqManager (ExposedForTest)

@property(nonatomic, readwrite, strong) FIRMessagingRmq2PersistentStore *rmq2Store;

@end

@interface FIRMessagingRmq2PersistentStore (ExposedForTest)

- (void)removeDatabase;

@end
Expand All @@ -54,7 +47,7 @@ - (void)setUp {
}

- (void)tearDown {
[self.rmqManager.rmq2Store removeDatabase];
[self.rmqManager removeDatabase];
[super tearDown];
}

Expand Down
4 changes: 1 addition & 3 deletions Firebase/Messaging/FIRMMessageCode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,14 @@ typedef NS_ENUM(NSInteger, FIRMessagingMessageCode) {
kFIRMessagingMessageCodeRemoteNotificationsProxyAPNSFailed = 12002, // I-FCM012002
kFIRMessagingMessageCodeRemoteNotificationsProxyMethodNotAdded = 12003, // I-FCM012003
// FIRMessagingRmq2PersistentStore.m
kFIRMessagingMessageCodeRmq2PersistentStore000 = 13000, // I-FCM013000
kFIRMessagingMessageCodeRmq2PersistentStore001 = 13001, // I-FCM013001
// DO NOT USE 13000, 13001, 13009
kFIRMessagingMessageCodeRmq2PersistentStore002 = 13002, // I-FCM013002
kFIRMessagingMessageCodeRmq2PersistentStore003 = 13003, // I-FCM013003
kFIRMessagingMessageCodeRmq2PersistentStore004 = 13004, // I-FCM013004
kFIRMessagingMessageCodeRmq2PersistentStore005 = 13005, // I-FCM013005
kFIRMessagingMessageCodeRmq2PersistentStore006 = 13006, // I-FCM013006
kFIRMessagingMessageCodeRmq2PersistentStoreErrorCreatingDatabase = 13007, // I-FCM013007
kFIRMessagingMessageCodeRmq2PersistentStoreErrorOpeningDatabase = 13008, // I-FCM013008
kFIRMessagingMessageCodeRmq2PersistentStoreInvalidRmqDirectory = 13009, // no longer used
kFIRMessagingMessageCodeRmq2PersistentStoreErrorCreatingTable = 13010, // I-FCM013010
// FIRMessagingRmqManager.m
kFIRMessagingMessageCodeRmqManager000 = 14000, // I-FCM014000
Expand Down
8 changes: 0 additions & 8 deletions Firebase/Messaging/FIRMessagingConnection.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,14 +596,6 @@ - (void)confirmAckedD2sIdsWithStreamId:(int)lastReceivedStreamId {
}
}

/**
* Called when a stream ACK or a selective ACK are received - this indicates the message has
* been received by MCS.
*/
- (void)didReceiveAckForRmqIds:(NSArray *)rmqIds {
// TODO: let the user know that the following messages were received by the server
}

- (void)confirmAckedS2dIdsWithStreamId:(int)lastReceivedStreamId {
// If the server hasn't received the streamId yet.
FIRMessagingLoggerDebug(kFIRMessagingMessageCodeConnection019,
Expand Down
11 changes: 11 additions & 0 deletions Firebase/Messaging/FIRMessagingDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,14 @@ _Pragma("clang diagnostic pop")
return nil; \
} while (0)
#endif

#if defined(DEBUG)
#define FIRMesssaging_MUST_NOT_BE_MAIN_THREAD() \
do { \
NSAssert(![NSThread isMainThread], @"Must not be executing on the main thread."); \
Copy link
Contributor

@morganchen12 morganchen12 Oct 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Though it's debug-only, this assert may trigger false-positives if the main GCD queue is suspended. See http://blog.benjamin-encz.de/post/main-queue-vs-main-thread/

Copy link
Contributor Author

@charlotteliang charlotteliang Oct 10, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed it for now. Also realize we don't set DEBUG flag anymore so this would be barely used.

} while (0);
#else
#define RCN_MUST_NOT_BE_MAIN_THREAD() \
do { \
} while (0);
#endif
194 changes: 0 additions & 194 deletions Firebase/Messaging/FIRMessagingRmq2PersistentStore.h
View file
Open in desktop

This file was deleted.

Loading