Skip to content

chore: pin the KMP submodule and update #1733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nan-li wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: pin the KMP submodule and update #1733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OneSignal-KMP-SDK
Open in desktop
Submodule OneSignal-KMP-SDK updated 5 files
+11 −100 kmp/src/commonMain/kotlin/com/onesignal/logger/ILogFileStore.kt
+77 −142 kmp/src/commonMain/kotlin/com/onesignal/logger/crash/CrashRetention.kt
+14 −27 kmp/src/commonMain/kotlin/com/onesignal/logger/crash/LogCrashUploader.kt
+29 −0 kmp/src/commonTest/kotlin/com/onesignal/logger/LogCrashTest.kt
+261 −153 kmp/src/commonTest/kotlin/com/onesignal/logger/crash/CrashRetentionTest.kt
10 changes: 8 additions & 2 deletions iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/Logging/FileLogStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,10 @@ final class FileLogStore: ILogFileStore {
now: Int64,
minAgeMillis: Int64
) -> Bool {
guard let writtenMs = CrashRetention.shared.effectiveWriteTimeMs(entry: entry)?.int64Value else {
guard let writtenMs = CrashRetention.shared.effectiveWriteTimeMs(
entry: entry,
policy: Self.retentionPolicy
)?.int64Value else {
return false
}
return now - writtenMs >= max(0, minAgeMillis)
Expand Down Expand Up @@ -272,16 +275,19 @@ final class FileLogStore: ILogFileStore {
guard let entries = try? directoryEntries() else {
return
}
// The guard and the selector must see the same names, or they stop measuring the same directory.
let keepNames = snapshotInFlightNames().union([keepName])
guard !CrashRetention.shared.isWithinCaps(
entries: entries,
keepNames: keepNames,
policy: Self.retentionPolicy
) else {
return
}
let overflow = CrashRetention.shared.selectOverflowOwned(
entries: entries,
nowMs: Self.nowMillis(),
keepNames: snapshotInFlightNames().union([keepName]),
keepNames: keepNames,
policy: Self.retentionPolicy
)
for entry in overflow {
Expand Down
Loading