Fix iOS build for ads dev environment

brave · Oct 21, 2019 · 38038f7 · 38038f7
1 parent c3641c8
commit 38038f7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/vendor/brave-ios/Ads/BATBraveAds.h b/vendor/brave-ios/Ads/BATBraveAds.h
@@ -50,8 +50,9 @@ NS_SWIFT_NAME(BraveAds)
 
 /// Whether or not to use staging servers. Defaults to false
 @property (nonatomic, class, getter=isDebug) BOOL debug;
-/// Whether or not to use production servers. Defaults to true
-@property (nonatomic, class, getter=isProduction) BOOL production;
+/// The environment that ads is communicating with. See ledger's BATEnvironment
+/// for appropriate values.
+@property (nonatomic, class) int environment;
 /// Marks if this is being ran in a test environment. Defaults to false
 @property (nonatomic, class, getter=isTesting) BOOL testing;
 

diff --git a/vendor/brave-ios/Ads/BATBraveAds.mm b/vendor/brave-ios/Ads/BATBraveAds.mm
@@ -104,7 +104,16 @@ + (BOOL)isCurrentRegionSupported
 
 BATClassAdsBridge(BOOL, isDebug, setDebug, _is_debug)
 BATClassAdsBridge(BOOL, isTesting, setTesting, _is_testing)
-BATClassAdsBridge(BOOL, isProduction, setProduction, _is_production)
+
++ (int)environment
+{
+  return static_cast<int>(ads::_environment);
+}
+
++ (void)setEnvironment:(int)environment
+{
+  ads::_environment = static_cast<ads::Environment>(environment);
+}
 
 #pragma mark - Configuration
 

diff --git a/vendor/brave-ios/BATBraveRewards.m b/vendor/brave-ios/BATBraveRewards.m
@@ -89,7 +89,7 @@ - (instancetype)initWithConfiguration:(BATBraveRewardsConfiguration *)configurat
     self.adsClass = adsClass ?: BATBraveAds.class;
 
     BATBraveAds.debug = configuration.environment != BATEnvironmentProduction;
-    BATBraveAds.production = configuration.environment == BATEnvironmentProduction;
+    BATBraveAds.environment = configuration.environment;
     BATBraveAds.testing = configuration.testing;
 
     BATBraveLedger.debug = configuration.environment != BATEnvironmentProduction;

diff --git a/vendor/brave-ios/Ledger/BATBraveLedger.h b/vendor/brave-ios/Ledger/BATBraveLedger.h
@@ -45,7 +45,7 @@ NS_SWIFT_NAME(BraveLedger)
 
 /// Whether or not to use staging servers. Defaults to false
 @property (nonatomic, class, getter=isDebug) BOOL debug;
-/// Whether or not to use production servers. Defaults to true
+/// The environment that ledger is communicating with
 @property (nonatomic, class) BATEnvironment environment;
 /// Marks if this is being ran in a test environment. Defaults to false
 @property (nonatomic, class, getter=isTesting) BOOL testing;