Merge pull request #30 from bitstadium/release/5.1.0

Benjamin Scholtysik (Reimold) · web-flow · commit 59c9405bf103 · 2017-12-21T11:49:15.000-08:00
Release/5.1.0
diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml b/ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.hockeyapp.unity"
     android:versionCode="18"
-    android:versionName="5.0.1" >
+    android:versionName="5.1.0" >
 
     <uses-sdk
         android:minSdkVersion="15"
diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/HockeyAppUnity-Scripts/HockeyAppAndroid.cs b/ExampleGame/Assets/HockeyAppUnityAndroid/HockeyAppUnity-Scripts/HockeyAppAndroid.cs
@@ -1,5 +1,5 @@
 ﻿/*
- * Version: 5.0.1
+ * Version: 5.1.0
  */
 
 using UnityEngine;
@@ -62,6 +62,7 @@ void Awake ()
 		if(exceptionLogging == true  && IsConnected() == true) {
 			List<string> logFileDirs = GetLogFiles();
 			if(logFileDirs.Count > 0) {
+				Debug.Log("Found files: " + logFileDirs.Count);
 				StartCoroutine(SendLogs(logFileDirs));
 			}
 		}
@@ -269,8 +270,6 @@ protected virtual List<string> GetLogHeaders ()
 		{
 			var versionCode = pluginClass.CallStatic<string>("getVersionCode");
 			var versionName = pluginClass.CallStatic<string>("getVersionName");
-			var sdkVersion = pluginClass.CallStatic<string>("getSdkVersion");
-			var sdkName = pluginClass.CallStatic<string>("getSdkName");
 			var manufacturer = pluginClass.CallStatic<string>("getManufacturer");
 			var model = pluginClass.CallStatic<string>("getModel");
 			var deviceIdentifier = pluginClass.CallStatic<string>("getDeviceIdentifier");
@@ -434,6 +433,9 @@ protected virtual IEnumerator SendLogs (List<string> logs)
 					if (Debug.isDebugBuild)
 						Debug.Log ("Failed to delete exception log: " + e);
 				}
+			} else {
+				if (Debug.isDebugBuild)
+					Debug.Log ("Crash sending error: " + www.error);
 			}
 		}
 	}
@@ -519,7 +521,14 @@ protected virtual void HandleException (string logString, string stackTrace)
 	{
 
 		#if (UNITY_ANDROID && !UNITY_EDITOR)
-		WriteLogToDisk(logString, stackTrace);
+		try
+		{
+			WriteLogToDisk(logString, stackTrace);
+		}
+		catch (Exception e)
+		{
+			AndroidLog(e.ToString());
+		}
 		#endif
 	}
 
@@ -577,6 +586,12 @@ private static AndroidJavaObject DictainaryToJavaMap<TKey, TValue>(IDictionary<T
 		return javaMap;
 	}
 
+	private static void AndroidLog(string message)
+	{
+		var logClass = new AndroidJavaObject("android.util.Log");
+		logClass.CallStatic<int>("d", "HockeyApp", message);
+	}
+
 	#endif
 	#endregion
 }
diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/README.pdf b/ExampleGame/Assets/HockeyAppUnityAndroid/README.pdf
diff --git a/Plugins/HockeyAppUnityAndroid/AndroidManifest.xml b/Plugins/HockeyAppUnityAndroid/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.hockeyapp.unity"
     android:versionCode="18"
-    android:versionName="5.0.1" >
+    android:versionName="5.1.0" >
 
     <uses-sdk
         android:minSdkVersion="15"
diff --git a/Plugins/HockeyAppUnityAndroid/HockeyAppUnity-Scripts/HockeyAppAndroid.cs b/Plugins/HockeyAppUnityAndroid/HockeyAppUnity-Scripts/HockeyAppAndroid.cs
@@ -1,5 +1,5 @@
 ﻿/*
- * Version: 5.0.1
+ * Version: 5.1.0
  */
 
 using UnityEngine;
@@ -62,6 +62,7 @@ void Awake ()
 		if(exceptionLogging == true  && IsConnected() == true) {
 			List<string> logFileDirs = GetLogFiles();
 			if(logFileDirs.Count > 0) {
+				Debug.Log("Found files: " + logFileDirs.Count);
 				StartCoroutine(SendLogs(logFileDirs));
 			}
 		}
@@ -269,8 +270,6 @@ protected virtual List<string> GetLogHeaders ()
 		{
 			var versionCode = pluginClass.CallStatic<string>("getVersionCode");
 			var versionName = pluginClass.CallStatic<string>("getVersionName");
-			var sdkVersion = pluginClass.CallStatic<string>("getSdkVersion");
-			var sdkName = pluginClass.CallStatic<string>("getSdkName");
 			var manufacturer = pluginClass.CallStatic<string>("getManufacturer");
 			var model = pluginClass.CallStatic<string>("getModel");
 			var deviceIdentifier = pluginClass.CallStatic<string>("getDeviceIdentifier");
@@ -434,6 +433,9 @@ protected virtual IEnumerator SendLogs (List<string> logs)
 					if (Debug.isDebugBuild)
 						Debug.Log ("Failed to delete exception log: " + e);
 				}
+			} else {
+				if (Debug.isDebugBuild)
+					Debug.Log ("Crash sending error: " + www.error);
 			}
 		}
 	}
@@ -519,7 +521,14 @@ protected virtual void HandleException (string logString, string stackTrace)
 	{
 
 		#if (UNITY_ANDROID && !UNITY_EDITOR)
-		WriteLogToDisk(logString, stackTrace);
+		try
+		{
+			WriteLogToDisk(logString, stackTrace);
+		}
+		catch (Exception e)
+		{
+			AndroidLog(e.ToString());
+		}
 		#endif
 	}
 
@@ -577,6 +586,12 @@ private static AndroidJavaObject DictainaryToJavaMap<TKey, TValue>(IDictionary<T
 		return javaMap;
 	}
 
+	private static void AndroidLog(string message)
+	{
+		var logClass = new AndroidJavaObject("android.util.Log");
+		logClass.CallStatic<int>("d", "HockeyApp", message);
+	}
+
 	#endif
 	#endregion
 }
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Version 5.0.1
+# Version 5.1.0
 
 ## Introduction
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Version: 5.0.1`
	`2`	`+ * Version: 5.1.0`
`3`	`3`	`*/`
`4`	`4`
`5`	`5`	`using UnityEngine;`
`@@ -62,6 +62,7 @@ void Awake ()`
`62`	`62`	`if(exceptionLogging == true && IsConnected() == true) {`
`63`	`63`	`List<string> logFileDirs = GetLogFiles();`
`64`	`64`	`if(logFileDirs.Count > 0) {`
	`65`	`+ Debug.Log("Found files: " + logFileDirs.Count);`
`65`	`66`	`StartCoroutine(SendLogs(logFileDirs));`
`66`	`67`	`}`
`67`	`68`	`}`
`@@ -269,8 +270,6 @@ protected virtual List<string> GetLogHeaders ()`
`269`	`270`	`{`
`270`	`271`	`var versionCode = pluginClass.CallStatic<string>("getVersionCode");`
`271`	`272`	`var versionName = pluginClass.CallStatic<string>("getVersionName");`
`272`		`- var sdkVersion = pluginClass.CallStatic<string>("getSdkVersion");`
`273`		`- var sdkName = pluginClass.CallStatic<string>("getSdkName");`
`274`	`273`	`var manufacturer = pluginClass.CallStatic<string>("getManufacturer");`
`275`	`274`	`var model = pluginClass.CallStatic<string>("getModel");`
`276`	`275`	`var deviceIdentifier = pluginClass.CallStatic<string>("getDeviceIdentifier");`
`@@ -434,6 +433,9 @@ protected virtual IEnumerator SendLogs (List<string> logs)`
`434`	`433`	`if (Debug.isDebugBuild)`
`435`	`434`	`Debug.Log ("Failed to delete exception log: " + e);`
`436`	`435`	`}`
	`436`	`+ } else {`
	`437`	`+ if (Debug.isDebugBuild)`
	`438`	`+ Debug.Log ("Crash sending error: " + www.error);`
`437`	`439`	`}`
`438`	`440`	`}`
`439`	`441`	`}`
`@@ -519,7 +521,14 @@ protected virtual void HandleException (string logString, string stackTrace)`
`519`	`521`	`{`
`520`	`522`
`521`	`523`	`#if (UNITY_ANDROID && !UNITY_EDITOR)`
`522`		`- WriteLogToDisk(logString, stackTrace);`
	`524`	`+ try`
	`525`	`+ {`
	`526`	`+ WriteLogToDisk(logString, stackTrace);`
	`527`	`+ }`
	`528`	`+ catch (Exception e)`
	`529`	`+ {`
	`530`	`+ AndroidLog(e.ToString());`
	`531`	`+ }`
`523`	`532`	`#endif`
`524`	`533`	`}`
`525`	`534`
`@@ -577,6 +586,12 @@ private static AndroidJavaObject DictainaryToJavaMap<TKey, TValue>(IDictionary<T`
`577`	`586`	`return javaMap;`
`578`	`587`	`}`
`579`	`588`
	`589`	`+ private static void AndroidLog(string message)`
	`590`	`+ {`
	`591`	`+ var logClass = new AndroidJavaObject("android.util.Log");`
	`592`	`+ logClass.CallStatic<int>("d", "HockeyApp", message);`
	`593`	`+ }`
	`594`	`+`
`580`	`595`	`#endif`
`581`	`596`	`#endregion`
`582`	`597`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Version 5.0.1`
	`1`	`+# Version 5.1.0`
`2`	`2`
`3`	`3`	`## Introduction`
`4`	`4`