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

Commit 4ebd804

Browse files
author
chrwend
committed
Merge branch 'release/1.1.5'
# Conflicts: # Plugin/HockeyAppUnityIOS/HockeyAppUnity-Scripts/HockeyAppIOS.cs
2 parents 4b8e6c9 + 5103c8f commit 4ebd804

File tree

68 files changed

+120
-113
lines changed

Some content is hidden

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

68 files changed

+120
-113
lines changed

Documentation/Changelog.md

Lines changed: 4 additions & 0 deletions

ExampleGame/Assets/Editor/PostBuildTrigger.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private static void InsertCodeIntoClass(string filepath, string[] methodSignatur
126126
newContents.Add(valuesToAppend[foundIndex] + rn);
127127
found = false;
128128
} else if((positionsInMethod[foundIndex] == Position.End) && line.Trim().Equals("}")) {
129-
newContents = newContents.GetRange(0, newContents.Count - 3);
129+
newContents = newContents.GetRange(0, newContents.Count - 1);
130130
newContents.Add(valuesToAppend[foundIndex] + rn + "}" + rn);
131131
found = false;
132132
}

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using UnityEngine;
1+
/*
2+
* Version: 1.1.5
3+
*/
4+
5+
using UnityEngine;
26
using System.Collections;
37
using System.Collections.Generic;
48
using System;
@@ -12,6 +16,7 @@ public class HockeyAppIOS : MonoBehaviour
1216
protected const string HOCKEYAPP_CRASHESPATH = "api/2/apps/[APPID]/crashes/upload";
1317
protected const string LOG_FILE_DIR = "/logs/";
1418
protected const int MAX_CHARS = 199800;
19+
private static HockeyAppIOS instance;
1520

1621
public enum AuthenticatorType
1722
{
@@ -63,6 +68,11 @@ void Awake ()
6368
{
6469

6570
#if (UNITY_IPHONE && !UNITY_EDITOR)
71+
if (instance != null) {
72+
Destroy(gameObject);
73+
return;
74+
}
75+
6676
DontDestroyOnLoad(gameObject);
6777
CreateLogDirectory();
6878

@@ -102,6 +112,7 @@ void GameViewLoaded (string message)
102112
string urlString = GetBaseURL();
103113
string authTypeString = GetAuthenticatorTypeString();
104114
HockeyApp_StartHockeyManager(appID, urlString, authTypeString, secret, updateAlert, userMetrics, autoUploadCrashes);
115+
instance = this;
105116
#endif
106117
}
107118

ExampleGame/Assets/HockeyAppUnityIOS/HockeySDKResources.bundle/AppIconPlaceHolder.png.meta

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/HockeySDKResources.bundle/Arrow.png.meta

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/HockeySDKResources.bundle/[email protected]

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/HockeySDKResources.bundle/[email protected]

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/HockeySDKResources.bundle/Blur.png.meta

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/HockeySDKResources.bundle/[email protected]

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/HockeySDKResources.bundle/[email protected]

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

0 commit comments

Comments
 (0)