Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf342b08

Browse files
committed
feat: removed all logic from the Telemetry plugin since it's not used anyway. The toggle leaves for now since I have not decided what to do with that.
1 parent531b0cf commitf342b08

File tree

4 files changed

+11
-82
lines changed

4 files changed

+11
-82
lines changed

‎Kit/plugins/Telemetry.swift

Lines changed: 5 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -11,83 +11,13 @@
1111

1212
import Foundation
1313

14-
privatestructReport:Codable{
15-
letid:UUID
16-
17-
letversion:String?
18-
letmodules:[String]
19-
20-
letdevice:String?
21-
letos:String?
22-
letlanguage:String?
23-
}
24-
2514
publicclassTelemetry{
26-
publicvarisEnabled:Bool{
27-
get{
28-
self._isEnabled
29-
}
30-
set{
31-
self.toggle(newValue)
32-
}
33-
}
34-
35-
privatevarurl:URL=URL(string:"https://api.mac-stats.com/telemetry")!
15+
publicstaticletshared=Telemetry()
3616

37-
privatevar_isEnabled:Bool=true
38-
39-
privateletid:UUID
40-
privateletrepeater=NSBackgroundActivityScheduler(identifier:"eu.exelban.Stats.Telemetry")
41-
privatevarmodules:UnsafePointer<[Module]>
42-
43-
publicinit(_ modules:UnsafePointer<[Module]>){
44-
self._isEnabled=Store.shared.bool(key:"telemetry", defaultValue:true)
45-
self.id=UUID(uuidString:Store.shared.string(key:"telemetry_id", defaultValue:UUID().uuidString))??UUID()
46-
self.modules= modules
47-
48-
if !Store.shared.exist(key:"telemetry_id"){
49-
Store.shared.set(key:"telemetry_id", value:self.id.uuidString)
50-
self.toggle(self.isEnabled)
51-
}
52-
53-
self.report()
54-
}
55-
56-
@objcpublicfunc report(){
57-
guardself.isEnabledelse{return}
58-
59-
letobj:Report=Report(
60-
id:self.id,
61-
version:Bundle.main.infoDictionary?["CFBundleShortVersionString"]as?String,
62-
modules:self.modules.pointee.filter({ $0.available && $0.enabled}).compactMap({ $0.name}),
63-
device:SystemKit.shared.device.model.id,
64-
os:SystemKit.shared.device.os?.version.getFullVersion(),
65-
language:Locale.current.languageCode
66-
)
67-
letjsonData=try?JSONEncoder().encode(obj)
68-
69-
varrequest=URLRequest(url:self.url)
70-
request.httpMethod="POST"
71-
request.httpBody= jsonData
72-
request.setValue("application/json", forHTTPHeaderField:"Content-Type")
73-
74-
lettask=URLSession.shared.dataTask(with: request)
75-
task.resume()
17+
publicvarisEnabled:Bool{
18+
get{Store.shared.bool(key:"telemetry", defaultValue:true)}
19+
set{Store.shared.set(key:"telemetry", value: newValue)}
7620
}
7721

78-
privatefunc toggle(_ newValue:Bool){
79-
self._isEnabled= newValue
80-
Store.shared.set(key:"telemetry", value: newValue)
81-
82-
self.repeater.invalidate()
83-
84-
if newValue{
85-
self.repeater.repeats=true
86-
self.repeater.interval=60*60*24
87-
self.repeater.schedule{(completion:@escapingNSBackgroundActivityScheduler.CompletionHandler)in
88-
self.report()
89-
completion(NSBackgroundActivityScheduler.Result.finished)
90-
}
91-
}
92-
}
22+
publicinit(){}
9323
}

‎Stats/AppDelegate.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ var modules: [Module] = [
3333
Bluetooth(),
3434
Clock()
3535
]
36-
lettelemetry:Telemetry=Telemetry(&modules)
3736

3837
@main
3938
classAppDelegate:NSObject,NSApplicationDelegate,UNUserNotificationCenterDelegate{

‎Stats/Views/AppSettings.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class ApplicationSettings: NSStackView {
8383
)
8484
self.telemetryBtn=switchView(
8585
action: #selector(self.toggleTelemetry),
86-
state:telemetry.isEnabled
86+
state:Telemetry.shared.isEnabled
8787
)
8888

8989
scrollView.stackView.addArrangedSubview(PreferencesSection([
@@ -182,7 +182,7 @@ class ApplicationSettings: NSStackView {
182182

183183
internalfunc viewWillAppear(){
184184
self.startAtLoginBtn?.state=LaunchAtLogin.isEnabled?.on:.off
185-
self.telemetryBtn?.state=telemetry.isEnabled?.on:.off
185+
self.telemetryBtn?.state=Telemetry.shared.isEnabled?.on:.off
186186

187187
varidx=self.updateSelector?.indexOfSelectedItem??0
188188
iflet items=self.updateSelector?.menu?.items{
@@ -296,7 +296,7 @@ class ApplicationSettings: NSStackView {
296296
}
297297

298298
@objcprivatefunc toggleTelemetry(_ sender:NSButton){
299-
telemetry.isEnabled= sender.state==NSControl.StateValue.on
299+
Telemetry.shared.isEnabled= sender.state==NSControl.StateValue.on
300300
}
301301

302302
@objcprivatefunc toggleCombinedModules(_ sender:NSButton){

‎Stats/Views/Setup.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -400,12 +400,12 @@ private class SetupView_4: NSStackView {
400400

401401
container.addRow(with:[self.option(
402402
tag:1,
403-
state:telemetry.isEnabled,
403+
state:Telemetry.shared.isEnabled,
404404
text:localizedString("Share anonymous telemetry data")
405405
)])
406406
container.addRow(with:[self.option(
407407
tag:2,
408-
state: !telemetry.isEnabled,
408+
state: !Telemetry.shared.isEnabled,
409409
text:localizedString("Do not share anonymous telemetry data")
410410
)])
411411

@@ -427,7 +427,7 @@ private class SetupView_4: NSStackView {
427427
}
428428

429429
@objcprivatefunc toggle(_ sender:NSButton){
430-
telemetry.isEnabled= sender.tag==1
430+
Telemetry.shared.isEnabled= sender.tag==1
431431
}
432432
}
433433

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp