correct spellings

This commit is contained in:
Danmei Chen 2020-04-17 15:21:26 +02:00
parent a35eaf8217
commit a15cb46837
8 changed files with 26 additions and 26 deletions

View file

@ -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

View file

@ -21,7 +21,7 @@
#import <asl.h>
#import <os/log.h>
#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"]);

18
Podfile
View file

@ -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

View file

@ -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.

View file

@ -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;

View file

@ -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")

View file

@ -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")

View file

@ -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
}