fix swiftlint warnings
Change-Id: I0fb13c5d263f4f7a994ef411684c9fb01cd972f7
diff --git a/Ring/jamiNotificationExtension/NotificationService.swift b/Ring/jamiNotificationExtension/NotificationService.swift
index 5033f21..ea9a3a5 100644
--- a/Ring/jamiNotificationExtension/NotificationService.swift
+++ b/Ring/jamiNotificationExtension/NotificationService.swift
@@ -136,49 +136,7 @@
info["displayName"] = name
self.presentCall(info: info)
}
- switch result {
- case .call(let peerId, let hasVideo):
- handleCall(peerId, "\(hasVideo)")
- return
- case .gitMessage:
- /// check if account already acive
- guard !self.accountIsActive else { break }
- self.accountIsActive = true
- self.adapterService.startAccountsWithListener(accountId: self.accountId) { [weak self] event, eventData in
- guard let self = self else {
- return
- }
- switch event {
- case .message:
- self.numberOfMessages += 1
- self.configureMessageNotification(from: eventData.jamiId, body: eventData.content, accountId: self.accountId, conversationId: eventData.conversationId, groupTitle: "")
- case .fileTransferDone:
- if let url = URL(string: eventData.content) {
- self.configureFileNotification(from: eventData.jamiId, url: url, accountId: self.accountId, conversationId: eventData.conversationId)
- } else {
- self.numberOfFiles -= 1
- self.verifyTasksStatus()
- }
- case .syncCompleted:
- self.syncCompleted = true
- self.verifyTasksStatus()
- case .fileTransferInProgress:
- self.numberOfFiles += 1
- case .call:
- handleCall(eventData.jamiId, eventData.content)
- case .invitation:
- self.syncCompleted = true
- self.numberOfMessages += 1
- self.configureMessageNotification(from: eventData.jamiId,
- body: eventData.content,
- accountId: self.accountId,
- conversationId: eventData.conversationId,
- groupTitle: eventData.groupTitle)
- }
- }
- case .unknown:
- break
- }
+ self.handleResult(result: result, handleCall: handleCall)
} catch {
print("serialization failed , \(error)")
}
@@ -193,6 +151,48 @@
finish()
}
+ private func handleResult(result: AdapterService.PeerConnectionRequestType, handleCall: @escaping (String, String) -> Void) {
+ switch result {
+ case .call(let peerId, let hasVideo):
+ handleCall(peerId, "\(hasVideo)")
+ return
+ case .gitMessage:
+ /// check if account already acive
+ guard !self.accountIsActive else { break }
+ self.accountIsActive = true
+ self.adapterService.startAccountsWithListener(accountId: self.accountId) { [weak self] event, eventData in
+ guard let self = self else {
+ return
+ }
+ switch event {
+ case .message:
+ self.numberOfMessages += 1
+ self.configureMessageNotification(from: eventData.jamiId, body: eventData.content, accountId: self.accountId, conversationId: eventData.conversationId, groupTitle: "")
+ case .fileTransferDone:
+ if let url = URL(string: eventData.content) {
+ self.configureFileNotification(from: eventData.jamiId, url: url, accountId: self.accountId, conversationId: eventData.conversationId)
+ } else {
+ self.numberOfFiles -= 1
+ self.verifyTasksStatus()
+ }
+ case .syncCompleted:
+ self.syncCompleted = true
+ self.verifyTasksStatus()
+ case .fileTransferInProgress:
+ self.numberOfFiles += 1
+ case .call:
+ handleCall(eventData.jamiId, eventData.content)
+ case .invitation:
+ self.syncCompleted = true
+ self.numberOfMessages += 1
+ self.configureMessageNotification(from: eventData.jamiId, body: eventData.content, accountId: self.accountId, conversationId: eventData.conversationId, groupTitle: eventData.groupTitle)
+ }
+ }
+ case .unknown:
+ break
+ }
+ }
+
private func verifyTasksStatus() {
guard !self.tasksCompleted else { return } /// we already left taskGroup
/// waiting for lookup