Skip to content
This repository was archived by the owner on Feb 19, 2020. It is now read-only.

Commit 5896eee

Browse files
author
Christoph Wendt
committed
Merge branch 'feature/update-hockey-sdk-3.6.4' into develop
2 parents 9f39a0d + 5149145 commit 5896eee

File tree

276 files changed

+478
-234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

276 files changed

+478
-234
lines changed

ExampleGame/Assets/Editor.meta

100755100644
File mode changed.

ExampleGame/Assets/Editor/PostprocessBuildPlayer

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,32 @@
11
#!/usr/bin/env python
2+
#
3+
# Author: Christoph Wendt
4+
#
5+
# Version: 1.0.7
6+
#
7+
# Copyright (c) 2013-2015 HockeyApp, Bit Stadium GmbH.
8+
# All rights reserved.
9+
#
10+
# Permission is hereby granted, free of charge, to any person
11+
# obtaining a copy of this software and associated documentation
12+
# files (the "Software"), to deal in the Software without
13+
# restriction, including without limitation the rights to use,
14+
# copy, modify, merge, publish, distribute, sublicense, and/or sell
15+
# copies of the Software, and to permit persons to whom the
16+
# Software is furnished to do so, subject to the following
17+
# conditions:
18+
#
19+
# The above copyright notice and this permission notice shall be
20+
# included in all copies or substantial portions of the Software.
21+
#
22+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
23+
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
24+
# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
25+
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
26+
# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
27+
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
28+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
29+
# OTHER DEALINGS IN THE SOFTWARE.
230

331
import sys, os.path
432
import plistlib

ExampleGame/Assets/Editor/PostprocessBuildPlayer.meta

100755100644
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ExampleGame/Assets/Editor/mod_pbxproj.py.meta

100755100644
File mode changed.

ExampleGame/Assets/Editor/plistlib.py.meta

100755100644
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ExampleGame/Assets/HockeyAppUnityIOS.meta

100755100644
File mode changed.

ExampleGame/Assets/HockeyAppUnityIOS/ExamplePlugin.h.meta

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ExampleGame/Assets/HockeyAppUnityIOS/ExamplePluginWrapper.h.meta

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ExampleGame/Assets/HockeyAppUnityIOS/ExamplePluginWrapper.m.meta

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ExampleGame/Assets/HockeyAppUnityIOS/HockeyAppUnity-Scripts/HockeyAppIOS.cs

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* Author: Christoph Wendt
44
*
5-
* Version 1.0.6
5+
* Version 1.0.7
66
*
77
* Copyright (c) 2013-2015 HockeyApp, Bit Stadium GmbH.
88
* All rights reserved.
@@ -90,20 +90,19 @@ void OnEnable(){
9090

9191
#if (UNITY_IPHONE && !UNITY_EDITOR)
9292
if(exceptionLogging == true){
93-
System.AppDomain.CurrentDomain.UnhandledException += new System.UnhandledExceptionEventHandler(OnHandleUnresolvedException);
93+
System.AppDomain.CurrentDomain.UnhandledException += OnHandleUnresolvedException;
9494
Application.logMessageReceived += OnHandleLogCallback;
9595
}
9696
#endif
9797
}
9898

9999
void OnDisable(){
100-
101-
Application.logMessageReceived -= OnHandleLogCallback;
102-
}
103-
104-
void OnDestroy(){
105-
106-
Application.logMessageReceived -= OnHandleLogCallback;
100+
#if (UNITY_IPHONE && !UNITY_EDITOR)
101+
if(exceptionLogging == true){
102+
System.AppDomain.CurrentDomain.UnhandledException -= OnHandleUnresolvedException;
103+
Application.logMessageReceived -= OnHandleLogCallback;
104+
}
105+
#endif
107106
}
108107

109108
void GameViewLoaded(string message) {
@@ -421,11 +420,10 @@ protected virtual void HandleException(string logString, string stackTrace){
421420
public void OnHandleLogCallback(string logString, string stackTrace, LogType type){
422421

423422
#if (UNITY_IPHONE && !UNITY_EDITOR)
424-
if(LogType.Assert != type && LogType.Exception != type)
423+
if(LogType.Assert == type || LogType.Exception == type || LogType.Error == type)
425424
{
426-
return;
425+
HandleException(logString, stackTrace);
427426
}
428-
HandleException(logString, stackTrace);
429427
#endif
430428
}
431429

@@ -437,13 +435,11 @@ public void OnHandleUnresolvedException(object sender, System.UnhandledException
437435
return;
438436
}
439437

440-
if(args.ExceptionObject.GetType() != typeof(System.Exception))
438+
if(args.ExceptionObject.GetType() == typeof(System.Exception))
441439
{
442-
return;
440+
System.Exception e = (System.Exception)args.ExceptionObject;
441+
HandleException(e.Source, e.StackTrace);
443442
}
444-
445-
System.Exception e = (System.Exception)args.ExceptionObject;
446-
HandleException(e.Source, e.StackTrace);
447443
#endif
448444
}
449445
}

0 commit comments

Comments
 (0)