Page MenuHomePhabricator
Files F3521466

D13323.id44219.diff
No OneTemporary
Actions

D13323.id44219.diff
View Options

diff --git a/lib/reducers/message-reducer.js b/lib/reducers/message-reducer.js
--- a/lib/reducers/message-reducer.js
+++ b/lib/reducers/message-reducer.js
@@ -1873,7 +1873,7 @@
rawMessageInfos,
updateInfos,
outboundP2PMessages,
- messageIDWithoutAutoRetry,
+ composableMessageID,
} = action.payload;
if (rawMessageInfos.length === 0 && updateInfos.length === 0) {
return { messageStoreOperations: [], messageStore };
@@ -1894,22 +1894,19 @@
);
if (
- !messageIDWithoutAutoRetry ||
+ !composableMessageID ||
!outboundP2PMessages ||
outboundP2PMessages.length === 0
) {
return { messageStoreOperations, messageStore: newMessageStore };
}
-
- const newMessageID: string = messageIDWithoutAutoRetry;
-
// Messages to other peers that can be retried from UI,
// we need to track statuses of each one.
const outboundP2PMessageIDs = outboundP2PMessages.map(msg => msg.messageID);
const localOperation: ReplaceMessageStoreLocalMessageInfoOperation = {
type: 'replace_local_message_info',
payload: {
- id: newMessageID,
+ id: composableMessageID,
localMessageInfo: {
sendFailed: false,
outboundP2PMessageIDs,
diff --git a/lib/shared/dm-ops/process-dm-ops.js b/lib/shared/dm-ops/process-dm-ops.js
--- a/lib/shared/dm-ops/process-dm-ops.js
+++ b/lib/shared/dm-ops/process-dm-ops.js
@@ -102,13 +102,13 @@
dispatchMetadata = dmOperationSpecification.metadata;
}
- let messageIDWithoutAutoRetry: ?string = null;
+ let composableMessageID: ?string = null;
if (
dmOperationSpecification.type ===
dmOperationSpecificationTypes.OUTBOUND &&
!dmOpSpecs[dmOp.type].supportsAutoRetry
) {
- messageIDWithoutAutoRetry = dmOp.messageID;
+ composableMessageID = dmOp.messageID;
}
if (
@@ -127,7 +127,7 @@
rawMessageInfos: [],
updateInfos: [],
outboundP2PMessages,
- messageIDWithoutAutoRetry,
+ composableMessageID,
notificationsCreationData,
},
},
@@ -285,7 +285,7 @@
rawMessageInfos,
updateInfos,
outboundP2PMessages,
- messageIDWithoutAutoRetry,
+ composableMessageID,
notificationsCreationData,
},
},
diff --git a/lib/types/dm-ops.js b/lib/types/dm-ops.js
--- a/lib/types/dm-ops.js
+++ b/lib/types/dm-ops.js
@@ -414,7 +414,7 @@
// For messages that could be retried from UI, we need to bind DM `messageID`
// with `outboundP2PMessages` to keep track of whether all P2P messages
// were queued on Tunnelbroker.
- +messageIDWithoutAutoRetry: ?string,
+ +composableMessageID: ?string,
+notificationsCreationData: ?NotificationsCreationData,
};

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 24, 3:40 AM (15 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2696902
Default Alt Text
D13323.id44219.diff (2 KB)

Event Timeline