pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] rename MapsAppDelegate's isDrapeDisabled into the isTestEnvironment

Browse source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2024-04-22 21:23:13 +04:00 • committed by Roman Tsisyk
parent 9a4fdfc1a6
commit 50bf9c6290
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/MapViewController.mm
View file

@ -371,7 +371,7 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
- (void)viewDidLayoutSubviews {
[super viewDidLayoutSubviews];
if (!self.mapView.drapeEngineCreated && !MapsAppDelegate.isDrapeDisabled)
if (!self.mapView.drapeEngineCreated && !MapsAppDelegate.isTestsEnvironment)
[self.mapView createDrapeEngine];
}

2
iphone/Maps/Classes/MapsAppDelegate.h
View file

@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
- (NSUInteger)badgeNumber;
+ (BOOL)isDrapeDisabled;
+ (BOOL)isTestsEnvironment;
@end

8
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -121,7 +121,9 @@ using namespace osm_auth_ios;
}
[self enableTTSForTheFirstTime];
[[CloudStorageManager shared] start];
if (![MapsAppDelegate isTestsEnvironment])
[[CloudStorageManager shared] start];
[[DeepLinkHandler shared] applicationDidFinishLaunching:launchOptions];
// application:openUrl:options is called later for deep links if YES is returned.
return YES;
@ -226,8 +228,8 @@ using namespace osm_auth_ios;
LOG(LINFO, ("applicationDidBecomeActive - end"));
}
// TODO: Drape enabling is skipped during the test run due to the app crashing in teardown. This is a temporary solution. Drape should be properly disabled instead of merely skipping the enabling process.
+ (BOOL)isDrapeDisabled {
// TODO: Drape enabling and iCloud sync are skipped during the test run due to the app crashing in teardown. This is a temporary solution. Drape should be properly disabled instead of merely skipping the enabling process.
+ (BOOL)isTestsEnvironment {
NSProcessInfo * processInfo = [NSProcessInfo processInfo];
NSArray<NSString *> * launchArguments = [processInfo arguments];
BOOL isTests = [launchArguments containsObject:@"-IsTests"];

2
iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift
View file

@ -22,7 +22,7 @@ final class CarPlayMapViewController: MWMViewController {
override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews()
if mapView?.drapeEngineCreated == false && !MapsAppDelegate.isDrapeDisabled() {
if mapView?.drapeEngineCreated == false && !MapsAppDelegate.isTestsEnvironment() {
mapView?.createDrapeEngine()
}
updateVisibleViewPortState(viewPortState)