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

Clean

Browse Source
pull/101/head
Niels Andriesse 5 years ago
parent 067a31bb79
commit f3a77222ab
7 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File

6
Signal/Signal-Info.plist
Unescape Escape View File

@ -5,15 +5,11 @@
<key>BuildDetails</key> <key>BuildDetails</key>
<dict> <dict>
<key>CarthageVersion</key> <key>CarthageVersion</key>
<string>0.33.0</string> <string>0.34.0</string>
<key>DateTime</key>
<string>Tue Feb 11 02:41:14 UTC 2020</string>
<key>OSXVersion</key> <key>OSXVersion</key>
<string>10.15.3</string> <string>10.15.3</string>
<key>WebRTCCommit</key> <key>WebRTCCommit</key>
<string>1445d719bf05280270e9f77576f80f973fd847f8 M73</string> <string>1445d719bf05280270e9f77576f80f973fd847f8 M73</string>
<key>XCodeVersion</key>
<string>1100.1130</string>
</dict> </dict>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>en</string> <string>en</string>

2
SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift
Unescape Escape View File

@ -137,6 +137,8 @@ internal extension Promise {
LokiAPI.randomSnodePool.remove(target) // Remove it from the random snode pool LokiAPI.randomSnodePool.remove(target) // Remove it from the random snode pool
LokiAPI.failureCount[target] = 0 LokiAPI.failureCount[target] = 0
} }
case 406:
break // TODO: Handle clock out of sync
case 421: case 421:
// The snode isn't associated with the given public key anymore // The snode isn't associated with the given public key anymore
print("[Loki] Invalidating swarm for: \(hexEncodedPublicKey).") print("[Loki] Invalidating swarm for: \(hexEncodedPublicKey).")

12
SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatAPI.swift
Unescape Escape View File

@ -97,11 +97,11 @@ public final class LokiPublicChatAPI : LokiDotNetAPI {
print("[Loki] Couldn't parse message for public chat channel with ID: \(channel) on server: \(server) from: \(message).") print("[Loki] Couldn't parse message for public chat channel with ID: \(channel) on server: \(server) from: \(message).")
return nil return nil
} }
var avatar: LokiPublicChatMessage.Avatar? = nil var profilePicture: LokiPublicChatMessage.ProfilePicture? = nil
let displayName = user["name"] as? String ?? NSLocalizedString("Anonymous", comment: "") let displayName = user["name"] as? String ?? NSLocalizedString("Anonymous", comment: "")
if let userAnnotations = user["annotations"] as? [JSON], let avatarAnnotation = userAnnotations.first(where: { $0["type"] as? String == profilePictureType }), if let userAnnotations = user["annotations"] as? [JSON], let profilePictureAnnotation = userAnnotations.first(where: { $0["type"] as? String == profilePictureType }),
let avatarValue = avatarAnnotation["value"] as? JSON, let profileKeyString = avatarValue["profileKey"] as? String, let profileKey = Data(base64Encoded: profileKeyString), let url = avatarValue["url"] as? String { let profilePictureValue = profilePictureAnnotation["value"] as? JSON, let profileKeyString = profilePictureValue["profileKey"] as? String, let profileKey = Data(base64Encoded: profileKeyString), let url = profilePictureValue["url"] as? String {
avatar = LokiPublicChatMessage.Avatar(profileKey: profileKey, url: url) profilePicture = LokiPublicChatMessage.ProfilePicture(profileKey: profileKey, url: url)
} }
let lastMessageServerID = getLastMessageServerID(for: channel, on: server) let lastMessageServerID = getLastMessageServerID(for: channel, on: server)
if serverID > (lastMessageServerID ?? 0) { setLastMessageServerID(for: channel, on: server, to: serverID) } if serverID > (lastMessageServerID ?? 0) { setLastMessageServerID(for: channel, on: server, to: serverID) }
@ -135,7 +135,7 @@ public final class LokiPublicChatAPI : LokiDotNetAPI {
return LokiPublicChatMessage.Attachment(kind: kind, server: server, serverID: serverID, contentType: contentType, size: size, fileName: fileName, flags: flags, return LokiPublicChatMessage.Attachment(kind: kind, server: server, serverID: serverID, contentType: contentType, size: size, fileName: fileName, flags: flags,
width: width, height: height, caption: caption, url: url, linkPreviewURL: linkPreviewURL, linkPreviewTitle: linkPreviewTitle) width: width, height: height, caption: caption, url: url, linkPreviewURL: linkPreviewURL, linkPreviewTitle: linkPreviewTitle)
} }
let result = LokiPublicChatMessage(serverID: serverID, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, avatar: avatar, let result = LokiPublicChatMessage(serverID: serverID, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, profilePicture: profilePicture,
body: body, type: publicChatMessageType, timestamp: timestamp, quote: quote, attachments: attachments, signature: signature) body: body, type: publicChatMessageType, timestamp: timestamp, quote: quote, attachments: attachments, signature: signature)
guard result.hasValidSignature() else { guard result.hasValidSignature() else {
print("[Loki] Ignoring public chat message with invalid signature.") print("[Loki] Ignoring public chat message with invalid signature.")
@ -173,7 +173,7 @@ public final class LokiPublicChatAPI : LokiDotNetAPI {
throw Error.parsingFailed throw Error.parsingFailed
} }
let timestamp = UInt64(date.timeIntervalSince1970) * 1000 let timestamp = UInt64(date.timeIntervalSince1970) * 1000
return LokiPublicChatMessage(serverID: serverID, hexEncodedPublicKey: userHexEncodedPublicKey, displayName: displayName, avatar: signedMessage.avatar, body: body, type: publicChatMessageType, timestamp: timestamp, quote: signedMessage.quote, attachments: signedMessage.attachments, signature: signedMessage.signature) return LokiPublicChatMessage(serverID: serverID, hexEncodedPublicKey: userHexEncodedPublicKey, displayName: displayName, profilePicture: signedMessage.profilePicture, body: body, type: publicChatMessageType, timestamp: timestamp, quote: signedMessage.quote, attachments: signedMessage.attachments, signature: signedMessage.signature)
} }
}.recover(on: DispatchQueue.global()) { error -> Promise<LokiPublicChatMessage> in }.recover(on: DispatchQueue.global()) { error -> Promise<LokiPublicChatMessage> in
if let error = error as? NetworkManagerError, error.statusCode == 401 { if let error = error as? NetworkManagerError, error.statusCode == 401 {

16
SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatMessage.swift
Unescape Escape View File

@ -5,7 +5,7 @@ public final class LokiPublicChatMessage : NSObject {
public let serverID: UInt64? public let serverID: UInt64?
public let hexEncodedPublicKey: String public let hexEncodedPublicKey: String
public let displayName: String public let displayName: String
public let avatar: Avatar? public let profilePicture: ProfilePicture?
public let body: String public let body: String
/// - Note: Expressed as milliseconds since 00:00:00 UTC on 1 January 1970. /// - Note: Expressed as milliseconds since 00:00:00 UTC on 1 January 1970.
public let timestamp: UInt64 public let timestamp: UInt64
@ -22,7 +22,7 @@ public final class LokiPublicChatMessage : NSObject {
private let attachmentType = "net.app.core.oembed" private let attachmentType = "net.app.core.oembed"
// MARK: Types // MARK: Types
public struct Avatar { public struct ProfilePicture {
public let profileKey: Data public let profileKey: Data
public let url: String public let url: String
} }
@ -72,11 +72,11 @@ public final class LokiPublicChatMessage : NSObject {
} }
// MARK: Initialization // MARK: Initialization
public init(serverID: UInt64?, hexEncodedPublicKey: String, displayName: String, avatar: Avatar?, body: String, type: String, timestamp: UInt64, quote: Quote?, attachments: [Attachment], signature: Signature?) { public init(serverID: UInt64?, hexEncodedPublicKey: String, displayName: String, profilePicture: ProfilePicture?, body: String, type: String, timestamp: UInt64, quote: Quote?, attachments: [Attachment], signature: Signature?) {
self.serverID = serverID self.serverID = serverID
self.hexEncodedPublicKey = hexEncodedPublicKey self.hexEncodedPublicKey = hexEncodedPublicKey
self.displayName = displayName self.displayName = displayName
self.avatar = avatar self.profilePicture = profilePicture
self.body = body self.body = body
self.type = type self.type = type
self.timestamp = timestamp self.timestamp = timestamp
@ -100,7 +100,7 @@ public final class LokiPublicChatMessage : NSObject {
} else { } else {
signature = nil signature = nil
} }
self.init(serverID: nil, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, avatar: nil, body: body, type: type, timestamp: timestamp, quote: quote, attachments: [], signature: signature) self.init(serverID: nil, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, profilePicture: nil, body: body, type: type, timestamp: timestamp, quote: quote, attachments: [], signature: signature)
} }
// MARK: Crypto // MARK: Crypto
@ -115,7 +115,7 @@ public final class LokiPublicChatMessage : NSObject {
return nil return nil
} }
let signature = Signature(data: signatureData, version: signatureVersion) let signature = Signature(data: signatureData, version: signatureVersion)
return LokiPublicChatMessage(serverID: serverID, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, avatar: avatar, body: body, type: type, timestamp: timestamp, quote: quote, attachments: attachments, signature: signature) return LokiPublicChatMessage(serverID: serverID, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, profilePicture: profilePicture, body: body, type: type, timestamp: timestamp, quote: quote, attachments: attachments, signature: signature)
} }
internal func hasValidSignature() -> Bool { internal func hasValidSignature() -> Bool {
@ -135,8 +135,8 @@ public final class LokiPublicChatMessage : NSObject {
value["sig"] = signature.data.toHexString() value["sig"] = signature.data.toHexString()
value["sigver"] = signature.version value["sigver"] = signature.version
} }
if let avatar = avatar { if let profilePicture = profilePicture {
value["avatar"] = avatar; value["avatar"] = profilePicture;
} }
let annotation: JSON = [ "type" : type, "value" : value ] let annotation: JSON = [ "type" : type, "value" : value ]
let attachmentAnnotations: [JSON] = attachments.map { attachment in let attachmentAnnotations: [JSON] = attachments.map { attachment in

14
SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift
Unescape Escape View File

@ -1,7 +1,5 @@
import PromiseKit import PromiseKit
// TODO: Move away from polling
@objc(LKPublicChatPoller) @objc(LKPublicChatPoller)
public final class LokiPublicChatPoller : NSObject { public final class LokiPublicChatPoller : NSObject {
private let publicChat: LokiPublicChat private let publicChat: LokiPublicChat
@ -129,9 +127,9 @@ public final class LokiPublicChatPoller : NSObject {
} }
let profile = SSKProtoDataMessageLokiProfile.builder() let profile = SSKProtoDataMessageLokiProfile.builder()
profile.setDisplayName(message.displayName) profile.setDisplayName(message.displayName)
if let avatar = message.avatar { if let profilePicture = message.profilePicture {
profile.setProfilePicture(avatar.url) profile.setProfilePicture(profilePicture.url)
dataMessage.setProfileKey(avatar.profileKey) dataMessage.setProfileKey(profilePicture.profileKey)
} }
dataMessage.setProfile(try! profile.build()) dataMessage.setProfile(try! profile.build())
dataMessage.setTimestamp(message.timestamp) dataMessage.setTimestamp(message.timestamp)
@ -170,12 +168,12 @@ public final class LokiPublicChatPoller : NSObject {
let messageServerID = message.serverID let messageServerID = message.serverID
SSKEnvironment.shared.messageManager.throws_processEnvelope(try! envelope.build(), plaintextData: try! content.build().serializedData(), wasReceivedByUD: false, transaction: transaction, serverID: messageServerID ?? 0) SSKEnvironment.shared.messageManager.throws_processEnvelope(try! envelope.build(), plaintextData: try! content.build().serializedData(), wasReceivedByUD: false, transaction: transaction, serverID: messageServerID ?? 0)
// If we got a message from our master device then we should use its profile picture // If we got a message from our master device then we should use its profile picture
if let avatar = message.avatar, masterHexEncodedPublicKey == message.hexEncodedPublicKey { if let profilePicture = message.profilePicture, masterHexEncodedPublicKey == message.hexEncodedPublicKey {
if (message.displayName.count > 0) { if (message.displayName.count > 0) {
SSKEnvironment.shared.profileManager.updateProfileForContact(withID: masterHexEncodedPublicKey!, displayName: message.displayName, with: transaction) SSKEnvironment.shared.profileManager.updateProfileForContact(withID: masterHexEncodedPublicKey!, displayName: message.displayName, with: transaction)
} }
SSKEnvironment.shared.profileManager.updateService(withProfileName: message.displayName, avatarUrl: avatar.url) SSKEnvironment.shared.profileManager.updateService(withProfileName: message.displayName, avatarUrl: profilePicture.url)
SSKEnvironment.shared.profileManager.setProfileKeyData(avatar.profileKey, forRecipientId: masterHexEncodedPublicKey!, avatarURL: avatar.url) SSKEnvironment.shared.profileManager.setProfileKeyData(profilePicture.profileKey, forRecipientId: masterHexEncodedPublicKey!, avatarURL: profilePicture.url)
} }
} }
} }

4
SignalServiceKit/src/Loki/Messaging/LKSessionRequestMessage.m
Unescape Escape View File

@ -10,9 +10,7 @@
expiresInSeconds:0 expireStartedAt:0 isVoiceMessage:NO groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:nil contactShare:nil linkPreview:nil]; expiresInSeconds:0 expireStartedAt:0 isVoiceMessage:NO groupMetaMessage:TSGroupMetaMessageUnspecified quotedMessage:nil contactShare:nil linkPreview:nil];
} }
- (BOOL)shouldBeSaved { - (BOOL)shouldBeSaved { return NO; }
return NO;
}
#pragma mark Building #pragma mark Building
- (nullable SSKProtoDataMessageBuilder *)dataMessageBuilder - (nullable SSKProtoDataMessageBuilder *)dataMessageBuilder

0
SignalServiceKit/src/Loki/API/LokiP2PAPI.swift → SignalServiceKit/src/Loki/Shelved/LokiP2PAPI.swift
Unescape Escape View File

Write Preview
Loading…
Cancel
Save