centralcloud/oncall-mobile-ios
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Poll topic right after adding it

Browse source
This commit is contained in:
Philipp Heckel 2022-05-20 15:56:57 -04:00
parent 3450fc291f
commit 3a0138b346
3 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ntfy/Persistence/Store.swift
View file

@ -52,11 +52,14 @@ class Store: ObservableObject {
.store(in: &cancellables)
}
func saveSubscription(baseUrl: String, topic: String) {
func saveSubscription(baseUrl: String, topic: String) -> Subscription {
let subscription = Subscription(context: context)
subscription.baseUrl = appBaseUrl
subscription.topic = topic
try? context.save()
DispatchQueue.main.sync {
try? context.save()
}
return subscription
}
func getSubscription(baseUrl: String, topic: String) -> Subscription? {

18
ntfy/Persistence/SubscriptionManager.swift
View file

@ -10,7 +10,23 @@ struct SubscriptionManager {
func subscribe(baseUrl: String, topic: String) {
Log.d(tag, "Subscribing to \(topicUrl(baseUrl: appBaseUrl, topic: topic))")
Messaging.messaging().subscribe(toTopic: topic)
store.saveSubscription(baseUrl: baseUrl, topic: topic)
let subscription = store.saveSubscription(baseUrl: baseUrl, topic: topic)
// FIXME: Duplicate code!
ApiService.shared.poll(subscription: subscription) { messages, error in
guard let messages = messages else {
Log.e(tag, "Polling failed", error)
return
}
Log.d(tag, "Polling success, \(messages.count) new message(s)", messages)
if !messages.isEmpty {
DispatchQueue.main.async {
for message in messages {
store.save(notificationFromMessage: message, withSubscription: subscription)
}
}
}
}
}
func unsubscribe(_ subscription: Subscription) {

12
ntfy/Views/SubscriptionAddView.swift
View file

@ -7,7 +7,7 @@ struct SubscriptionAddView: View {
@Environment(\.presentationMode) var presentationMode: Binding<PresentationMode>
@EnvironmentObject private var store: Store
@State private var topic: String = ""
private var subscriptionManager: SubscriptionManager {
return SubscriptionManager(store: store)
}
@ -29,22 +29,24 @@ struct SubscriptionAddView: View {
Button(action: subscribeAction) {
Text("Subscribe")
}
.disabled(!isTopicValid(topic: sanitizeTopic(topic: topic)))
.disabled(!isValid(topic: sanitize(topic: topic)))
}
}
}
}
private func sanitizeTopic(topic: String) -> String {
private func sanitize(topic: String) -> String {
return topic.trimmingCharacters(in: [" "])
}
private func isTopicValid(topic: String) -> Bool {
private func isValid(topic: String) -> Bool {
return !topic.isEmpty && (topic.range(of: "^[-_A-Za-z0-9]{1,64}$", options: .regularExpression, range: nil, locale: nil) != nil)
}
private func subscribeAction() {
subscriptionManager.subscribe(baseUrl: appBaseUrl, topic: topic)
DispatchQueue.global(qos: .background).async {
subscriptionManager.subscribe(baseUrl: appBaseUrl, topic: sanitize(topic: topic))
}
presentationMode.wrappedValue.dismiss()
}
}