From 4ced970ddefca65ce7445c3389599a7fa28b5b6f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 18 Apr 2019 14:57:14 -0400 Subject: [PATCH] Sketch out installed sticker classes. --- .../src/Messages/Stickers/InstalledStickers.swift | 12 +++++++++--- .../src/Messages/Stickers/MessageSticker.swift | 3 +-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/SignalServiceKit/src/Messages/Stickers/InstalledStickers.swift b/SignalServiceKit/src/Messages/Stickers/InstalledStickers.swift index 037428ed7d..cb59b09572 100644 --- a/SignalServiceKit/src/Messages/Stickers/InstalledStickers.swift +++ b/SignalServiceKit/src/Messages/Stickers/InstalledStickers.swift @@ -19,10 +19,14 @@ public class InstalledStickers: NSObject { return operationQueue }() - private override init() {} + private override init() { + // TODO: Resume sticker and sticker pack downloads when app is ready. + } // MARK: - Paths + // TODO: Clean up sticker data on orphan data cleaner. + // TODO: Clean up sticker data if user deletes all user data. @objc public class func cacheDirUrl() -> URL { var url = URL(fileURLWithPath: OWSFileSystem.appSharedDataDirectoryPath()) @@ -137,11 +141,13 @@ public class InstalledStickers: NSObject { assert(packId.count > 0) assert(packKey.count > 0) + // TODO: Mark sticker pack as downloading in kv store. + let operation = DownloadStickerPackOperation(packId: packId, packKey: packKey, success: { (_) in - // TODO: -// self.installSticker(packId: packId, packKey: packKey, stickerId: stickerId, stickerData: stickerData) + // TODO: Mark sticker pack as downloaded in kv store. + // TODO: Enqueue all stickers in pack for download. }, failure: { (_) in // Do nothing. diff --git a/SignalServiceKit/src/Messages/Stickers/MessageSticker.swift b/SignalServiceKit/src/Messages/Stickers/MessageSticker.swift index 69250ca265..5626bb7f10 100644 --- a/SignalServiceKit/src/Messages/Stickers/MessageSticker.swift +++ b/SignalServiceKit/src/Messages/Stickers/MessageSticker.swift @@ -27,8 +27,7 @@ public class MessageStickerDraft: NSObject { @objc public class MessageSticker: MTLModel { // MTLModel requires default values. - @objc - public var stickerMetadata = StickerMetadata.defaultValue + private var stickerMetadata = StickerMetadata.defaultValue // MTLModel requires default values. @objc