Skip to content

Commit b8af9b1

Browse files
committed
[MOB-10364] Update according to new discussiom
1 parent 4555627 commit b8af9b1

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

swift-sdk.xcodeproj/xcshareddata/xcschemes/swift-sdk.xcscheme

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
</BuildAction>
8181
<TestAction
8282
buildConfiguration = "Debug"
83-
selectedDebuggerIdentifier = ""
84-
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
83+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
84+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
8585
shouldUseLaunchSchemeArgsEnv = "YES"
8686
codeCoverageEnabled = "YES"
8787
onlyGenerateCoverageForSpecifiedTargets = "YES">

swift-sdk/Internal/in-app/InAppManager+Functions.swift

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ struct MessagesProcessor {
3030
case let .skip(message):
3131
updateMessage(message, didProcessTrigger: true)
3232
return processMessages()
33+
case let .skipAndConsume(message):
34+
updateMessage(message, didProcessTrigger: true, consumed: true)
35+
return processMessages()
3336
case .none, .wait:
3437
return .noShow(messagesMap: messagesMap)
3538
}
@@ -38,6 +41,7 @@ struct MessagesProcessor {
3841
private enum ProcessNextMessageResult {
3942
case show(IterableInAppMessage)
4043
case skip(IterableInAppMessage)
44+
case skipAndConsume(IterableInAppMessage)
4145
case none
4246
case wait
4347
}
@@ -59,7 +63,11 @@ struct MessagesProcessor {
5963

6064
ITBDebug("isOkToShowNow")
6165

62-
if inAppDelegate.onNew(message: message) == .show {
66+
let returnValue = inAppDelegate.onNew(message: message)
67+
if message.isJsonOnly {
68+
return .skipAndConsume(message)
69+
}
70+
if returnValue == .show {
6371
ITBDebug("delegate returned show")
6472
return .show(message)
6573
} else {

swift-sdk/Internal/in-app/InAppManager.swift

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -317,15 +317,6 @@ class InAppManager: NSObject, IterableInternalInAppManagerProtocol {
317317
ITBInfo()
318318

319319
if message.isJsonOnly {
320-
// JSON Only messages do not need to be shown
321-
updateMessage(message, didProcessTrigger: true, consumed: consume)
322-
if consume {
323-
DispatchQueue.main.async {
324-
self.requestHandler?.inAppConsume(message.messageId,
325-
onSuccess: nil,
326-
onFailure: nil)
327-
}
328-
}
329320
return
330321
}
331322

0 commit comments

Comments
 (0)