Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swifty APIs #176

Merged
merged 5 commits into from
Sep 13, 2017
Merged

Swifty APIs #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
618569f
Convert OAuth to Swifty API
edjiang Aug 10, 2017
4291c87
Translated more Swift 3 APIs
edjiang Aug 14, 2017
385d66a
Merge branch 'remove-china-support' into swift-3-dev
edjiang Aug 14, 2017
ba96bc7
Update tests for new SDK API
edjiang Aug 15, 2017
03722c3
Remove TODO comment
edjiang Sep 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion source/TestAppShim/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</array>
<key>UberClientID</key>
<string>UberTestClientID</string>
<key>UberDisplayName</key>
<string>UberTestDisplayName</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions source/UberRides/AppStoreDeeplink.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ import Foundation
let domain = "m.uber.com"
let path = "/sign-up"

let clientIDQueryItem = URLQueryItem(name: "client_id", value: Configuration.getClientID())
let clientIDQueryItem = URLQueryItem(name: "client_id", value: Configuration.shared.clientID)

let userAgent = userAgent ?? "rides-ios-v\(Configuration.sdkVersion)"
let userAgent = userAgent ?? "rides-ios-v\(Configuration.shared.sdkVersion)"

let userAgentQueryItem = URLQueryItem(name: "user-agent", value: userAgent)

Expand Down
4 changes: 2 additions & 2 deletions source/UberRides/BaseDeeplink.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ import Foundation
- parameter completion: The completion block to execute once the deeplink has
executed. Passes in True if the url was successfully opened, false otherwise.
*/
@objc open func execute(_ completion: ((NSError?) -> ())? = nil) {
@objc open func execute(completion: ((NSError?) -> ())? = nil) {

let usingIOS9 = ProcessInfo().isOperatingSystemAtLeast(OperatingSystemVersion(majorVersion: 9, minorVersion: 0, patchVersion: 0))

if usingIOS9 {
Expand Down
Loading