From 5a8d321b3bfc09844c7c4a06fc6ccd86d629b278 Mon Sep 17 00:00:00 2001 From: fractalwrench Date: Thu, 18 Jan 2018 10:15:30 +0000 Subject: [PATCH] prefix obj-c methods --- bugsnag-android | 2 +- src/Assets/Standard Assets/Bugsnag/Bugsnag.cs | 30 ++++---- src/BugsnagUnity.mm | 68 +++++++++---------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/bugsnag-android b/bugsnag-android index e2da1b9a5d..914c62ed2a 160000 --- a/bugsnag-android +++ b/bugsnag-android @@ -1 +1 @@ -Subproject commit e2da1b9a5dc5ce982220abffccdaa1b09e89159e +Subproject commit 914c62ed2ab15de4cbd0b5d0fcc8b1d7340ce28e diff --git a/src/Assets/Standard Assets/Bugsnag/Bugsnag.cs b/src/Assets/Standard Assets/Bugsnag/Bugsnag.cs index 4fb40651e6..d0e42e3744 100644 --- a/src/Assets/Standard Assets/Bugsnag/Bugsnag.cs +++ b/src/Assets/Standard Assets/Bugsnag/Bugsnag.cs @@ -27,49 +27,49 @@ public static void Register(string apiKey) { Register(apiKey, false); } #if (UNITY_IPHONE || UNITY_IOS || UNITY_TVOS || UNITY_WEBGL || UNITY_STANDALONE_OSX) && !UNITY_EDITOR - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGRegister")] public static extern void Register(string apiKey, bool trackSessions); - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGNotify")] public static extern void Notify(string errorClass, string errorMessage, string severity, string context, string stackTrace, string type, string severityReason); - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGSetNotifyUrl")] public static extern void SetNotifyUrl(string notifyUrl); - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGSetAutoNotify")] public static extern void SetAutoNotify(bool autoNotify); - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGSetContext")] public static extern void SetContext(string context); - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGSetReleaseStage")] public static extern void SetReleaseStage(string releaseStage); - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGSetNotifyReleaseStages")] public static extern void SetNotifyReleaseStages(string releaseStages); - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGAddToTab")] public static extern void AddToTab(string tabName, string attributeName, string attributeValue); - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGClearTab")] public static extern void ClearTab(string tabName); - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGLeaveBreadcrumb")] public static extern void LeaveBreadcrumb(string breadcrumb); - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGSetBreadcrumbCapacity")] public static extern void SetBreadcrumbCapacity(int capacity); - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGSetAppVersion")] public static extern void SetAppVersion(string appVersion); - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGSetUser")] public static extern void SetUser(string userId, string userName, string userEmail); - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGStartSession")] public static extern void StartSession(); - [DllImport (dllName)] + [DllImport (dllName, EntryPoint = "BSGSetSessionUrl")] public static extern void SetSessionUrl(string sessionUrl); #elif UNITY_ANDROID && !UNITY_EDITOR diff --git a/src/BugsnagUnity.mm b/src/BugsnagUnity.mm index f0b0c9ca4a..27bff3d9b4 100644 --- a/src/BugsnagUnity.mm +++ b/src/BugsnagUnity.mm @@ -6,23 +6,23 @@ + (id)notifier; @end extern "C" { - void SetContext(char *context); - void SetReleaseStage(char *releaseStage); - void SetAutoNotify(int autoNotify); - void Notify(char *errorClass, char *errorMessage, char *severity, char *context, char *stackTrace, char *logType, char *severityReason); - void Register(char *apiKey, bool trackSessions); - void AddToTab(char *tabName, char *attributeName, char *attributeValue); - void ClearTab(char *tabName); - void LeaveBreadcrumb(char *breadcrumb); - void SetBreadcrumbCapacity(int capacity); - void SetAppVersion(char *version); - void SetUser(char *userId, char *userName, char *userEmail); - void ExampleNativeCrash(); - void ExampleCrashInBackground(); - - NSMutableArray *parseStackTrace(NSString *stackTrace, NSRegularExpression *stacktraceRegex); - - BSGSeverity ParseBugsnagSeverity(NSString *severity) { + void BSGSetContext(char *context); + void BSGSetReleaseStage(char *releaseStage); + void BSGSetAutoNotify(int autoNotify); + void BSGNotify(char *errorClass, char *errorMessage, char *severity, char *context, char *stackTrace, char *logType, char *severityReason); + void BSGRegister(char *apiKey, bool trackSessions); + void BSGAddToTab(char *tabName, char *attributeName, char *attributeValue); + void BSGClearTab(char *tabName); + void BSGLeaveBreadcrumb(char *breadcrumb); + void BSGSetBreadcrumbCapacity(int capacity); + void BSGSetAppVersion(char *version); + void BSGSetUser(char *userId, char *userName, char *userEmail); + void BSGExampleNativeCrash(); + void BSGExampleCrashInBackground(); + + NSMutableArray *BSGparseStackTrace(NSString *stackTrace, NSRegularExpression *stacktraceRegex); + + BSGSeverity BSGParseBugsnagSeverity(NSString *severity) { if ([severity isEqualToString:@"info"]) return BSGSeverityInfo; else if ([severity isEqualToString:@"warning"]) @@ -30,17 +30,17 @@ BSGSeverity ParseBugsnagSeverity(NSString *severity) { return BSGSeverityError; } - void SetContext(char *context) { + void BSGSetContext(char *context) { NSString *ns_context = [NSString stringWithUTF8String: context]; [Bugsnag configuration].context = ns_context; } - void SetReleaseStage(char *releaseStage) { + void BSGSetReleaseStage(char *releaseStage) { NSString *ns_releaseStage = [NSString stringWithUTF8String: releaseStage]; [Bugsnag configuration].releaseStage = ns_releaseStage; } - void SetNotifyReleaseStages(char *notifyReleaseStages) { + void BSGSetNotifyReleaseStages(char *notifyReleaseStages) { NSString *ns_notifyReleaseStages = [NSString stringWithUTF8String: notifyReleaseStages]; if ([ns_notifyReleaseStages isEqualToString: @""]) { [Bugsnag configuration].notifyReleaseStages = @[]; @@ -49,33 +49,33 @@ void SetNotifyReleaseStages(char *notifyReleaseStages) { } } - void SetSessionUrl(char *url) { + void BSGSetSessionUrl(char *url) { NSString *ns_url = [NSString stringWithUTF8String:url]; [Bugsnag configuration].sessionURL = [NSURL URLWithString: ns_url]; } - void SetNotifyUrl(char *notifyUrl) { + void BSGSetNotifyUrl(char *notifyUrl) { NSString *ns_notifyUrl = [NSString stringWithUTF8String:notifyUrl]; [Bugsnag configuration].notifyURL = [NSURL URLWithString: ns_notifyUrl]; } - void SetAutoNotify(int autoNotify) { + void BSGSetAutoNotify(int autoNotify) { [Bugsnag configuration].autoNotify = autoNotify; } - void AddToTab(char *tabName, char *attributeName, char *attributeValue) { + void BSGAddToTab(char *tabName, char *attributeName, char *attributeValue) { NSString *ns_tabName = [NSString stringWithUTF8String:tabName]; NSString *ns_attributeName = [NSString stringWithUTF8String:attributeName]; NSString *ns_attributeValue = [NSString stringWithUTF8String:attributeValue]; [Bugsnag addAttribute:ns_attributeName withValue:ns_attributeValue toTabWithName:ns_tabName]; } - void ClearTab(char *tabName) { + void BSGClearTab(char *tabName) { NSString *ns_tabName = [NSString stringWithUTF8String:tabName]; [Bugsnag clearTabWithName:ns_tabName]; } - void Notify(char *errorClass, char *errorMessage, char *severity, char *context, char *stackTrace, char *logType, char *severityReason) { + void BSGNotify(char *errorClass, char *errorMessage, char *severity, char *context, char *stackTrace, char *logType, char *severityReason) { NSString *ns_errorClass = [NSString stringWithUTF8String:errorClass]; NSString *ns_errorMessage = [NSString stringWithUTF8String:errorMessage]; NSString *ns_severity = [NSString stringWithUTF8String:severity]; @@ -88,7 +88,7 @@ void Notify(char *errorClass, char *errorMessage, char *severity, char *context, options:NSRegularExpressionCaseInsensitive error:nil]; - NSMutableArray *stacktrace = parseStackTrace(ns_stackTrace, unityExpression); + NSMutableArray *stacktrace = BSGparseStackTrace(ns_stackTrace, unityExpression); NSException * exception = [NSException exceptionWithName:ns_errorClass reason:ns_errorMessage userInfo:NULL]; @@ -125,7 +125,7 @@ void Notify(char *errorClass, char *errorMessage, char *severity, char *context, }); } - void Register(char *apiKey, bool trackSessions) { + void BSGRegister(char *apiKey, bool trackSessions) { NSString *ns_apiKey = [NSString stringWithUTF8String: apiKey]; // Disable thread suspension so there is no noticable lag in sending Bugsnags @@ -153,30 +153,30 @@ void Register(char *apiKey, bool trackSessions) { } forKey:@"details"]; } - void StartSession() { + void BSGStartSession() { [Bugsnag startSession]; } - void LeaveBreadcrumb(char *breadcrumb) { + void BSGLeaveBreadcrumb(char *breadcrumb) { [Bugsnag leaveBreadcrumbWithMessage: [NSString stringWithUTF8String:breadcrumb]]; } - void SetBreadcrumbCapacity(int capacity) { + void BSGSetBreadcrumbCapacity(int capacity) { [Bugsnag setBreadcrumbCapacity: (NSUInteger)capacity]; } - void SetAppVersion(char *version) { + void BSGSetAppVersion(char *version) { [Bugsnag configuration].appVersion = [NSString stringWithUTF8String:version]; } - void SetUser(char *userId, char *userName, char *userEmail) { + void BSGSetUser(char *userId, char *userName, char *userEmail) { NSString *ns_userId = [NSString stringWithUTF8String: userId]; NSString *ns_userName = [NSString stringWithUTF8String: userName]; NSString *ns_userEmail = [NSString stringWithUTF8String: userEmail]; [[Bugsnag configuration] setUser:ns_userId withName:ns_userName andEmail:ns_userEmail]; } - NSMutableArray *parseStackTrace(NSString *stackTrace, NSRegularExpression *stacktraceRegex) { + NSMutableArray *BSGparseStackTrace(NSString *stackTrace, NSRegularExpression *stacktraceRegex) { NSMutableArray *returnArray = [[NSMutableArray alloc] init]; [stacktraceRegex enumerateMatchesInString:stackTrace options:0 range:NSMakeRange(0, [stackTrace length]) usingBlock:^(NSTextCheckingResult *result, NSMatchingFlags flags, BOOL *stop) {