-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into sam/vpn-snooze-initial-support
* main: Update Xcode version to 15.4 (#912) Keep Remote Messages in database if they were shown (#911)
- Loading branch information
Showing
5 changed files
with
316 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 15.2 | ||
| 15.4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // | ||
| // RemoteMessageUtils.swift | ||
| // | ||
| // Copyright © 2024 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import CoreData | ||
|
|
||
| struct RemoteMessageUtils { | ||
| static func fetchRemoteMessage(with id: String, in context: NSManagedObjectContext) -> RemoteMessageManagedObject? { | ||
| let fetchRequest: NSFetchRequest<RemoteMessageManagedObject> = RemoteMessageManagedObject.fetchRequest() | ||
| fetchRequest.predicate = NSPredicate(format: "%K == %@", #keyPath(RemoteMessageManagedObject.id), id) | ||
| fetchRequest.fetchLimit = 1 | ||
|
|
||
| return try? context.fetch(fetchRequest).first | ||
| } | ||
|
|
||
| static func fetchScheduledRemoteMessage(in context: NSManagedObjectContext) -> RemoteMessageManagedObject? { | ||
| let fetchRequest: NSFetchRequest<RemoteMessageManagedObject> = RemoteMessageManagedObject.fetchRequest() | ||
| fetchRequest.predicate = NSPredicate( | ||
| format: "%K == %i", | ||
| #keyPath(RemoteMessageManagedObject.status), | ||
| RemoteMessagingStore.RemoteMessageStatus.scheduled.rawValue | ||
| ) | ||
| fetchRequest.fetchLimit = 1 | ||
|
|
||
| return try? context.fetch(fetchRequest).first | ||
| } | ||
|
|
||
| static func fetchAllRemoteMessages(in context: NSManagedObjectContext) -> [RemoteMessageManagedObject] { | ||
| let fetchRequest = RemoteMessageManagedObject.fetchRequest() | ||
| return (try? context.fetch(fetchRequest)) ?? [] | ||
| } | ||
| } |
Oops, something went wrong.