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

beef up notifications DebugUI

This commit is contained in:
Michael Kirk 2019-01-17 17:35:45 -07:00
parent 11afc967d2
commit c01284f848
2 changed files with 136 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

197
Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift
View File

@ -5,6 +5,7 @@
import Foundation
import SignalServiceKit
import SignalMessaging
import PromiseKit
class DebugUINotifications: DebugUIPage {
@ -26,105 +27,177 @@ class DebugUINotifications: DebugUIPage {
return "Notifications"
}
override func section(thread aThread: TSThread?) -> OWSTableSection? {
guard let thread = aThread else {
override func section(thread: TSThread?) -> OWSTableSection? {
guard let thread = thread else {
owsFailDebug("Notifications must specify thread.")
return nil
}
var sectionItems = [
OWSTableItem(title: "Last Incoming Message") { [weak self] in
guard let strongSelf = self else {
return
}
Logger.info("scheduling notification for incoming message.")
strongSelf.delayedNotificationDispatch {
Logger.info("dispatching")
OWSPrimaryStorage.shared().newDatabaseConnection().read { (transaction) in
guard let viewTransaction = transaction.ext(TSMessageDatabaseViewExtensionName) as? YapDatabaseViewTransaction else {
owsFailDebug("unable to build view transaction")
return
}
guard let threadId = thread.uniqueId else {
owsFailDebug("thread had no uniqueId")
return
}
guard let incomingMessage = viewTransaction.lastObject(inGroup: threadId) as? TSIncomingMessage else {
owsFailDebug("last message was not an incoming message.")
return
}
Logger.info("notifying user of incoming message")
strongSelf.notificationsAdapter.notifyUser(for: incomingMessage, in: thread, contactsManager: strongSelf.contactsManager, transaction: transaction)
}
}
}
]
var sectionItems: [OWSTableItem] = []
if let contactThread = thread as? TSContactThread {
sectionItems += [
OWSTableItem(title: "All Notifications in Sequence") { [weak self] in
self?.notifyForEverythingInSequence(contactThread: contactThread).retainUntilComplete()
},
OWSTableItem(title: "Incoming Call") { [weak self] in
self?.notifyForIncomingCall(thread: contactThread).retainUntilComplete()
},
OWSTableItem(title: "Call Missed") { [weak self] in
guard let strongSelf = self else {
return
}
strongSelf.delayedNotificationDispatchWithFakeCall(thread: contactThread) { call in
strongSelf.notificationsAdapter.presentMissedCall(call, callerName: thread.name())
}
self?.notifyForMissedCall(thread: contactThread).retainUntilComplete()
},
OWSTableItem(title: "Call Rejected: New Safety Number") { [weak self] in
guard let strongSelf = self else {
return
}
strongSelf.delayedNotificationDispatchWithFakeCall(thread: contactThread) { call in
strongSelf.notificationsAdapter.presentMissedCallBecauseOfNewIdentity(call: call, callerName: thread.name())
}
self?.notifyForMissedCallBecauseOfNewIdentity(thread: contactThread).retainUntilComplete()
},
OWSTableItem(title: "Call Rejected: No Longer Verified") { [weak self] in
guard let strongSelf = self else {
return
}
strongSelf.delayedNotificationDispatchWithFakeCall(thread: contactThread) { call in
strongSelf.notificationsAdapter.presentMissedCallBecauseOfNoLongerVerifiedIdentity(call: call, callerName: thread.name())
}
self?.notifyForMissedCallBecauseOfNoLongerVerifiedIdentity(thread: contactThread).retainUntilComplete()
}
]
}
sectionItems += [
OWSTableItem(title: "Last Incoming Message") { [weak self] in
self?.notifyForIncomingMessage(thread: thread).retainUntilComplete()
},
OWSTableItem(title: "Notify For Error Message") { [weak self] in
self?.notifyForErrorMessage(thread: thread).retainUntilComplete()
},
OWSTableItem(title: "Notify For Threadless Error Message") { [weak self] in
self?.notifyUserForThreadlessErrorMessage().retainUntilComplete()
}
]
return OWSTableSection(title: "Notifications have delay: \(kNotificationDelay)s", items: sectionItems)
}
// MARK: Helpers
func readWrite(_ block: @escaping (YapDatabaseReadWriteTransaction) -> Void) {
OWSPrimaryStorage.shared().dbReadWriteConnection.readWrite(block)
}
// After enqueing the notification you may want to background the app or lock the screen before it triggers, so
// we give a little delay.
let kNotificationDelay: TimeInterval = 5
func delayedNotificationDispatch(block: @escaping () -> Void) {
func delayedNotificationDispatch(block: @escaping () -> Void) -> Guarantee<Void> {
Logger.info("delaying for \(kNotificationDelay) seconds")
// Notifications won't sound if the app is suspended.
let taskIdentifier = UIApplication.shared.beginBackgroundTask(expirationHandler: nil)
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + kNotificationDelay) {
block()
return after(seconds: kNotificationDelay).done {
block()
}.then {
after(seconds: 2.0)
}.done {
// We don't want to endBackgroundTask until *after* the notifications manager is done,
// but it dispatches async without a completion handler, so we just wait a while extra.
// This is fragile, but it's only for debug UI.
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 2.0) {
UIApplication.shared.endBackgroundTask(taskIdentifier)
UIApplication.shared.endBackgroundTask(taskIdentifier)
}
}
func delayedNotificationDispatchWithFakeCall(thread: TSContactThread, callBlock: @escaping (SignalCall) -> Void) -> Guarantee<Void> {
let call = SignalCall.incomingCall(localId: UUID(), remotePhoneNumber: thread.contactIdentifier(), signalingId: 0)
return delayedNotificationDispatch {
callBlock(call)
}
}
// MARK: Notification Methods
func notifyForEverythingInSequence(contactThread: TSContactThread) -> Guarantee<Void> {
let taskIdentifier = UIApplication.shared.beginBackgroundTask(expirationHandler: nil)
return firstly {
self.notifyForIncomingCall(thread: contactThread)
}.then {
self.notifyForMissedCall(thread: contactThread)
}.then {
self.notifyForMissedCallBecauseOfNewIdentity(thread: contactThread)
}.then {
self.notifyForMissedCallBecauseOfNoLongerVerifiedIdentity(thread: contactThread)
}.then {
self.notifyForIncomingMessage(thread: contactThread)
}.then {
self.notifyForErrorMessage(thread: contactThread)
}.then {
self.notifyUserForThreadlessErrorMessage()
}.done {
UIApplication.shared.endBackgroundTask(taskIdentifier)
}
}
func notifyForIncomingCall(thread: TSContactThread) -> Guarantee<Void> {
Logger.info("⚠️ will present notification after delay")
return delayedNotificationDispatchWithFakeCall(thread: thread) { call in
self.notificationsAdapter.presentIncomingCall(call, callerName: thread.name())
}
}
func notifyForMissedCall(thread: TSContactThread) -> Guarantee<Void> {
Logger.info("⚠️ will present notification after delay")
return delayedNotificationDispatchWithFakeCall(thread: thread) { call in
self.notificationsAdapter.presentMissedCall(call, callerName: thread.name())
}
}
func notifyForMissedCallBecauseOfNewIdentity(thread: TSContactThread) -> Guarantee<Void> {
Logger.info("⚠️ will present notification after delay")
return delayedNotificationDispatchWithFakeCall(thread: thread) { call in
self.notificationsAdapter.presentMissedCallBecauseOfNewIdentity(call: call, callerName: thread.name())
}
}
func notifyForMissedCallBecauseOfNoLongerVerifiedIdentity(thread: TSContactThread) -> Guarantee<Void> {
Logger.info("⚠️ will present notification after delay")
return delayedNotificationDispatchWithFakeCall(thread: thread) { call in
self.notificationsAdapter.presentMissedCallBecauseOfNoLongerVerifiedIdentity(call: call, callerName: thread.name())
}
}
func notifyForIncomingMessage(thread: TSThread) -> Guarantee<Void> {
Logger.info("⚠️ will present notification after delay")
return delayedNotificationDispatch {
self.readWrite { transaction in
let factory = IncomingMessageFactory()
factory.threadCreator = { _ in return thread }
let incomingMessage = factory.create(transaction: transaction)
self.notificationsAdapter.notifyUser(for: incomingMessage,
in: thread,
contactsManager: self.contactsManager,
transaction: transaction)
}
}
}
func delayedNotificationDispatchWithFakeCall(thread: TSContactThread, callBlock: @escaping (SignalCall) -> Void) {
let call = SignalCall.incomingCall(localId: UUID(), remotePhoneNumber: thread.contactIdentifier(), signalingId: 0)
func notifyForErrorMessage(thread: TSThread) -> Guarantee<Void> {
Logger.info("⚠️ will present notification after delay")
return delayedNotificationDispatch {
let errorMessage = TSErrorMessage(timestamp: NSDate.ows_millisecondTimeStamp(),
in: thread,
failedMessageType: TSErrorMessageType.invalidMessage)
delayedNotificationDispatch {
callBlock(call)
self.readWrite { transaction in
self.notificationsAdapter.notifyUser(for: errorMessage, thread: thread, transaction: transaction)
}
}
}
func notifyUserForThreadlessErrorMessage() -> Guarantee<Void> {
Logger.info("⚠️ will present notification after delay")
return delayedNotificationDispatch {
self.readWrite { transaction in
let errorMessage = TSErrorMessage.corruptedMessageInUnknownThread()
self.notificationsAdapter.notifyUser(forThreadlessErrorMessage: errorMessage,
transaction: transaction)
}
}
}
}

2
SignalServiceKit/src/TestUtils/Factories.swift
View File

@ -235,7 +235,7 @@ public class OutgoingMessageFactory: NSObject, Factory {
}
@objc
class IncomingMessageFactory: NSObject, Factory {
public class IncomingMessageFactory: NSObject, Factory {
// MARK: Factory