keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to CR.

Browse Source
pull/1/head
Matthew Chen 7 years ago
parent 6486b99415
commit 40ac0daa9a
4 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File

4
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
Unescape Escape View File

@ -505,10 +505,10 @@ NS_ASSUME_NONNULL_BEGIN
if (self.viewItem.interaction.interactionType == OWSInteractionType_OutgoingMessage) {
TSOutgoingMessage *outgoingMessage = (TSOutgoingMessage *)self.viewItem.interaction;
if (outgoingMessage.messageState == TSOutgoingMessageStateUnsent) {
if (outgoingMessage.messageState == TSOutgoingMessageStateFailed) {
[self.delegate didTapFailedOutgoingMessage:outgoingMessage];
return;
} else if (outgoingMessage.messageState == TSOutgoingMessageStateAttemptingOut) {
} else if (outgoingMessage.messageState == TSOutgoingMessageStateSending) {
// Ignore taps on outgoing messages being sent.
return;
}

7
Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift
Unescape Escape View File

@ -95,6 +95,7 @@ class MessageRecipientStatusUtils: NSObject {
// might be misleading.
guard let recipientState = outgoingMessage.recipientState(forRecipientId: recipientId) else {
owsFail("\(self.logTag) no message status for recipient: \(recipientId).")
let shortStatusMessage = NSLocalizedString("MESSAGE_STATUS_FAILED_SHORT", comment: "status message for failed messages")
let longStatusMessage = NSLocalizedString("MESSAGE_STATUS_FAILED", comment: "message footer for failed messages")
return (status:.failed, shortStatusMessage:shortStatusMessage, longStatusMessage:longStatusMessage)
@ -143,7 +144,7 @@ class MessageRecipientStatusUtils: NSObject {
return (status:.sent, shortStatusMessage:statusMessage, longStatusMessage:statusMessage)
case .skipped:
let statusMessage = NSLocalizedString("MESSAGE_STATUS_RECIPIENT_SKIPPED",
comment: "message status if message delivery to a recipient is skipped.")
comment: "message status if message delivery to a recipient is skipped. We skip delivering group messages to users who have left the group or deactivated their Signal account.")
return (status:.skipped, shortStatusMessage:statusMessage, longStatusMessage:statusMessage)
}
}
@ -176,7 +177,7 @@ class MessageRecipientStatusUtils: NSObject {
return NSLocalizedString("MESSAGE_STATUS_SENT",
comment: "message footer for sent messages")
default:
owsFail("Message has unexpected status: \(outgoingMessage.messageState).")
owsFail("\(self.logTag) Message has unexpected status: \(outgoingMessage.messageState).")
return NSLocalizedString("MESSAGE_STATUS_SENT",
comment: "message footer for sent messages")
}
@ -204,7 +205,7 @@ class MessageRecipientStatusUtils: NSObject {
return .sent
default:
owsFail("Message has unexpected status: \(outgoingMessage.messageState).")
owsFail("\(self.logTag) Message has unexpected status: \(outgoingMessage.messageState).")
return .sent
}

34
SignalMessaging/environment/migrations/OWS109OutgoingMessageState.m
Unescape Escape View File

@ -22,23 +22,29 @@ static NSString *const OWS109OutgoingMessageStateMigrationId = @"109";
{
OWSAssert(transaction);
NSMutableArray<TSOutgoingMessage *> *outgoingMessages = [NSMutableArray new];
[transaction enumerateKeysAndObjectsInCollection:TSOutgoingMessage.collection
usingBlock:^(NSString *key, id value, BOOL *stop) {
if (![value isKindOfClass:[TSOutgoingMessage class]]) {
return;
}
TSOutgoingMessage *outgoingMessage = (TSOutgoingMessage *)value;
[outgoingMessages addObject:outgoingMessage];
}];
DDLogInfo(@"Saving %zd outgoing messages.", outgoingMessages.count);
// Persist the migration of the outgoing message state.
// For performance, we want to upgrade all existing outgoing messages in
// a single transaction.
for (TSOutgoingMessage *outgoingMessage in outgoingMessages) {
[outgoingMessage saveWithTransaction:transaction];
NSMutableArray<NSString *> *messageIds =
[[transaction allKeysInCollection:TSOutgoingMessage.collection] mutableCopy];
DDLogInfo(@"%@ Migrating %zd outgoing messages.", self.logTag, messageIds.count);
while (messageIds.count > 0) {
const int kBatchSize = 1000;
@autoreleasepool {
for (int i = 0; i < kBatchSize; i++) {
if (messageIds.count == 0) {
break;
}
NSString *messageId = [messageIds lastObject];
[messageIds removeLastObject];
id message = [transaction objectForKey:messageId inCollection:TSOutgoingMessage.collection];
if (![message isKindOfClass:[TSOutgoingMessage class]]) {
return;
}
TSOutgoingMessage *outgoingMessage = (TSOutgoingMessage *)message;
[outgoingMessage saveWithTransaction:transaction];
}
}
}
}

7
SignalServiceKit/src/Messages/OWSMessageSender.m
Unescape Escape View File

@ -476,8 +476,6 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
[self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
for (NSString *recipientId in obsoleteRecipientIds) {
// Mark this recipient as "skipped".
//
// TODO: We should also mark as "skipped" group members who no longer have signal accounts.
[message updateWithSkippedRecipient:recipientId transaction:transaction];
}
}];
@ -703,6 +701,11 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
thread:(TSThread *)thread
{
[self.dbConnection asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
if (thread.isGroupThread) {
// Mark as "skipped" group members who no longer have signal accounts.
[message updateWithSkippedRecipient:recipient.recipientId transaction:transaction];
}
[recipient removeWithTransaction:transaction];
[[TSInfoMessage userNotRegisteredMessageInThread:thread]
saveWithTransaction:transaction];

Write Preview
Loading…
Cancel
Save