mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
Merge branch 'dev' into shared-sender-keys
This commit is contained in:
commit
5c8b0b903f
7 changed files with 36 additions and 27 deletions
|
@ -195,7 +195,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
timestampLabelText
|
||||
= NSLocalizedString(@"MESSAGE_STATUS_SEND_FAILED", @"Label indicating that a message failed to send.");
|
||||
} else {
|
||||
timestampLabelText = [DateUtil formatMessageTimestamp:viewItem.interaction.timestamp];
|
||||
timestampLabelText = [DateUtil formatMessageTimestamp:viewItem.interaction.timestampForUI];
|
||||
}
|
||||
|
||||
TSMessage *message = [viewItem.interaction as:TSMessage.class];
|
||||
|
|
|
@ -4683,7 +4683,7 @@ typedef enum : NSUInteger {
|
|||
OWSAssertDebug(left <= mid);
|
||||
OWSAssertDebug(mid < right);
|
||||
id<ConversationViewItem> viewItem = self.viewItems[mid];
|
||||
if (viewItem.interaction.timestamp >= viewHorizonTimestamp) {
|
||||
if (viewItem.interaction.timestampForUI >= viewHorizonTimestamp) {
|
||||
right = mid;
|
||||
} else {
|
||||
// This is an optimization; it also ensures that we converge.
|
||||
|
@ -4692,7 +4692,7 @@ typedef enum : NSUInteger {
|
|||
}
|
||||
OWSAssertDebug(left == right);
|
||||
id<ConversationViewItem> viewItem = self.viewItems[left];
|
||||
if (viewItem.interaction.timestamp >= viewHorizonTimestamp) {
|
||||
if (viewItem.interaction.timestampForUI >= viewHorizonTimestamp) {
|
||||
OWSLogInfo(@"firstIndexPathAtViewHorizonTimestamp: %zd / %zd", left, self.viewItems.count);
|
||||
return [NSIndexPath indexPathForRow:(NSInteger) left inSection:0];
|
||||
} else {
|
||||
|
@ -5402,7 +5402,7 @@ typedef enum : NSUInteger {
|
|||
__block TSInteraction *targetInteraction;
|
||||
[LKStorage writeSyncWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
|
||||
[self.thread enumerateInteractionsWithTransaction:transaction usingBlock:^(TSInteraction *interaction, YapDatabaseReadTransaction *t) {
|
||||
if (interaction.timestamp == timestamp.unsignedLongLongValue) {
|
||||
if (interaction.timestampForUI == timestamp.unsignedLongLongValue) {
|
||||
targetInteraction = interaction;
|
||||
}
|
||||
}];
|
||||
|
@ -5426,7 +5426,7 @@ typedef enum : NSUInteger {
|
|||
{
|
||||
__block TSInteraction *targetInteraction;
|
||||
[self.thread enumerateInteractionsUsingBlock:^(TSInteraction *interaction) {
|
||||
if (interaction.timestamp == timestamp.unsignedLongLongValue) {
|
||||
if (interaction.timestampForUI == timestamp.unsignedLongLongValue) {
|
||||
targetInteraction = interaction;
|
||||
}
|
||||
}];
|
||||
|
|
|
@ -1350,7 +1350,7 @@ static const int kYapDatabaseRangeMaxLength = 25000;
|
|||
break;
|
||||
}
|
||||
|
||||
uint64_t viewItemTimestamp = viewItem.interaction.timestamp;
|
||||
uint64_t viewItemTimestamp = viewItem.interaction.timestampForUI;
|
||||
OWSAssertDebug(viewItemTimestamp > 0);
|
||||
|
||||
BOOL shouldShowDate = NO;
|
||||
|
@ -1417,7 +1417,7 @@ static const int kYapDatabaseRangeMaxLength = 25000;
|
|||
NSAttributedString *_Nullable senderName = nil;
|
||||
|
||||
OWSInteractionType interactionType = viewItem.interaction.interactionType;
|
||||
NSString *timestampText = [DateUtil formatTimestampShort:viewItem.interaction.timestamp];
|
||||
NSString *timestampText = [DateUtil formatTimestampShort:viewItem.interaction.timestampForUI];
|
||||
|
||||
if (interactionType == OWSInteractionType_OutgoingMessage) {
|
||||
TSOutgoingMessage *outgoingMessage = (TSOutgoingMessage *)viewItem.interaction;
|
||||
|
|
|
@ -6,11 +6,6 @@ public enum OnionRequestAPI {
|
|||
public static var guardSnodes: Set<Snode> = []
|
||||
public static var paths: [Path] = [] // Not a set to ensure we consistently show the same path to the user
|
||||
|
||||
private static var snodePool: Set<Snode> {
|
||||
let unreliableSnodes = Set(SnodeAPI.snodeFailureCount.keys)
|
||||
return SnodeAPI.snodePool.subtracting(unreliableSnodes)
|
||||
}
|
||||
|
||||
// MARK: Settings
|
||||
/// The number of snodes (including the guard snode) in a path.
|
||||
private static let pathSize: UInt = 3
|
||||
|
@ -84,7 +79,7 @@ public enum OnionRequestAPI {
|
|||
} else {
|
||||
print("[Loki] [Onion Request API] Populating guard snode cache.")
|
||||
return SnodeAPI.getRandomSnode().then2 { _ -> Promise<Set<Snode>> in // Just used to populate the snode pool
|
||||
var unusedSnodes = snodePool // Sync on LokiAPI.workQueue
|
||||
var unusedSnodes = SnodeAPI.snodePool // Sync on LokiAPI.workQueue
|
||||
guard unusedSnodes.count >= guardSnodeCount else { throw Error.insufficientSnodes }
|
||||
func getGuardSnode() -> Promise<Snode> {
|
||||
// randomElement() uses the system's default random generator, which is cryptographically secure
|
||||
|
@ -115,7 +110,7 @@ public enum OnionRequestAPI {
|
|||
}
|
||||
return SnodeAPI.getRandomSnode().then2 { _ -> Promise<[Path]> in // Just used to populate the snode pool
|
||||
return getGuardSnodes().map2 { guardSnodes -> [Path] in
|
||||
var unusedSnodes = snodePool.subtracting(guardSnodes)
|
||||
var unusedSnodes = SnodeAPI.snodePool.subtracting(guardSnodes)
|
||||
let pathSnodeCount = guardSnodeCount * pathSize - guardSnodeCount
|
||||
guard unusedSnodes.count >= pathSnodeCount else { throw Error.insufficientSnodes }
|
||||
// Don't test path snodes as this would reveal the user's IP to them
|
||||
|
@ -338,7 +333,13 @@ public enum OnionRequestAPI {
|
|||
}
|
||||
}
|
||||
promise.catch2 { error in // Must be invoked on LokiAPI.workQueue
|
||||
guard case HTTP.Error.httpRequestFailed(_, _) = error else { return }
|
||||
guard case HTTP.Error.httpRequestFailed(let statusCode, let json) = error else { return }
|
||||
// Marking all the snodes in the path as unreliable here is aggressive, but otherwise users
|
||||
// can get stuck with a failing path that just refreshes to the same path.
|
||||
let path = paths.first { $0.contains(guardSnode) }
|
||||
path?.forEach { snode in
|
||||
SnodeAPI.handleError(withStatusCode: statusCode, json: json, forSnode: snode) // Intentionally don't throw
|
||||
}
|
||||
dropAllPaths() // A snode in the path is bad; retry with a different path
|
||||
dropGuardSnode(guardSnode)
|
||||
}
|
||||
|
|
|
@ -15,10 +15,10 @@ public final class SnodeAPI : NSObject {
|
|||
|
||||
// MARK: Settings
|
||||
private static let maxRetryCount: UInt = 4
|
||||
private static let minimumSnodePoolCount = 32
|
||||
private static let minimumSnodePoolCount = 64
|
||||
private static let minimumSwarmSnodeCount = 2
|
||||
private static let seedNodePool: Set<String> = [ "https://storage.seed1.loki.network", "https://storage.seed3.loki.network", "https://public.loki.foundation" ]
|
||||
private static let snodeFailureThreshold = 2
|
||||
private static let snodeFailureThreshold = 1
|
||||
private static let targetSwarmSnodeCount = 2
|
||||
|
||||
internal static var powDifficulty: UInt = 1
|
||||
|
@ -296,7 +296,7 @@ public final class SnodeAPI : NSObject {
|
|||
|
||||
// MARK: Error Handling
|
||||
/// - Note: Should only be invoked from `LokiAPI.workQueue` to avoid race conditions.
|
||||
internal static func handleError(withStatusCode statusCode: UInt, json: JSON?, forSnode snode: Snode, associatedWith publicKey: String) -> Error? {
|
||||
internal static func handleError(withStatusCode statusCode: UInt, json: JSON?, forSnode snode: Snode, associatedWith publicKey: String? = nil) -> Error? {
|
||||
#if DEBUG
|
||||
assertOnQueue(SnodeAPI.workQueue)
|
||||
#endif
|
||||
|
@ -307,8 +307,11 @@ public final class SnodeAPI : NSObject {
|
|||
print("[Loki] Couldn't reach snode at: \(snode); setting failure count to \(newFailureCount).")
|
||||
if newFailureCount >= SnodeAPI.snodeFailureThreshold {
|
||||
print("[Loki] Failure threshold reached for: \(snode); dropping it.")
|
||||
if let publicKey = publicKey {
|
||||
SnodeAPI.dropSnodeFromSwarmIfNeeded(snode, publicKey: publicKey)
|
||||
}
|
||||
SnodeAPI.dropSnodeFromSnodePool(snode)
|
||||
print("[Loki] Snode pool count: \(snodePool.count).")
|
||||
SnodeAPI.snodeFailureCount[snode] = 0
|
||||
}
|
||||
}
|
||||
|
@ -321,8 +324,12 @@ public final class SnodeAPI : NSObject {
|
|||
return SnodeAPI.SnodeAPIError.clockOutOfSync
|
||||
case 421:
|
||||
// The snode isn't associated with the given public key anymore
|
||||
if let publicKey = publicKey {
|
||||
print("[Loki] Invalidating swarm for: \(publicKey).")
|
||||
SnodeAPI.dropSnodeFromSwarmIfNeeded(snode, publicKey: publicKey)
|
||||
} else {
|
||||
print("[Loki] Got a 421 without an associated public key.")
|
||||
}
|
||||
case 432:
|
||||
// The proof of work difficulty is too low
|
||||
if let powDifficulty = json?["difficulty"] as? UInt {
|
||||
|
|
|
@ -39,11 +39,14 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value);
|
|||
@property (nonatomic, readonly) uint64_t timestamp;
|
||||
@property (nonatomic, readonly) uint64_t sortId;
|
||||
@property (nonatomic, readonly) uint64_t receivedAtTimestamp;
|
||||
@property (nonatomic, readonly) BOOL shouldUseServerTime;
|
||||
/// Used for public chats where a message sent from a slave device is interpreted as having been sent from the master device.
|
||||
@property (nonatomic) NSString *actualSenderHexEncodedPublicKey;
|
||||
|
||||
- (void)setServerTimestampToReceivedTimestamp:(uint64_t)receivedAtTimestamp;
|
||||
|
||||
- (uint64_t)timestampForUI;
|
||||
|
||||
- (NSDate *)receivedAtDate;
|
||||
|
||||
- (OWSInteractionType)interactionType;
|
||||
|
|
|
@ -177,14 +177,11 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value)
|
|||
|
||||
#pragma mark Date operations
|
||||
|
||||
- (uint64_t)timestamp
|
||||
- (uint64_t)timestampForUI
|
||||
{
|
||||
if (self.thread.isGroupThread) {
|
||||
TSGroupThread *thread = (TSGroupThread *)self.thread;
|
||||
if (thread.isPublicChat) {
|
||||
if (_shouldUseServerTime) {
|
||||
return _receivedAtTimestamp;
|
||||
}
|
||||
}
|
||||
return _timestamp;
|
||||
}
|
||||
|
||||
|
@ -195,6 +192,7 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value)
|
|||
|
||||
- (void)setServerTimestampToReceivedTimestamp:(uint64_t)receivedAtTimestamp
|
||||
{
|
||||
_shouldUseServerTime = YES;
|
||||
_receivedAtTimestamp = receivedAtTimestamp;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue