Bug fixes after testing

wikimedia · Oct 7, 2024 · 9168a5e · 9168a5e
1 parent 18e2f74
commit 9168a5e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/...rces/WMFData/Data Controllers/Developer Settings/WMFDeveloperSettingsDataController.swift b/...rces/WMFData/Data Controllers/Developer Settings/WMFDeveloperSettingsDataController.swift
@@ -55,7 +55,7 @@ import Foundation
 
  // MARK: - Remote Settings from donatewiki AppsFeatureConfig json
 
- func loadFeatureConfig() -> WMFFeatureConfigResponse? {
+ public func loadFeatureConfig() -> WMFFeatureConfigResponse? {
 
  // First pull from memory
  guard featureConfig == nil else {
@@ -107,7 +107,12 @@ import Foundation
  self.featureConfig = response
  self.featureConfig?.cachedDate = Date()
 
- try? self.sharedCacheStore?.save(key: self.cacheDirectoryName, self.cacheFeatureConfigFileName, value: featureConfig)
+ do {
+ try self.sharedCacheStore?.save(key: self.cacheDirectoryName, self.cacheFeatureConfigFileName, value: featureConfig)
+ } catch {
+ print(error)
+ }
+
 
  completion(nil)
  case .failure(let error):

diff --git a/WMFData/Sources/WMFData/Models/Developer Settings/WMFFeatureConfigResponse.swift b/WMFData/Sources/WMFData/Models/Developer Settings/WMFFeatureConfigResponse.swift
@@ -1,24 +1,24 @@
 import Foundation
 
-struct WMFFeatureConfigResponse: Codable {
- struct FeatureConfigIOS: Codable {
+public struct WMFFeatureConfigResponse: Codable {
+ public struct FeatureConfigIOS: Codable {
 
- struct Slide: Codable {
- let id: String
- let isEnabled: Bool
+ public struct Slide: Codable {
+ public let id: String
+ public let isEnabled: Bool
  }
 
  let version: Int
- let yirIsEnabled: Bool
- let yirCountryCodes: [String]
- let yirPrimaryAppLanguageCodes: [String]
- let yirDataPopulationStartDateString: String
- let yirDataPopulationEndDateString: String
- let yirDataPopulationFetchMaxPagesPerSession: Int
- let yirPersonalizedSlides: [Slide]
+ public let yirIsEnabled: Bool
+ public let yirCountryCodes: [String]
+ public let yirPrimaryAppLanguageCodes: [String]
+ public let yirDataPopulationStartDateString: String
+ public let yirDataPopulationEndDateString: String
+ public let yirDataPopulationFetchMaxPagesPerSession: Int
+ public let yirPersonalizedSlides: [Slide]
  }
 
- let ios: [FeatureConfigIOS]
+ public let ios: [FeatureConfigIOS]
  var cachedDate: Date?
 
  private let currentFeatureConfigVersion = 1
@@ -64,5 +64,6 @@ struct WMFFeatureConfigResponse: Codable {
  }
 
  self.ios = validConfigs
+ self.cachedDate = try? overallContainer.decode(Date.self, forKey: .cachedDate)
  }
 }
diff --git a/Wikipedia/Code/WMFAppViewController.m b/Wikipedia/Code/WMFAppViewController.m
@@ -896,9 +896,9 @@ - (void)migrateIfNecessary {
  self.migrationComplete = YES;
  self.migrationActive = NO;
  [self endMigrationBackgroundTask];
+ [self setupWMFDataEnvironment];
  [self checkRemoteAppConfigIfNecessary];
  [self setupControllers];
- [self setupWMFDataEnvironment];
  if (!self.isWaitingToResumeApp) {
  [self resumeApp:NULL];
  }