Skip to content

Fixing/Implementing quality of life improvements to Issue #24206 #24481

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

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Fixing/Implementing quality of life improvements to Issue #24206 #24481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Modules/Sources/WordPressShared/WPUserAgent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class WPUserAgent: NSObject {
// https://github.com/wordpress-mobile/WordPress-iOS/blob/a6eaa7aa8acb50828449df2d3fccaa50d7def821/WordPress/Classes/Utility/WPUserAgent.m#L31-L41
@objc
public static func wordPressUserAgent(userDefaults: UserDefaults, bundle: Bundle = .main) -> String {
let appVersion = bundle.infoDictionary?["CFBundleShortVersionString"] as? String ?? "Unknown"
let appVersion = bundle.shortVersionString() ?? "Unknown"
return "\(defaultUserAgent(userDefaults: userDefaults)) wp-iphone/\(appVersion)"
}

Expand Down
4 changes: 2 additions & 2 deletions Modules/Tests/WordPressSharedTests/WPUserAgentTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ class WPWPUserAgentTests {
@Test
func wordPressUserAgentValue() throws {
let userDefaults = UserDefaults.standard
let appVersion = try #require(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String)
let appVersion = Bundle.main.shortVersionString()!
let defaultUserAgent = WPUserAgent.defaultUserAgent(userDefaults: userDefaults)
let expectedUserAgent = String.init(format: "%@ wp-iphone/%@", defaultUserAgent, appVersion)
let expectedUserAgent = String(format: "%@ wp-iphone/%@", defaultUserAgent, appVersion)

#expect(WPUserAgent.wordPressUserAgent(userDefaults: userDefaults) == expectedUserAgent)
}
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/NullBlogPropertySanitizer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@ import WordPressShared
}

private func currentBuildVersion() -> String? {
return Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
return Bundle.main.shortVersionString()!
}
}
4 changes: 2 additions & 2 deletions WordPress/Classes/System/WordPressAppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ extension WordPressAppDelegate {
}

func configureAppRatingUtility() {
guard let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String else {
guard let version = Bundle.main.shortVersionString() else {
DDLogError("No CFBundleShortVersionString found in Info.plist")
return
}
Expand Down Expand Up @@ -546,7 +546,7 @@ extension WordPressAppDelegate {
}

private func checkForAppUpdates() {
guard let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String else {
guard let version = Bundle.main.shortVersionString() else {
return wpAssertionFailure("No CFBundleShortVersionString found in Info.plist")
}
let coordinator = AppUpdateCoordinator(currentVersion: version)
Expand Down
3 changes: 2 additions & 1 deletion WordPress/Classes/Utility/In-App Feedback/AppRatingsUtility.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ class AppRatingUtility: NSObject {
/// internal tracking.
///
/// - Parameters:
/// - version: version number of the app, e.g. CFBundleShortVersionString
/// - version: version number of the app, e.g. Bundle.main.shortVersionString() for consistency.
/// Maps to CFBundleShortVersionStringin Info.plist)
///
@objc func setVersion(_ version: String) {
let trackingVersion = defaults.string(forKey: Key.currentVersion) ?? version
Expand Down
2 changes: 1 addition & 1 deletion WordPress/WordPressTest/NullBlogPropertySanitizerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class NullBlogPropertySanitizerTests: CoreDataTestCase {
private var nullBlogPropertySanitizer: NullBlogPropertySanitizer!

private var currentBuildVersion: String {
return Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? ""
return Bundle.main.shortVersionString() ?? ""
}

override func setUp() {
Expand Down