Remove the class FIRMessagingRmq2PersistentStore (#4045)

Author: charlotteliang

Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m

@@ -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"
@@ -53,12 +52,6 @@ - (NSString *)categoryForUpstreamMessages;
 
 @interface FIRMessagingRmqManager (ExposedForTest)
 
-@property(nonatomic, readwrite, strong) FIRMessagingRmq2PersistentStore *rmq2Store;
-
-@end
-
-@interface FIRMessagingRmq2PersistentStore (ExposedForTest)
-
 - (void)removeDatabase;
 
 @end
@@ -93,7 +86,7 @@ - (void)setUp {
 
 -(void)tearDown {
     if (_dataMessageManager.rmq2Manager) {
-        [_dataMessageManager.rmq2Manager.rmq2Store removeDatabase];
+        [_dataMessageManager.rmq2Manager removeDatabase];
     }
     [super tearDown];
 }

Example/Messaging/Tests/FIRMessagingRmqManagerTest.m

@@ -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;
 
@@ -53,7 +47,7 @@ - (void)setUp {
 }
 
 - (void)tearDown {
-  [self.rmqManager.rmq2Store removeDatabase];
+  [self.rmqManager removeDatabase];
   [super tearDown];
 }
 
@@ -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

Example/Messaging/Tests/FIRMessagingSyncMessageManagerTest.m

@@ -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"
@@ -27,12 +26,6 @@
 
 @interface FIRMessagingRmqManager (ExposedForTest)
 
-@property(nonatomic, readwrite, strong) FIRMessagingRmq2PersistentStore *rmq2Store;
-
-@end
-
-@interface FIRMessagingRmq2PersistentStore (ExposedForTest)
-
 - (void)removeDatabase;
 
 @end
@@ -54,7 +47,7 @@ - (void)setUp {
 }
 
 - (void)tearDown {
-  [self.rmqManager.rmq2Store removeDatabase];
+  [self.rmqManager removeDatabase];
   [super tearDown];
 }
 

Firebase/Messaging/FIRMMessageCode.h

@@ -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

Firebase/Messaging/FIRMessagingConnection.m

@@ -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,