Skip to content

Commit dbfb0f8

Browse files
committed
Fix lint code format violations
1 parent 088fd35 commit dbfb0f8

File tree

240 files changed

+1129
-1213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+1129
-1213
lines changed

NotificationService/BreezSDKConnector.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import core
55
import gdk
66

77
class BreezSDKConnector: EventListener {
8-
8+
99
private static var lightningSession: LightningSessionManager? = nil
1010
private var sdkListener: EventListener? = nil
11-
11+
1212
func register(credentials: Credentials, listener: EventListener) async throws -> BlockingBreezServices? {
1313
sdkListener = listener
1414
if BreezSDKConnector.lightningSession == nil {
@@ -42,13 +42,13 @@ class BreezSDKConnector: EventListener {
4242
}
4343
}
4444

45-
class SDKLogListener : LogStream {
45+
class SDKLogListener: LogStream {
4646
private var logger: Logger
47-
47+
4848
init(logger: Logger) {
4949
self.logger = logger
5050
}
51-
51+
5252
func log(l: LogEntry) {
5353
if l.level != "TRACE" {
5454
logger.info("greenlight: [\(l.level)] \(l.line)")

NotificationService/NotificationService.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class NotificationService: UNNotificationServiceExtension {
108108
.filter { $0.xpubHashId == xpub }
109109
.first
110110
}
111-
111+
112112
func getTaskFromNotification(notification: LightningNotification) -> TaskProtocol? {
113113
switch(notification.notificationType) {
114114
case .addressTxsConfirmed:
@@ -121,10 +121,10 @@ class NotificationService: UNNotificationServiceExtension {
121121
return nil
122122
}
123123
}
124-
124+
125125
override func serviceExtensionTimeWillExpire() {
126126
logger.error("serviceExtensionTimeWillExpire()")
127-
127+
128128
// iOS calls this function just before the extension will be terminated by the system.
129129
// Use this as an opportunity to deliver your "best attempt" at modified content,
130130
// otherwise the original push payload will be used.

NotificationService/TaskProtocol.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import BreezSDK
33
import os.log
44
import core
55

6-
public protocol TaskProtocol : EventListener {
6+
public protocol TaskProtocol: EventListener {
77
var payload: String { get set }
88
var contentHandler: ((UNNotificationContent) -> Void)? { get set }
99
var bestAttemptContent: UNMutableNotificationContent? { get set }
1010
var dismiss: (() -> Void)? { get set }
11-
11+
1212
func start(breezSDK: BlockingBreezServices) throws
1313
func onShutdown()
1414
}
@@ -22,12 +22,12 @@ extension TaskProtocol {
2222
logger.error("displayPushNotification error")
2323
return
2424
}
25-
25+
2626
if threadIdentifier != nil {
2727
bestAttemptContent.threadIdentifier = threadIdentifier!
2828
}
2929
logger.info("displayPushNotification threadIdentifier \(threadIdentifier ?? "", privacy: .public)")
30-
30+
3131
bestAttemptContent.title = title
3232
contentHandler(bestAttemptContent)
3333
}

NotificationService/Tasks/PaymentReceiverTask.swift

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ struct ReceivePaymentNotificationRequest: Codable {
88
let payment_hash: String
99
}
1010

11-
class PaymentReceiverTask : TaskProtocol {
11+
class PaymentReceiverTask: TaskProtocol {
1212
static let NOTIFICATION_THREAD_PAYMENT_RECEIVED = "PAYMENT_RECEIVED"
1313

1414
internal var payload: String
@@ -17,15 +17,15 @@ class PaymentReceiverTask : TaskProtocol {
1717
internal var dismiss: (() -> Void)?
1818
private var logger: Logger
1919
private var receivedPayment: Payment? = nil
20-
20+
2121
init(payload: String, logger: Logger, contentHandler: ((UNNotificationContent) -> Void)? = nil, bestAttemptContent: UNMutableNotificationContent? = nil, dismiss: (() -> Void)? = nil) {
2222
self.payload = payload
2323
self.contentHandler = contentHandler
2424
self.bestAttemptContent = bestAttemptContent
2525
self.logger = logger
2626
self.dismiss = dismiss
2727
}
28-
28+
2929
func start(breezSDK: BlockingBreezServices) throws {
3030
do {
3131
let request = try JSONDecoder().decode(ReceivePaymentNotificationRequest.self, from: self.payload.data(using: .utf8)!)
@@ -41,29 +41,27 @@ class PaymentReceiverTask : TaskProtocol {
4141
throw NotificationError.Failed
4242
}
4343
}
44-
44+
4545
func onShutdown() {
4646
if receivedPayment != nil {
4747
self.displayPushNotification(title: "Payment received", threadIdentifier: PaymentReceiverTask.NOTIFICATION_THREAD_PAYMENT_RECEIVED)
4848
} else {
4949
self.displayPushNotification(title: "Open wallet to receive a payment", threadIdentifier: PaymentReceiverTask.NOTIFICATION_THREAD_PAYMENT_RECEIVED)
5050
}
5151
}
52-
52+
5353
func onEvent(e: BreezEvent) {
5454
switch e {
5555
case .invoicePaid(details: let details):
5656
self.logger.info("Received payment. Bolt11: \(details.bolt11, privacy: .public)\nPayment Hash:\(details.paymentHash, privacy: .public)")
5757
receivedPayment = details.payment
58-
break
5958
case .synced:
6059
logger.error("Received synced event")
6160
if self.receivedPayment != nil {
6261
logger.info("Received synced event and receivedPayment != nil")
6362
self.onShutdown()
6463
self.dismiss?()
6564
}
66-
break
6765
default:
6866
break
6967
}

NotificationService/Tasks/RedeemSwap.swift

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ struct AddressTxsConfirmedRequest: Codable {
88
let address: String
99
}
1010

11-
class RedeemSwapTask : TaskProtocol {
11+
class RedeemSwapTask: TaskProtocol {
1212
static let NOTIFICATION_THREAD_SWAP_TX_CONFIRMED = "SWAP_TX_CONFIRMED"
13-
13+
1414
internal var payload: String
1515
internal var contentHandler: ((UNNotificationContent) -> Void)?
1616
internal var bestAttemptContent: UNMutableNotificationContent?
1717
internal var dismiss: (() -> Void)?
1818
internal var swapAddress: String? = nil
19-
19+
2020
init(payload: String, logger: Logger, contentHandler: ((UNNotificationContent) -> Void)? = nil, bestAttemptContent: UNMutableNotificationContent? = nil, dismiss: (() -> Void)? = nil) {
2121
self.payload = payload
2222
self.contentHandler = contentHandler
2323
self.bestAttemptContent = bestAttemptContent
2424
self.dismiss = dismiss
2525
}
26-
26+
2727
public func onEvent(e: BreezEvent) {
2828
if let address = self.swapAddress {
2929
switch e {
@@ -36,13 +36,12 @@ class RedeemSwapTask : TaskProtocol {
3636
}
3737
}
3838
self.dismiss?()
39-
break
4039
default:
4140
break
4241
}
4342
}
4443
}
45-
44+
4645
func start(breezSDK: BlockingBreezServices) throws {
4746
do {
4847
let addressTxsConfirmedRequest = try JSONDecoder().decode(AddressTxsConfirmedRequest.self, from: self.payload.data(using: .utf8)!)
@@ -51,12 +50,12 @@ class RedeemSwapTask : TaskProtocol {
5150
logger.error("Failed to decode payload: \(e, privacy: .public)")
5251
throw e
5352
}
54-
53+
5554
guard let address = swapAddress else {
5655
logger.error("Failed to process swap notification: swap address not in payload")
5756
throw NotificationError.InvalidNotification
5857
}
59-
58+
6059
do {
6160
try breezSDK.redeemSwap(swapAddress: address)
6261
logger.info("Found swap for \(address, privacy: .public)")

core/Countly/AnalyticsManager/AMConstants.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
public extension AnalyticsManager {
2-
2+
33
static let countlyRemoteConfigAppReview = "app_review"
44
static let countlyRemoteConfigBanners = "banners"
55
static let countlyRemoteConfigAssets = "liquid_assets"

core/Countly/AnalyticsManager/AMEvents.swift

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public enum AnalyticsEventName: String {
4444
case jadeOtaComplete = "ota_complete"
4545

4646
case qrScan = "qr_scan"
47-
47+
4848
case accountEmptied = "account_emptied"
4949
case preferredUnits = "preferred_units"
5050
case hideAmount = "hide_amount"
@@ -76,7 +76,7 @@ extension AnalyticsManager {
7676
cancelEvent(event)
7777
startEvent(event)
7878
}
79-
79+
8080
public func loginWalletEnd(account: Account, loginType: AnalyticsManager.LoginType) {
8181
let event: AnalyticsEventName = AppSettings.shared.gdkSettings?.tor ?? false ? .walletLoginTor : .walletLogin
8282
endTrace(event)
@@ -85,15 +85,15 @@ extension AnalyticsManager {
8585
s[AnalyticsManager.strEphemeralBip39] = "\(account.isEphemeral)"
8686
endEvent(.walletLogin, sgmt: s)
8787
}
88-
89-
public func loginLightningStart(){
88+
89+
public func loginLightningStart() {
9090
startTrace(.lightningLogin)
9191
}
9292

93-
public func loginLightningStop(){
93+
public func loginLightningStop() {
9494
endTrace(.lightningLogin)
9595
}
96-
96+
9797
public func renameWallet() {
9898
recordEvent(.renameWallet)
9999
}
@@ -140,13 +140,13 @@ extension AnalyticsManager {
140140
AnalyticsManager.shared.userPropertiesDidChange()
141141
recordEvent(.walletCreate, sgmt: s)
142142
}
143-
143+
144144
public func importWallet(account: Account?) {
145145
let s = sessSgmt(account)
146146
AnalyticsManager.shared.userPropertiesDidChange()
147147
recordEvent(.walletImport, sgmt: s)
148148
}
149-
149+
150150
public func createAccount(account: Account?, walletItem: WalletItem?) {
151151
let s = subAccSeg(account, walletItem: walletItem)
152152
recordEvent(.createAccount, sgmt: s)
@@ -177,7 +177,7 @@ extension AnalyticsManager {
177177
recordEvent(event, sgmt: s)
178178
}
179179

180-
public func startFailedTransaction(){
180+
public func startFailedTransaction() {
181181
startTrace(.failedTransaction)
182182
cancelEvent(.failedTransaction)
183183
startEvent(.failedTransaction)
@@ -218,7 +218,7 @@ extension AnalyticsManager {
218218
}
219219

220220
public func recoveryPhraseCheckFailed(onBoardParams: OnBoardParams?, page: Int) {
221-
let sgmt = [AnalyticsManager.strPage : "\(page)" ]
221+
let sgmt = [AnalyticsManager.strPage: "\(page)" ]
222222
recordEvent(.failedRecoveryPhraseCheck, sgmt: sgmt)
223223
}
224224

@@ -242,11 +242,11 @@ extension AnalyticsManager {
242242
public func woWallet() {
243243
recordEvent(.walletWO)
244244
}
245-
245+
246246
public func restoreWallet() {
247247
recordEvent(.walletRestore)
248248
}
249-
249+
250250
public func onAccountFirst(account: Account?) {
251251
let s = sessSgmt(account)
252252
recordEvent(.accountFirst, sgmt: s)
@@ -279,25 +279,24 @@ extension AnalyticsManager {
279279

280280
public func hwwConnect(account: Account?) {
281281
var s = sessSgmt(account)
282-
282+
283283
s.removeValue(forKey: "\(AnalyticsManager.strFirmware)")
284284
s.removeValue(forKey: "\(AnalyticsManager.strModel)")
285-
285+
286286
recordEvent(.connectHWW, sgmt: s)
287287
}
288288

289289
public func hwwConnected(account: Account?) {
290290
let s = sessSgmt(account)
291-
292-
293-
//s[AnalyticsManager.strFirmware] = BleViewModel.shared.jade?.version?.jadeVersion ?? ""
294-
//s[AnalyticsManager.strModel] = BleViewModel.shared.jade?.version?.boardType ?? ""
291+
292+
// s[AnalyticsManager.strFirmware] = BleViewModel.shared.jade?.version?.jadeVersion ?? ""
293+
// s[AnalyticsManager.strModel] = BleViewModel.shared.jade?.version?.boardType ?? ""
295294
recordEvent(.connectedHWW, sgmt: s)
296295
}
297296

298297
public func hwwConnected(account: Account?, fwVersion: String?, model: String?) {
299298
var s = sessSgmt(account)
300-
299+
301300
s.removeValue(forKey: "\(AnalyticsManager.strFirmware)")
302301
s.removeValue(forKey: "\(AnalyticsManager.strModel)")
303302
if let fwVersion = fwVersion, let model = model {
@@ -306,7 +305,7 @@ extension AnalyticsManager {
306305
}
307306
recordEvent(.connectedHWW, sgmt: s)
308307
}
309-
308+
310309
public func initializeJade(account: Account?) {
311310
let s = sessSgmt(account)
312311
recordEvent(.jadeInitialize, sgmt: s)
@@ -354,7 +353,7 @@ extension AnalyticsManager {
354353
s[AnalyticsManager.strAccountsTypes] = walletData.accountsTypes
355354
s[AnalyticsManager.strAccountType] = walletItem.type.rawValue
356355
s[AnalyticsManager.strNetwork] = accountNetworkLabel(walletItem.gdkNetwork)
357-
356+
358357
recordEvent(.accountEmptied, sgmt: s)
359358
}
360359

core/Countly/AnalyticsManager/AMSegmentation.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import gdk
33
import hw
44

55
public extension AnalyticsManager {
6-
6+
77
typealias Sgmt = [String: String]
8-
8+
99
func ntwSgmtUnified() -> Sgmt {
1010
var s = Sgmt()
1111
if let analyticsNtw = analyticsNetworks {
@@ -16,24 +16,24 @@ public extension AnalyticsManager {
1616
}
1717
return s
1818
}
19-
19+
2020
func onBoardSgmtUnified(flow: AnalyticsManager.OnBoardFlow) -> Sgmt {
2121
var s = Sgmt()
2222
s[AnalyticsManager.strFlow] = flow.rawValue
2323
return s
2424
}
25-
25+
2626
func sessSgmt(_ account: Account?) -> Sgmt {
2727
var s = ntwSgmtUnified()
2828
if account?.isJade ?? false {
2929
s[AnalyticsManager.strBrand] = "Blockstream"
30-
s[AnalyticsManager.strFirmware] = "" //BleViewModel.shared.jade?.version?.jadeVersion ?? ""
31-
s[AnalyticsManager.strModel] = "" //BleViewModel.shared.jade?.version?.boardType ?? ""
30+
s[AnalyticsManager.strFirmware] = "" // BleViewModel.shared.jade?.version?.jadeVersion ?? ""
31+
s[AnalyticsManager.strModel] = "" // BleViewModel.shared.jade?.version?.boardType ?? ""
3232
s[AnalyticsManager.strConnection] = AnalyticsManager.strBle
3333
}
3434
if account?.isLedger ?? false {
3535
s[AnalyticsManager.strBrand] = "Ledger"
36-
s[AnalyticsManager.strFirmware] = "" //BleViewModel.shared.ledger?.version ?? ""
36+
s[AnalyticsManager.strFirmware] = "" // BleViewModel.shared.ledger?.version ?? ""
3737
s[AnalyticsManager.strModel] = "Ledger Nano X"
3838
s[AnalyticsManager.strConnection] = AnalyticsManager.strBle
3939
}

core/Countly/AnalyticsManager/AnalyticsManager.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public class AnalyticsManager {
129129
}
130130

131131
public weak var delegate: AnalyticsManagerDelegate?
132-
132+
133133
public var activeNetworks: [NetworkSecurityCase]? {
134134
let wm = WalletManager.current
135135
return wm?.activeNetworks
@@ -346,7 +346,6 @@ public class AnalyticsManager {
346346
widget.recordResult(nil)
347347
}
348348

349-
350349
public func recordEvent(_ key: AnalyticsEventName) {
351350
guard consent == .authorized else { return }
352351
Countly.sharedInstance().recordEvent(key.rawValue)

0 commit comments

Comments
 (0)