Integrated locale handling changes in WordPressKit

Podfile

@@ -52,8 +52,8 @@ def wordpress_ui
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '~> 2.0.0-beta.3'
-    ##pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '8fb779907560f98ffa3d464d46badb5d1481cfcf'
+    pod 'WordPressKit', '~> 2.0.0-beta.4'
+    #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '0469f41'
     ##pod 'WordPressKit', :path => '~/Developer/a8c/WordPressKit-iOS'
 end
 

Podfile.lock

@@ -188,7 +188,7 @@ PODS:
     - WordPressKit (~> 2.0-beta)
     - WordPressShared (~> 1.4)
     - WordPressUI (~> 1.0)
-  - WordPressKit (2.0.0-beta.3):
+  - WordPressKit (2.0.0-beta.4):
     - Alamofire (~> 4.7.3)
     - CocoaLumberjack (= 3.4.2)
     - NSObject-SafeExpectations (= 0.0.3)
@@ -245,7 +245,7 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (= 1.4.2)
   - WordPressAuthenticator (~> 1.1.9-beta)
-  - WordPressKit (~> 2.0.0-beta.3)
+  - WordPressKit (~> 2.0.0-beta.4)
   - WordPressShared (~> 1.7.0-beta)
   - WordPressUI (from `https://github.com/wordpress-mobile/WordPressUI-iOS.git`, tag `1.2.0`)
   - WPMediaPicker (= 1.3.2)
@@ -377,14 +377,14 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: d9e816350ab1e200681d433287fbb079675e9159
   WordPress-Editor-iOS: 5a09651534181c9f3ab43516b7666e9c55b2330e
   WordPressAuthenticator: 40ed3d920f134227a6ab069576378293c0bda401
-  WordPressKit: c70ff713b000e346aa345d71d6dcf9c8aa66c767
+  WordPressKit: 9f32d40719c9dbd32d2f4e36cfb61af02e952dac
   WordPressShared: 9889ea6eaeb951df12e2901f98bd194df728d2a1
   WordPressUI: 44fe43a9c5c504dfd534286e39e1ce6ebcd69ff5
   WPMediaPicker: e50edd8f30f5d87288840941ef3ff9cd11860937
   wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2
   yoga: f37b1edbd68be803f1dc4d57d40d8a5b277d8e2c
   ZendeskSDK: 44ee00338dd718495f0364369420ae11b389c878
 
-PODFILE CHECKSUM: d53f6597e345ff4aed738da51e4a65d64f7aa360
+PODFILE CHECKSUM: 4051af86a8ff0412cf4addbe5e42347cca8e6021
 
 COCOAPODS: 1.5.3

WordPress/Classes/Models/WPAccount+RestApi.swift

@@ -0,0 +1,16 @@
+
+import Foundation
+import WordPressKit
+
+extension WPAccount {
+    /// Returns an instance of the WPCOM REST API suitable for v2 endpoints.
+    /// If the user is not authenticated, this will be anonymous.
+    ///
+    var wordPressComRestV2Api: WordPressComRestApi {
+        let token = authToken
+        let userAgent = WPUserAgent.wordPress()
+        let localeKey = WordPressComRestApi.LocaleKeyV2
+
+        return WordPressComRestApi(oAuthToken: token, userAgent: userAgent, localeKey: localeKey)
+    }
+}

WordPress/Classes/Services/SiteSegmentsService.swift

@@ -27,11 +27,12 @@ final class SiteCreationSegmentsService: LocalCoreDataService, SiteSegmentsServi
         self.accountService = AccountService(managedObjectContext: context)
 
         let api: WordPressComRestApi
-        if let wpcomApi = accountService.defaultWordPressComAccount()?.wordPressComRestApi {
-            api = wpcomApi
+        if let account = accountService.defaultWordPressComAccount() {
+            api = account.wordPressComRestV2Api
         } else {
-            api = WordPressComRestApi(userAgent: WPUserAgent.wordPress())
+            api = WordPressComRestApi.anonymousApi(userAgent: WPUserAgent.wordPress(), localeKey: WordPressComRestApi.LocaleKeyV2)
         }
+
         self.remoteService = WordPressComServiceRemote(wordPressComRestApi: api)
 
         super.init(managedObjectContext: context)

WordPress/Classes/Services/SiteVerticalsPromptService.swift

@@ -42,11 +42,12 @@ final class SiteCreationVerticalsPromptService: LocalCoreDataService, SiteVertic
         self.accountService = AccountService(managedObjectContext: context)
 
         let api: WordPressComRestApi
-        if let wpcomApi = accountService.defaultWordPressComAccount()?.wordPressComRestApi {
-            api = wpcomApi
+        if let account = accountService.defaultWordPressComAccount() {
+            api = account.wordPressComRestV2Api
         } else {
-            api = WordPressComRestApi(userAgent: WPUserAgent.wordPress())
+            api = WordPressComRestApi.anonymousApi(userAgent: WPUserAgent.wordPress(), localeKey: WordPressComRestApi.LocaleKeyV2)
         }
+
         self.remoteService = WordPressComServiceRemote(wordPressComRestApi: api)
 
         super.init(managedObjectContext: context)

WordPress/Classes/Services/SiteVerticalsService.swift

@@ -44,10 +44,10 @@ final class SiteCreationVerticalsService: LocalCoreDataService, SiteVerticalsSer
         self.accountService = AccountService(managedObjectContext: context)
 
         let api: WordPressComRestApi
-        if let wpcomApi = accountService.defaultWordPressComAccount()?.wordPressComRestApi {
-            api = wpcomApi
+        if let account = accountService.defaultWordPressComAccount() {
+            api = account.wordPressComRestV2Api
         } else {
-            api = WordPressComRestApi(userAgent: WPUserAgent.wordPress())
+            api = WordPressComRestApi.anonymousApi(userAgent: WPUserAgent.wordPress(), localeKey: WordPressComRestApi.LocaleKeyV2)
         }
         self.remoteService = WordPressComServiceRemote(wordPressComRestApi: api)
 

WordPress/Classes/Stores/ActivityStore.swift

@@ -237,7 +237,7 @@ private extension ActivityStore {
             return
         }
 
-        remote(site: site)?.restoreSite(
+        remoteV1(site: site)?.restoreSite(
             site.siteID,
             rewindID: rewindID,
             success: { [actionDispatcher] restoreID in
@@ -374,15 +374,27 @@ private extension ActivityStore {
     }
 
     // MARK: - Helpers
+
     func remote(site: JetpackSiteRef) -> ActivityServiceRemote? {
         guard let token = CredentialsService().getOAuthToken(site: site) else {
             return nil
         }
-        let api = WordPressComRestApi(oAuthToken: token, userAgent: WPUserAgent.wordPress())
+
+        let api = WordPressComRestApi(oAuthToken: token, userAgent: WPUserAgent.wordPress(), localeKey: WordPressComRestApi.LocaleKeyV2)
+        api.appendsPreferredLanguageLocale = false  // ActivityServiceRemote currently injects "locale"
 
         return ActivityServiceRemote(wordPressComRestApi: api)
     }
 
+    func remoteV1(site: JetpackSiteRef) -> ActivityServiceRemote_ApiVersion1_0? {
+        guard let token = CredentialsService().getOAuthToken(site: site) else {
+            return nil
+        }
+        let api = WordPressComRestApi(oAuthToken: token, userAgent: WPUserAgent.wordPress())
+
+        return ActivityServiceRemote_ApiVersion1_0(wordPressComRestApi: api)
+    }
+
     private func mediumString(from date: Date, adjustingTimezoneTo site: JetpackSiteRef) -> String {
         let formatter = ActivityDateFormatting.mediumDateFormatterWithTime(for: site)
         return formatter.string(from: date)

WordPress/Classes/Stores/TimeZoneStore.swift

@@ -71,7 +71,11 @@ class TimeZoneStore: QueryStore<TimeZoneStoreState, TimeZoneQuery> {
 private extension TimeZoneStore {
     func fetchTimeZones() {
         state = .loading
-        let remote = TimeZoneServiceRemote(wordPressComRestApi: .anonymousApi(userAgent: WPUserAgent.wordPress()))
+
+        let api: WordPressComRestApi = .anonymousApi(userAgent: WPUserAgent.wordPress())
+        api.appendsPreferredLanguageLocale = false  // TimeZoneServiceRemote currently injects "_locale"
+
+        let remote = TimeZoneServiceRemote(wordPressComRestApi: api)
         remote.getTimezones(
             success: { [weak self] (groups) in
                 self?.state = .loaded(groups)

WordPress/WordPress.xcodeproj/project.pbxproj

@@ -526,6 +526,7 @@
 		73F6DD42212BA54700CE447D /* RichNotificationContentFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F6DD41212BA54700CE447D /* RichNotificationContentFormatter.swift */; };
 		73F6DD44212C714F00CE447D /* RichNotificationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F6DD43212C714F00CE447D /* RichNotificationViewModel.swift */; };
 		73F6DD45212C714F00CE447D /* RichNotificationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F6DD43212C714F00CE447D /* RichNotificationViewModel.swift */; };
+		73FEC871220B358500CEF791 /* WPAccount+RestApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73FEC870220B358500CEF791 /* WPAccount+RestApi.swift */; };
 		740219FE202E12F4006CC39F /* UploadOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741E22441FC0CC55007967AB /* UploadOperation.swift */; };
 		740219FF202E12F4006CC39F /* PostUploadOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74AF4D711FE417D200E3EBFE /* PostUploadOperation.swift */; };
 		74021A00202E12F4006CC39F /* MediaUploadOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74AF4D6D1FE417D200E3EBFE /* MediaUploadOperation.swift */; };
@@ -2389,6 +2390,7 @@
 		73EDC709212E5D6700E5E3ED /* RemoteNotificationStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteNotificationStyles.swift; sourceTree = "<group>"; };
 		73F6DD41212BA54700CE447D /* RichNotificationContentFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RichNotificationContentFormatter.swift; sourceTree = "<group>"; };
 		73F6DD43212C714F00CE447D /* RichNotificationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RichNotificationViewModel.swift; sourceTree = "<group>"; };
+		73FEC870220B358500CEF791 /* WPAccount+RestApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WPAccount+RestApi.swift"; sourceTree = "<group>"; };
 		73FEFF1991AE9912FB2DA9BC /* Pods-WordPressNotificationServiceExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressNotificationServiceExtension.release.xcconfig"; path = "../Pods/Target Support Files/Pods-WordPressNotificationServiceExtension/Pods-WordPressNotificationServiceExtension.release.xcconfig"; sourceTree = "<group>"; };
 		740516882087B73400252FD0 /* SearchableActivityConvertable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchableActivityConvertable.swift; sourceTree = "<group>"; };
 		740BD8331A0D4C3600F04D18 /* WPUploadStatusButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WPUploadStatusButton.h; sourceTree = "<group>"; };
@@ -4480,6 +4482,7 @@
 				E105E9CD1726955600C0D9E7 /* WPAccount.h */,
 				E105E9CE1726955600C0D9E7 /* WPAccount.m */,
 				E12DB07A1C48D1C200A6C1D4 /* WPAccount+AccountSettings.swift */,
+				73FEC870220B358500CEF791 /* WPAccount+RestApi.swift */,
 				46F84612185A8B7E009D0DA5 /* PostContentProvider.h */,
 				5D35F7581A042255004E7B0D /* WPCommentContentViewProvider.h */,
 				173BCE781CEB780800AE8817 /* Domain.swift */,
@@ -10224,6 +10227,7 @@
 				E66969E01B9E648100EC9C00 /* ReaderTopicToReaderDefaultTopic37to38.swift in Sources */,
 				9822AFA021EECB8E007D922D /* AnnualSiteStatsCell.swift in Sources */,
 				82A062DE2017BCBA0084CE7C /* ActivityListSectionHeaderView.swift in Sources */,
+				73FEC871220B358500CEF791 /* WPAccount+RestApi.swift in Sources */,
 				B5FF3BE71CAD881100C1D597 /* ImageCropOverlayView.swift in Sources */,
 				E6A338501BB0A70F00371587 /* ReaderGapMarkerCell.swift in Sources */,
 				98BDFF6B20D0732900C72C58 /* SupportTableViewController+Activity.swift in Sources */,