From a15cb4683763864b06bbbe1f7208970a9a7c1f5b Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Fri, 17 Apr 2020 15:21:26 +0200 Subject: [PATCH] correct spellings --- Classes/LinphoneAppDelegate.m | 4 ++-- Classes/Utils/Log.m | 6 +++--- Podfile | 18 +++++++++--------- README.md | 6 +++--- linphone.xcodeproj/project.pbxproj | 6 +++--- msgNotification/Utils.swift | 4 ++-- .../NotificationViewController.swift | 4 ++-- .../NotificationService.swift | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 1092da7ee..8068ac8d0 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -31,7 +31,7 @@ #include "LinphoneManager.h" #include "linphone/linphonecore.h" -#ifdef USE_CRASHLYTHICS +#ifdef USE_CRASHLYTICS #include "FIRApp.h" #endif @@ -245,7 +245,7 @@ #pragma deploymate pop - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { -#ifdef USE_CRASHLYTHICS +#ifdef USE_CRASHLYTICS [FIRApp configure]; #endif diff --git a/Classes/Utils/Log.m b/Classes/Utils/Log.m index 2f366df70..77b17b11c 100644 --- a/Classes/Utils/Log.m +++ b/Classes/Utils/Log.m @@ -21,7 +21,7 @@ #import #import -#ifdef USE_CRASHLYTHICS +#ifdef USE_CRASHLYTICS @import FirebaseCrashlytics; #endif @@ -106,14 +106,14 @@ void linphone_iphone_log_handler(const char *domain, OrtpLogLevel lev, const cha for (int i = 0; i < myWords.count; i++) { NSString *tab = i > 0 ? @"\t" : @""; if (((NSString *)myWords[i]).length > 0) { -#ifdef USE_CRASHLYTHICS +#ifdef USE_CRASHLYTICS [[FIRCrashlytics crashlytics] logWithFormat:@"[%@] %@%@", lvl, tab, (NSString *)myWords[i]]; #endif NSLog(@"[%@] %@%@", lvl, tab, (NSString *)myWords[i]); } } } else { -#ifdef USE_CRASHLYTHICS +#ifdef USE_CRASHLYTICS [[FIRCrashlytics crashlytics] logWithFormat:@"[%@] %@", lvl, [formatedString stringByReplacingOccurrencesOfString:@"\r\n" withString:@"\n"]]; #endif NSLog(@"[%@] %@", lvl, [formatedString stringByReplacingOccurrencesOfString:@"\r\n" withString:@"\n"]); diff --git a/Podfile b/Podfile index 9232eb6bc..289f67880 100644 --- a/Podfile +++ b/Podfile @@ -10,7 +10,7 @@ def basic_pods pod 'linphone-sdk/basic-frameworks', :path => ENV['PODFILE_PATH'] # local sdk end - crashlythics + crashlytics end def ext_pods @@ -20,11 +20,11 @@ def ext_pods pod 'linphone-sdk/app-extension-swift', :path => ENV['PODFILE_PATH'] # local sdk end - crashlythics + crashlytics end -def crashlythics - if not ENV['USE_CRASHLYTHICS'].nil? +def crashlytics + if not ENV['USE_CRASHLYTICS'].nil? pod 'Firebase/Analytics' pod 'Firebase/Crashlytics' end @@ -80,7 +80,7 @@ post_install do |installer| app_project = Xcodeproj::Project.open(Dir.glob("*.xcodeproj")[0]) app_project.native_targets.each do |target| target.build_configurations.each do |config| - if ENV['USE_CRASHLYTHICS'].nil? + if ENV['USE_CRASHLYTICS'].nil? if config.name == "Debug" then config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) DEBUG=1' else @@ -90,14 +90,14 @@ post_install do |installer| config.build_settings['OTHER_SWIFT_FLAGS'] = '$(inherited)' end else - # activate crashlythics + # activate crashlytics if config.name == "Debug" then - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) DEBUG=1 USE_CRASHLYTHICS=1' + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) DEBUG=1 USE_CRASHLYTICS=1' else - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) USE_CRASHLYTHICS=1' + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) USE_CRASHLYTICS=1' end if target.name == 'msgNotificationService' || target.name == 'msgNotificationContent' - config.build_settings['OTHER_SWIFT_FLAGS'] = '$(inherited) -DUSE_CRASHLYTHICS' + config.build_settings['OTHER_SWIFT_FLAGS'] = '$(inherited) -DUSE_CRASHLYTICS' end end diff --git a/README.md b/README.md index 18f834334..a1877cdb1 100644 --- a/README.md +++ b/README.md @@ -108,16 +108,16 @@ See: https://developer.apple.com/library/archive/documentation/DeveloperTools/Co - Then open linphone.xcworkspace with Xcode to build and run the app. -# Enabling crashlythics +# Enabling crashlytics -We've integrated Crashlythics into liphone-iphone, which can automatically send crash reports. It is disabled by default. +We've integrated Crashlytics into liphone-iphone, which can automatically send crash reports. It is disabled by default. To activate it: - Replace the GoogleService-Info.plist for this project with yours (specific to your crashlytics account). - Rebuild the project: ``` - USE_CRASHLYTHICS=true pod install + USE_CRASHLYTICS=true pod install ``` - Then open `linphone.xcworkspace` with Xcode to build and run the app. diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 1d60b4fc6..fdf8e73eb 100644 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -4024,7 +4024,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "val=`expr \"$GCC_PREPROCESSOR_DEFINITIONS\" : \".*USE_CRASHLYTHICS=\\([0-9]*\\)\"`\nif [ $val = 1 ]; then\n ${PODS_ROOT}/FirebaseCrashlytics/run\nfi\n"; + shellScript = "val=`expr \"$GCC_PREPROCESSOR_DEFINITIONS\" : \".*USE_CRASHLYTICS=\\([0-9]*\\)\"`\nif [ $val = 1 ]; then\n ${PODS_ROOT}/FirebaseCrashlytics/run\nfi\n"; }; 6112A01A243B2CCF00DBD5F5 /* Run Script */ = { isa = PBXShellScriptBuildPhase; @@ -4044,7 +4044,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "val=`expr \"$GCC_PREPROCESSOR_DEFINITIONS\" : \".*USE_CRASHLYTHICS=\\([0-9]*\\)\"`\nif [ $val = 1 ]; then\n ${PODS_ROOT}/FirebaseCrashlytics/run\nfi\n"; + shellScript = "val=`expr \"$GCC_PREPROCESSOR_DEFINITIONS\" : \".*USE_CRASHLYTICS=\\([0-9]*\\)\"`\nif [ $val = 1 ]; then\n ${PODS_ROOT}/FirebaseCrashlytics/run\nfi\n"; }; 614D0A1821E77F5300C43EDF /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -4063,7 +4063,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "val=`expr \"$GCC_PREPROCESSOR_DEFINITIONS\" : \".*USE_CRASHLYTHICS=\\([0-9]*\\)\"`\nif [ $val = 1 ]; then\n ${PODS_ROOT}/FirebaseCrashlytics/run\nfi\n\n\n"; + shellScript = "val=`expr \"$GCC_PREPROCESSOR_DEFINITIONS\" : \".*USE_CRASHLYTICS=\\([0-9]*\\)\"`\nif [ $val = 1 ]; then\n ${PODS_ROOT}/FirebaseCrashlytics/run\nfi\n\n\n"; }; 63DCC71D1A07B08E00916627 /* Run Script */ = { isa = PBXShellScriptBuildPhase; diff --git a/msgNotification/Utils.swift b/msgNotification/Utils.swift index 90da58b3e..66e209ff2 100644 --- a/msgNotification/Utils.swift +++ b/msgNotification/Utils.swift @@ -18,7 +18,7 @@ */ import linphonesw -#if USE_CRASHLYTHICS +#if USE_CRASHLYTICS import Firebase #endif @@ -66,7 +66,7 @@ class LinphoneLoggingServiceManager: LoggingServiceDelegate { level = "unknown" } -#if USE_CRASHLYTHICS +#if USE_CRASHLYTICS Crashlytics.crashlytics().log("\(level) [\(domain)] \(message)\n") #endif NSLog("\(level) [\(domain)] \(message)\n") diff --git a/msgNotificationContent/NotificationViewController.swift b/msgNotificationContent/NotificationViewController.swift index 136943a7c..64102a91e 100644 --- a/msgNotificationContent/NotificationViewController.swift +++ b/msgNotificationContent/NotificationViewController.swift @@ -21,7 +21,7 @@ import UIKit import UserNotifications import UserNotificationsUI import linphonesw -#if USE_CRASHLYTHICS +#if USE_CRASHLYTICS import Firebase #endif @@ -42,7 +42,7 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi override func viewDidLoad() { super.viewDidLoad() // Do any required interface initialization here. -#if USE_CRASHLYTHICS +#if USE_CRASHLYTICS FirebaseApp.configure() #endif NSLog("[msgNotificationContent] start msgNotificationContent extension") diff --git a/msgNotificationService/NotificationService.swift b/msgNotificationService/NotificationService.swift index b908a7d89..6099e67cd 100644 --- a/msgNotificationService/NotificationService.swift +++ b/msgNotificationService/NotificationService.swift @@ -19,7 +19,7 @@ import UserNotifications import linphonesw -#if USE_CRASHLYTHICS +#if USE_CRASHLYTICS import Firebase #endif @@ -46,7 +46,7 @@ class NotificationService: UNNotificationServiceExtension { override init() { super.init() -#if USE_CRASHLYTHICS +#if USE_CRASHLYTICS FirebaseApp.configure() #endif }