Skip to content

Commit 86a2208

Browse files
committed
INBIOS-1084 Fix UserSettings request path
1 parent aecb1f6 commit 86a2208

File tree

21 files changed

+11
-1135
lines changed

21 files changed

+11
-1135
lines changed

ProtonMail/ProtonMail.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ProtonMail/ProtonMail/Models/APIs/APP_share/SettingsAPI/SettingsAPI.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ struct SettingsAPI {
3838
static let path: String = "/\(Constants.App.API_PREFIXED)/settings"
3939
}
4040

41-
// Mark : get settings -- SettingsResponse
42-
struct GetUserSettings: Request {
43-
var path: String {
44-
return SettingsAPI.path
45-
}
46-
}
47-
4841
final class SettingsResponse: Response {
4942
var userSettings: [String: Any]?
5043
override func ParseResponse(_ response: [String: Any]!) -> Bool {

ProtonMail/ProtonMail/Services/APP_share/UserDataService/UserDataService.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class UserDataService {
4646
let userInfoRequest = GetUserInfoRequest()
4747
async let userInfoResponse = await self.apiService.perform(request: userInfoRequest, response: GetUserInfoResponse()).1
4848

49-
let userSettingsRequest = GetUserSettings()
49+
let userSettingsRequest = SettingsEndpoint()
5050
async let userSettingsResponse = await self.apiService.perform(request: userSettingsRequest, response: SettingsResponse()).1
5151

5252
let mailSettingsRequest = GetMailSettings()
@@ -72,7 +72,7 @@ class UserDataService {
7272
) -> Promise<(UserInfo, MailSettings)> {
7373
return async {
7474

75-
let userSettingsApi = GetUserSettings()
75+
let userSettingsApi = SettingsEndpoint()
7676
let mailSettingsApi = GetMailSettings()
7777

7878
let userSettingsRes: SettingsResponse = try AwaitKit.await(self.apiService.run(route: userSettingsApi))

ProtonMail/ProtonMail/Supporting Files/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<key>CFBundlePackageType</key>
5555
<string>APPL</string>
5656
<key>CFBundleShortVersionString</key>
57-
<string>4.22.0</string>
57+
<string>4.22.1</string>
5858
<key>CFBundleSignature</key>
5959
<string>????</string>
6060
<key>CFBundleURLTypes</key>

ProtonMail/ProtonMail/Supporting Files/Settings.bundle/Acknowledgements.latest_result.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ name: lottie-ios, nameSpecified: Lottie, owner: airbnb, version: 4.3.3, source:
106106

107107
name: OHHTTPStubs, nameSpecified: OHHTTPStubs, owner: AliSoftware, version: 9.1.0, source: https://github.com/AliSoftware/OHHTTPStubs
108108

109-
name: protoncore_ios, nameSpecified: ProtonCore, owner: ProtonMail, version: 32.6.0, source: https://github.com/ProtonMail/protoncore_ios
109+
name: protoncore_ios, nameSpecified: ProtonCore, owner: ProtonMail, version: 32.7.1, source: https://github.com/ProtonMail/protoncore_ios
110110

111111
name: Reachability.swift, nameSpecified: Reachability, owner: ashleymills, version: 5.2.4, source: https://github.com/ashleymills/Reachability.swift
112112

ProtonMail/ProtonMail/Supporting Files/Settings.bundle/Acknowledgements.plist

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -122,22 +122,6 @@
122122
<key>Type</key>
123123
<string>PSChildPaneSpecifier</string>
124124
</dict>
125-
<dict>
126-
<key>File</key>
127-
<string>Acknowledgements/SDWebImage</string>
128-
<key>Title</key>
129-
<string>SDWebImage</string>
130-
<key>Type</key>
131-
<string>PSChildPaneSpecifier</string>
132-
</dict>
133-
<dict>
134-
<key>File</key>
135-
<string>Acknowledgements/sentry-cocoa</string>
136-
<key>Title</key>
137-
<string>Sentry</string>
138-
<key>Type</key>
139-
<string>PSChildPaneSpecifier</string>
140-
</dict>
141125
<dict>
142126
<key>File</key>
143127
<string>Acknowledgements/SideMenuSwift</string>
@@ -154,46 +138,6 @@
154138
<key>Type</key>
155139
<string>PSChildPaneSpecifier</string>
156140
</dict>
157-
<dict>
158-
<key>File</key>
159-
<string>Acknowledgements/swift-css-parser</string>
160-
<key>Title</key>
161-
<string>swift-css-parser</string>
162-
<key>Type</key>
163-
<string>PSChildPaneSpecifier</string>
164-
</dict>
165-
<dict>
166-
<key>File</key>
167-
<string>Acknowledgements/swift-custom-dump</string>
168-
<key>Title</key>
169-
<string>swift-custom-dump</string>
170-
<key>Type</key>
171-
<string>PSChildPaneSpecifier</string>
172-
</dict>
173-
<dict>
174-
<key>File</key>
175-
<string>Acknowledgements/swift-snapshot-testing</string>
176-
<key>Title</key>
177-
<string>swift-snapshot-testing</string>
178-
<key>Type</key>
179-
<string>PSChildPaneSpecifier</string>
180-
</dict>
181-
<dict>
182-
<key>File</key>
183-
<string>Acknowledgements/swift-syntax</string>
184-
<key>Title</key>
185-
<string>swift-syntax</string>
186-
<key>Type</key>
187-
<string>PSChildPaneSpecifier</string>
188-
</dict>
189-
<dict>
190-
<key>File</key>
191-
<string>Acknowledgements/SwiftOTP</string>
192-
<key>Title</key>
193-
<string>SwiftOTP</string>
194-
<key>Type</key>
195-
<string>PSChildPaneSpecifier</string>
196-
</dict>
197141
<dict>
198142
<key>File</key>
199143
<string>Acknowledgements/SwiftSoup</string>
@@ -210,30 +154,6 @@
210154
<key>Type</key>
211155
<string>PSChildPaneSpecifier</string>
212156
</dict>
213-
<dict>
214-
<key>File</key>
215-
<string>Acknowledgements/TrustKit</string>
216-
<key>Title</key>
217-
<string>TrustKit</string>
218-
<key>Type</key>
219-
<string>PSChildPaneSpecifier</string>
220-
</dict>
221-
<dict>
222-
<key>File</key>
223-
<string>Acknowledgements/xctest-dynamic-overlay</string>
224-
<key>Title</key>
225-
<string>xctest-dynamic-overlay</string>
226-
<key>Type</key>
227-
<string>PSChildPaneSpecifier</string>
228-
</dict>
229-
<dict>
230-
<key>File</key>
231-
<string>Acknowledgements/Yams</string>
232-
<key>Title</key>
233-
<string>Yams</string>
234-
<key>Type</key>
235-
<string>PSChildPaneSpecifier</string>
236-
</dict>
237157
</array>
238158
</dict>
239159
</plist>

ProtonMail/ProtonMail/Supporting Files/Settings.bundle/Acknowledgements/SDWebImage.plist

Lines changed: 0 additions & 37 deletions
This file was deleted.

ProtonMail/ProtonMail/Supporting Files/Settings.bundle/Acknowledgements/SwiftOTP.plist

Lines changed: 0 additions & 23 deletions
This file was deleted.

ProtonMail/ProtonMail/Supporting Files/Settings.bundle/Acknowledgements/TrustKit.plist

Lines changed: 0 additions & 38 deletions
This file was deleted.

ProtonMail/ProtonMail/Supporting Files/Settings.bundle/Acknowledgements/Yams.plist

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)