diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index f0e8cd572d..0f8bc3ea78 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -23,8 +23,6 @@ #import #import -#import - #import #import @@ -70,24 +68,6 @@ void InitLocalizedStrings() { f.AddString("wifi", L(@"wifi").UTF8String); } -void InitCrashTrackers() { -#ifdef OMIM_PRODUCTION - if ([MWMSettings crashReportingDisabled]) - return; - - NSString *googleConfig = [[NSBundle mainBundle] pathForResource:@"GoogleService-Info" ofType:@"plist"]; - if ([[NSFileManager defaultManager] fileExistsAtPath:googleConfig]) { - [FIRApp configure]; - } -#endif -} - -void ConfigCrashTrackers() { -#ifdef OMIM_PRODUCTION - [[FIRCrashlytics crashlytics] setUserID:[Alohalytics installationId]]; -#endif -} - void OverrideUserAgent() { [NSUserDefaults.standardUserDefaults registerDefaults:@{ @"UserAgent": @"Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/603.1.30 " @@ -179,12 +159,6 @@ using namespace osm_auth_ios; NSLog(@"deeplinking: launchOptions %@", launchOptions); OverrideUserAgent(); - InitCrashTrackers(); - - // We send Alohalytics installation id to Fabric. - // To make sure id is created, ConfigCrashTrackers must be called after Statistics initialization. - ConfigCrashTrackers(); - [HttpThreadImpl setDownloadIndicatorProtocol:self]; InitLocalizedStrings(); @@ -276,25 +250,8 @@ using namespace osm_auth_ios; } } -- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { -#ifdef OMIM_PRODUCTION - auto err = [[NSError alloc] initWithDomain:kMapsmeErrorDomain - code:1 - userInfo:@{@"Description": @"applicationDidReceiveMemoryWarning"}]; - [[FIRCrashlytics crashlytics] recordError:err]; -#endif -} - - (void)applicationWillTerminate:(UIApplication *)application { [self.mapViewController onTerminate]; - -#ifdef OMIM_PRODUCTION - auto err = [[NSError alloc] initWithDomain:kMapsmeErrorDomain - code:2 - userInfo:@{@"Description": @"applicationWillTerminate"}]; - [[FIRCrashlytics crashlytics] recordError:err]; -#endif - // Global cleanup DeleteFramework(); } @@ -620,14 +577,6 @@ using namespace osm_auth_ios; } } -- (void)onConversionDataRequestFailure:(NSError *)error { -#ifdef OMIM_PRODUCTION - dispatch_async(dispatch_get_main_queue(), ^{ - [[FIRCrashlytics crashlytics] recordError:error]; - }); -#endif -} - #pragma mark - CPApplicationDelegate implementation - (void)application:(UIApplication *)application diff --git a/iphone/Maps/Core/Ads/BannersCache.swift b/iphone/Maps/Core/Ads/BannersCache.swift index 20853fb238..576d6dc3c4 100644 --- a/iphone/Maps/Core/Ads/BannersCache.swift +++ b/iphone/Maps/Core/Ads/BannersCache.swift @@ -1,5 +1,3 @@ -import FirebaseCrashlytics - @objc(MWMBannersCache) final class BannersCache: NSObject { @objc static let cache = BannersCache() @@ -88,7 +86,6 @@ final class BannersCache: NSObject { }, failure: { [unowned self] bannerType, event, errorDetails, error in var statParams = errorDetails statParams[kStatErrorMessage] = (error as NSError).userInfo.reduce("") { $0 + "\($1.key) : \($1.value)\n" } - Crashlytics.crashlytics().record(error: error) self.setError(bannerType: bannerType) }, click: { banner in Statistics.logEvent(kStatPlacePageBannerClick, withParameters: banner.statisticsDescription) diff --git a/iphone/Maps/Core/Settings/MWMSettings.h b/iphone/Maps/Core/Settings/MWMSettings.h index 2ff8251cbf..b54d682355 100644 --- a/iphone/Maps/Core/Settings/MWMSettings.h +++ b/iphone/Maps/Core/Settings/MWMSettings.h @@ -34,7 +34,4 @@ NS_SWIFT_NAME(Settings) + (BOOL)isTrackWarningAlertShown; + (void)setTrackWarningAlertShown:(BOOL)shown; -+ (BOOL)crashReportingDisabled; -+ (void)setCrashReportingDisabled:(BOOL)disabled; - @end diff --git a/iphone/Maps/Core/Settings/MWMSettings.mm b/iphone/Maps/Core/Settings/MWMSettings.mm index 1ab99030b6..d113b048e9 100644 --- a/iphone/Maps/Core/Settings/MWMSettings.mm +++ b/iphone/Maps/Core/Settings/MWMSettings.mm @@ -19,7 +19,6 @@ NSString * const kUDAutoNightModeOff = @"AutoNightModeOff"; NSString * const kThemeMode = @"ThemeMode"; NSString * const kSpotlightLocaleLanguageId = @"SpotlightLocaleLanguageId"; NSString * const kUDTrackWarningAlertWasShown = @"TrackWarningAlertWasShown"; -NSString * const kCrashReportingDisabled = @"CrashReportingDisabled"; } // namespace @implementation MWMSettings @@ -162,14 +161,4 @@ NSString * const kCrashReportingDisabled = @"CrashReportingDisabled"; [ud setBool:shown forKey:kUDTrackWarningAlertWasShown]; [ud synchronize]; } - -+ (BOOL)crashReportingDisabled -{ - return [[NSUserDefaults standardUserDefaults] boolForKey:kCrashReportingDisabled]; -} - -+ (void)setCrashReportingDisabled:(BOOL)disabled -{ - [[NSUserDefaults standardUserDefaults] setBool:disabled forKey:kCrashReportingDisabled]; -} @end diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 91b735186a..8010aa502f 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 04972684853070C687B7DEB5 /* Pods_OMaps.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81AACEA6A52B8EC27EF04388 /* Pods_OMaps.framework */; }; 1DA7908820762CEB008BDD6B /* libopen_location_code.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DA7908920762CEB008BDD6B /* libopen_location_code.a */; }; 1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */; }; 3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */; }; @@ -924,7 +923,6 @@ 1DFA2F6E20D3CA9200FB2C66 /* UIColorRoutines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIColorRoutines.h; sourceTree = ""; }; 28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Maps_Prefix.pch; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = main.mm; sourceTree = ""; }; - 2ED44CE4F4879D8E8BC4A9E0 /* Pods-OMaps.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OMaps.release.xcconfig"; path = "Target Support Files/Pods-OMaps/Pods-OMaps.release.xcconfig"; sourceTree = ""; }; 3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchCategoryCell.swift; sourceTree = ""; }; 33046831219C57180041F3A8 /* CategorySettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategorySettingsViewController.swift; sourceTree = ""; }; 330473E821F7440C00DC4AEA /* MWMHotelParams.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMHotelParams.h; sourceTree = ""; }; @@ -1560,7 +1558,6 @@ 4A7D89C41B2EBF3B00AC843E /* resources-xxhdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxhdpi_dark"; path = "../../data/resources-xxhdpi_dark"; sourceTree = ""; }; 5605022E1B6211E100169CAD /* sound-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "sound-strings"; path = "../../data/sound-strings"; sourceTree = ""; }; 56EE14D21FE804550036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 6713C7E64B4DBC46FEB37991 /* Pods-OMaps.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OMaps.debug.xcconfig"; path = "Target Support Files/Pods-OMaps/Pods-OMaps.debug.xcconfig"; sourceTree = ""; }; 671E78D21E6A423300B2859B /* librouting_common.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting_common.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/librouting_common.a"; sourceTree = ""; }; 6741AA5D1BF340DE002C974C /* OMaps Debug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "OMaps Debug.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 6741AAA21BF356B9002C974C /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "../../../omim-xcode-build/Debug/libagg.a"; sourceTree = ""; }; @@ -1590,7 +1587,6 @@ 67B78B441E422C970018E590 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; }; 67B78B541E42333C0018E590 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; }; 6B9978341C89A316003B8AA0 /* editor.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = editor.config; path = ../../data/editor.config; sourceTree = ""; }; - 81AACEA6A52B8EC27EF04388 /* Pods_OMaps.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OMaps.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D1107310486CEB800E47090 /* OMaps.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = OMaps.plist; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; 978D4A30199A11E600D72CA7 /* faq.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = faq.html; path = ../../data/faq.html; sourceTree = ""; }; 97A5967E19B9CD47007A963F /* copyright.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = copyright.html; path = ../../data/copyright.html; sourceTree = ""; }; @@ -2208,22 +2204,12 @@ 4563158920E264C20076E9DB /* libshaders.a in Frameworks */, 674A7E2A1C0DA579003D48E1 /* libdrape.a in Frameworks */, 34201E091DC0DC7300D24118 /* libpartners_api.a in Frameworks */, - 04972684853070C687B7DEB5 /* Pods_OMaps.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 044715AD432F538B6F731670 /* Pods */ = { - isa = PBXGroup; - children = ( - 6713C7E64B4DBC46FEB37991 /* Pods-OMaps.debug.xcconfig */, - 2ED44CE4F4879D8E8BC4A9E0 /* Pods-OMaps.release.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( @@ -2287,7 +2273,6 @@ 19C28FACFE9D520D11CA2CBB /* Products */, 29B97317FDCFA39411CA2CEA /* Resources */, F6E2FBFB1E097B9F0083EBEC /* UI */, - 044715AD432F538B6F731670 /* Pods */, ); indentWidth = 2; name = Maps; @@ -2376,7 +2361,6 @@ 3446C6761DDCA9A200146687 /* libtraffic.a */, 3462FD8A1DC1DF3A00906FD7 /* SDK */, 4598438921394D7700F8CAB2 /* shaders_metal.metallib */, - 81AACEA6A52B8EC27EF04388 /* Pods_OMaps.framework */, ); name = Frameworks; sourceTree = ""; @@ -4884,13 +4868,11 @@ isa = PBXNativeTarget; buildConfigurationList = 6741AA541BF340DE002C974C /* Build configuration list for PBXNativeTarget "OMaps" */; buildPhases = ( - DC18E8E671D9B333180B1B98 /* [CP] Check Pods Manifest.lock */, 47C7F96D2191A3B600C2760C /* ShellScript */, 6741A9411BF340DE002C974C /* Resources */, 6741A9A01BF340DE002C974C /* Sources */, 6741AA311BF340DE002C974C /* Frameworks */, 4740184523F5BDE900A93C81 /* Embed Frameworks */, - B4C96EE056F4E85FC735BCD2 /* [CP] Embed Pods Frameworks */, 6B92E5CF25C090C200304F2D /* Firebase Crashlytics */, ); buildRules = ( @@ -5222,60 +5204,6 @@ shellPath = /bin/sh; shellScript = "#!/bin/bash\necho \"[Firebase Crashlytics] start\"\n\nLOWERED_CONFIG=`echo $CONFIGURATION | tr [A-Z] [a-z]`\n\nPLIST_PATH=\"${PROJECT_DIR}/${BUNDLE_IDENTIFIER}/GoogleService-Info.plist\"\nDSYM_PATH=\"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}\"\nBUILD_APP_DIR=\"${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}\"\n\necho \"[Firebase Crashlytics] dsyms: ${DSYM_PATH}\"\necho \"[Firebase Crashlytics] plist: ${PLIST_PATH}\"\n\nif [[ $LOWERED_CONFIG == *release* ]]; then\n if [ ! -f ${PLIST_PATH} ]; then\n echo \"[Firebase Crashlytics] Google plist not found!\"\n exit 1\n fi\n cp ${PLIST_PATH} $BUILD_APP_DIR/GoogleService-Info.plist\n \n #TODO: Do not upload symbols each build (too large). Do it manually or move to production config. \n #${PODS_ROOT}/FirebaseCrashlytics/upload-symbols -gsp ${PLIST_PATH} -p ios ${DSYM_PATH}\n \n echo \"[Firebase Crashlytics] done\"\nfi\n"; }; - B4C96EE056F4E85FC735BCD2 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OMaps/Pods-OMaps-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCrashlytics/FirebaseCrashlytics.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework", - "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", - "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", - "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", - "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCrashlytics.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OMaps/Pods-OMaps-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - DC18E8E671D9B333180B1B98 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-OMaps-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -6025,7 +5953,6 @@ /* Begin XCBuildConfiguration section */ 6741AA571BF340DE002C974C /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6713C7E64B4DBC46FEB37991 /* Pods-OMaps.debug.xcconfig */; buildSettings = { CODE_SIGN_ENTITLEMENTS = "OMaps-Debug.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; @@ -6045,7 +5972,6 @@ }; 6741AA5A1BF340DE002C974C /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2ED44CE4F4879D8E8BC4A9E0 /* Pods-OMaps.release.xcconfig */; buildSettings = { CODE_SIGN_ENTITLEMENTS = "OMaps-Release.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; diff --git a/iphone/Maps/Podfile b/iphone/Maps/Podfile deleted file mode 100644 index aaa011af50..0000000000 --- a/iphone/Maps/Podfile +++ /dev/null @@ -1,13 +0,0 @@ -# Uncomment the next line to define a global platform for your project -platform :ios, '12.0' - -workspace './../../xcode/omim.xcworkspace' - -target 'OMaps' do - use_frameworks! - - # Pods for OMaps - pod 'Firebase/Crashlytics' - pod 'Firebase/Analytics' - -end diff --git a/iphone/Maps/Podfile.lock b/iphone/Maps/Podfile.lock deleted file mode 100644 index 382e781996..0000000000 --- a/iphone/Maps/Podfile.lock +++ /dev/null @@ -1,108 +0,0 @@ -PODS: - - Firebase/Analytics (7.7.0): - - Firebase/Core - - Firebase/Core (7.7.0): - - Firebase/CoreOnly - - FirebaseAnalytics (= 7.7.0) - - Firebase/CoreOnly (7.7.0): - - FirebaseCore (= 7.7.0) - - Firebase/Crashlytics (7.7.0): - - Firebase/CoreOnly - - FirebaseCrashlytics (~> 7.7.0) - - FirebaseAnalytics (7.7.0): - - FirebaseCore (~> 7.0) - - FirebaseInstallations (~> 7.0) - - GoogleAppMeasurement (= 7.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.0) - - GoogleUtilities/MethodSwizzler (~> 7.0) - - GoogleUtilities/Network (~> 7.0) - - "GoogleUtilities/NSData+zlib (~> 7.0)" - - nanopb (~> 2.30907.0) - - FirebaseCore (7.7.0): - - FirebaseCoreDiagnostics (~> 7.4) - - GoogleUtilities/Environment (~> 7.0) - - GoogleUtilities/Logger (~> 7.0) - - FirebaseCoreDiagnostics (7.7.0): - - GoogleDataTransport (~> 8.0) - - GoogleUtilities/Environment (~> 7.0) - - GoogleUtilities/Logger (~> 7.0) - - nanopb (~> 2.30907.0) - - FirebaseCrashlytics (7.7.0): - - FirebaseCore (~> 7.0) - - FirebaseInstallations (~> 7.0) - - GoogleDataTransport (~> 8.0) - - nanopb (~> 2.30907.0) - - PromisesObjC (~> 1.2) - - FirebaseInstallations (7.7.0): - - FirebaseCore (~> 7.0) - - GoogleUtilities/Environment (~> 7.0) - - GoogleUtilities/UserDefaults (~> 7.0) - - PromisesObjC (~> 1.2) - - GoogleAppMeasurement (7.7.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.0) - - GoogleUtilities/MethodSwizzler (~> 7.0) - - GoogleUtilities/Network (~> 7.0) - - "GoogleUtilities/NSData+zlib (~> 7.0)" - - nanopb (~> 2.30907.0) - - GoogleDataTransport (8.2.0): - - nanopb (~> 2.30907.0) - - GoogleUtilities/AppDelegateSwizzler (7.2.2): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Environment (7.2.2): - - PromisesObjC (~> 1.2) - - GoogleUtilities/Logger (7.2.2): - - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.2.2): - - GoogleUtilities/Logger - - GoogleUtilities/Network (7.2.2): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.2.2)" - - GoogleUtilities/Reachability (7.2.2): - - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.2.2): - - GoogleUtilities/Logger - - nanopb (2.30907.0): - - nanopb/decode (= 2.30907.0) - - nanopb/encode (= 2.30907.0) - - nanopb/decode (2.30907.0) - - nanopb/encode (2.30907.0) - - PromisesObjC (1.2.12) - -DEPENDENCIES: - - Firebase/Analytics - - Firebase/Crashlytics - -SPEC REPOS: - trunk: - - Firebase - - FirebaseAnalytics - - FirebaseCore - - FirebaseCoreDiagnostics - - FirebaseCrashlytics - - FirebaseInstallations - - GoogleAppMeasurement - - GoogleDataTransport - - GoogleUtilities - - nanopb - - PromisesObjC - -SPEC CHECKSUMS: - Firebase: cd2ab85eec8170dc260186159f21072ecb679ad5 - FirebaseAnalytics: f3f8f75de34fe04141a69bb1c4bd7e24a80178e1 - FirebaseCore: ac35d680a0bf32319a59966a1478e0741536b97b - FirebaseCoreDiagnostics: 179bf3831213451c8addd036aca7fcf5492ec154 - FirebaseCrashlytics: 47af228115805e190b566db12c028263531b8ce0 - FirebaseInstallations: 42c86e7b02ff75b7f27f85833bf5dcb5f38a9774 - GoogleAppMeasurement: 0c3b134b2c0a90c4c24833873894bfe0e42a0384 - GoogleDataTransport: 1024b1a4dfbd7a0e92cb20d7e0a6f1fb66b449a4 - GoogleUtilities: 31c5b01f978a70c6cff2afc6272b3f1921614b43 - nanopb: 59221d7f958fb711001e6a449489542d92ae113e - PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97 - -PODFILE CHECKSUM: 618bf912c2cc62124083b7fea445d26ce9b50ae6 - -COCOAPODS: 1.10.1 diff --git a/iphone/Maps/UI/Settings/MWMAboutController.m b/iphone/Maps/UI/Settings/MWMAboutController.m index c8aa74d053..8294836b43 100644 --- a/iphone/Maps/UI/Settings/MWMAboutController.m +++ b/iphone/Maps/UI/Settings/MWMAboutController.m @@ -4,7 +4,7 @@ #import "SwiftBridge.h" -@interface MWMAboutController () +@interface MWMAboutController () @property(weak, nonatomic) IBOutlet UILabel * versionLabel; @property(weak, nonatomic) IBOutlet UILabel * dataVersionLabel; @@ -15,7 +15,6 @@ @property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * osmCell; @property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * rateCell; @property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * adsCell; -@property(weak, nonatomic) IBOutlet SettingsTableViewSwitchCell * crashlyticsCell; @property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * privacyPolicyCell; @property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * termsOfUseCell; @property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * copyrightCell; @@ -41,8 +40,6 @@ self.versionLabel.text = [NSString stringWithFormat:L(@"version"), version]; self.dataVersionLabel.text = [NSString stringWithFormat:L(@"data_version"), [MWMFrameworkHelper dataVersion]]; - - [self.crashlyticsCell configWithDelegate:self title:L(@"opt_out_fabric") isOn:![MWMSettings crashReportingDisabled]]; } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath @@ -101,13 +98,4 @@ { return section == 2 ? L(@"opt_out_fabric_description") : nil; } - -#pragma mark - SettingsTableViewSwitchCellDelegate - -- (void)switchCell:(SettingsTableViewSwitchCell *)cell didChangeValue:(BOOL)value -{ - if (cell == self.crashlyticsCell) - [MWMSettings setCrashReportingDisabled:!value]; -} - @end diff --git a/iphone/Maps/UI/Storyboard/Settings.storyboard b/iphone/Maps/UI/Storyboard/Settings.storyboard index 6df50fe637..43b00eccaf 100644 --- a/iphone/Maps/UI/Storyboard/Settings.storyboard +++ b/iphone/Maps/UI/Storyboard/Settings.storyboard @@ -1622,40 +1622,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1758,7 +1724,6 @@ -