mirror of https://github.com/oxen-io/session-ios
Merge pull request #362 from oxen-io/data-extraction-notifications
Data Extraction Notificationspull/363/head
Niels Andriesse
5 years ago
committed by
GitHub
commit
6d179bf918
@ -0,0 +1,106 @@
|
||||
import SessionUtilitiesKit
|
||||
|
||||
public final class DataExtractionNotification : ControlMessage {
|
||||
public var kind: Kind?
|
||||
|
||||
// MARK: Kind
|
||||
public enum Kind : CustomStringConvertible {
|
||||
case screenshot
|
||||
case mediaSaved(timestamp: UInt64)
|
||||
|
||||
public var description: String {
|
||||
switch self {
|
||||
case .screenshot: return "screenshot"
|
||||
case .mediaSaved: return "mediaSaved"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: Initialization
|
||||
public override init() { super.init() }
|
||||
|
||||
internal init(kind: Kind) {
|
||||
super.init()
|
||||
self.kind = kind
|
||||
}
|
||||
|
||||
// MARK: Validation
|
||||
public override var isValid: Bool {
|
||||
guard super.isValid, let kind = kind else { return false }
|
||||
switch kind {
|
||||
case .screenshot: return true
|
||||
case .mediaSaved(let timestamp): return timestamp > 0
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: Coding
|
||||
public required init?(coder: NSCoder) {
|
||||
super.init(coder: coder)
|
||||
guard let rawKind = coder.decodeObject(forKey: "kind") as? String else { return nil }
|
||||
switch rawKind {
|
||||
case "screenshot":
|
||||
self.kind = .screenshot
|
||||
case "mediaSaved":
|
||||
guard let timestamp = coder.decodeObject(forKey: "timestamp") as? UInt64 else { return nil }
|
||||
self.kind = .mediaSaved(timestamp: timestamp)
|
||||
default: return nil
|
||||
}
|
||||
}
|
||||
|
||||
public override func encode(with coder: NSCoder) {
|
||||
super.encode(with: coder)
|
||||
guard let kind = kind else { return }
|
||||
switch kind {
|
||||
case .screenshot:
|
||||
coder.encode("screenshot", forKey: "kind")
|
||||
case .mediaSaved(let timestamp):
|
||||
coder.encode("mediaSaved", forKey: "kind")
|
||||
coder.encode(timestamp, forKey: "timestamp")
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: Proto Conversion
|
||||
public override class func fromProto(_ proto: SNProtoContent) -> DataExtractionNotification? {
|
||||
guard let dataExtractionNotification = proto.dataExtractionNotification else { return nil }
|
||||
let kind: Kind
|
||||
switch dataExtractionNotification.type {
|
||||
case .screenshot: kind = .screenshot
|
||||
case .mediaSaved:
|
||||
let timestamp = dataExtractionNotification.hasTimestamp ? dataExtractionNotification.timestamp : 0
|
||||
kind = .mediaSaved(timestamp: timestamp)
|
||||
}
|
||||
return DataExtractionNotification(kind: kind)
|
||||
}
|
||||
|
||||
public override func toProto(using transaction: YapDatabaseReadWriteTransaction) -> SNProtoContent? {
|
||||
guard let kind = kind else {
|
||||
SNLog("Couldn't construct data extraction notification proto from: \(self).")
|
||||
return nil
|
||||
}
|
||||
do {
|
||||
let dataExtractionNotification: SNProtoDataExtractionNotification.SNProtoDataExtractionNotificationBuilder
|
||||
switch kind {
|
||||
case .screenshot:
|
||||
dataExtractionNotification = SNProtoDataExtractionNotification.builder(type: .screenshot)
|
||||
case .mediaSaved(let timestamp):
|
||||
dataExtractionNotification = SNProtoDataExtractionNotification.builder(type: .mediaSaved)
|
||||
dataExtractionNotification.setTimestamp(timestamp)
|
||||
}
|
||||
let contentProto = SNProtoContent.builder()
|
||||
contentProto.setDataExtractionNotification(try dataExtractionNotification.build())
|
||||
return try contentProto.build()
|
||||
} catch {
|
||||
SNLog("Couldn't construct data extraction notification proto from: \(self).")
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: Description
|
||||
public override var description: String {
|
||||
"""
|
||||
DataExtractionNotification(
|
||||
kind: \(kind?.description ?? "null")
|
||||
)
|
||||
"""
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,29 @@
|
||||
|
||||
@objc(SNDataExtractionNotificationInfoMessage)
|
||||
final class DataExtractionNotificationInfoMessage : TSInfoMessage {
|
||||
|
||||
init(type: TSInfoMessageType, sentTimestamp: UInt64, thread: TSThread, referencedAttachmentTimestamp: UInt64?) {
|
||||
super.init(timestamp: sentTimestamp, in: thread, messageType: type)
|
||||
}
|
||||
|
||||
required init(coder: NSCoder) {
|
||||
super.init(coder: coder)
|
||||
}
|
||||
|
||||
required init(dictionary dictionaryValue: [String:Any]!) throws {
|
||||
try super.init(dictionary: dictionaryValue)
|
||||
}
|
||||
|
||||
override func previewText(with transaction: YapDatabaseReadTransaction) -> String {
|
||||
guard let thread = thread as? TSContactThread else { return "" } // Should never occur
|
||||
let sessionID = thread.contactIdentifier()
|
||||
let displayName = Storage.shared.getContact(with: sessionID)?.displayName(for: .regular) ?? sessionID
|
||||
switch messageType {
|
||||
case .screenshotNotification: return "\(displayName) took a screenshot."
|
||||
case .mediaSavedNotification:
|
||||
// TODO: Use referencedAttachmentTimestamp to tell the user * which * media was saved
|
||||
return "Media saved by \(displayName)."
|
||||
default: preconditionFailure()
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue