Merge branch 'release/1.1.1'

Documentation/Changelog.md

@@ -1,5 +1,9 @@
 ###Changelog:###
 
+### 1.1.1
+* [BUGFIX] Fix bug where report for managed exceptions didn't contain a `CrashReporter Key`. The key is needed to get proper user statistics on the portal
+* [UPDATE] Plugin now uses HockeySDK Android 4.0.1
+
 ### 1.1.0
 * [NEW] User Metrics (user and session tracking)
 * [NEW] Trigger version update check explicitly
@@ -23,4 +27,4 @@
 - Append SDK and App information to crash reports
 	* SDK name
 	* SDK version
-	* App version name
+	* App version name

ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.hockeyapp.unity"
-    android:versionCode="10"
-    android:versionName="1.1.0" >
+    android:versionCode="11"
+    android:versionName="1.1.1" >
 
     <uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

ExampleGame/Assets/HockeyAppUnityAndroid/HockeyAppUnity-Scripts/HockeyAppAndroid.cs

@@ -205,6 +205,53 @@ protected String GetSdkName ()
 		return sdkName;
 	}
 
+	/// <summary>
+	/// The device's model manufacturer name.
+	/// </summary>
+	/// <returns>The device's model manufacturer name.</returns>
+	protected String GetManufacturer ()
+	{
+		string manufacturer = null;
+
+		#if (UNITY_ANDROID && !UNITY_EDITOR)
+		AndroidJavaClass jc = new AndroidJavaClass("net.hockeyapp.unity.HockeyUnityPlugin"); 
+		manufacturer =  jc.CallStatic<string>("getManufacturer");
+		#endif
+
+		return manufacturer;
+	}
+
+	/// <summary>
+	/// The device's model name.
+	/// </summary>
+	/// <returns>The device's model name.</returns>
+	protected String GetModel ()
+	{
+		string model = null;
+
+		#if (UNITY_ANDROID && !UNITY_EDITOR)
+		AndroidJavaClass jc = new AndroidJavaClass("net.hockeyapp.unity.HockeyUnityPlugin"); 
+		model =  jc.CallStatic<string>("getModel");
+		#endif
+
+		return model;
+	}
+
+	/// <summary>
+	/// The device's model manufacturer name.
+	/// </summary>
+	/// <returns>The device's model manufacturer name.</returns>
+	protected String GetCrashReporterKey ()
+	{
+		string crashReporterKey = null;
+
+		#if (UNITY_ANDROID && !UNITY_EDITOR)
+		AndroidJavaClass jc = new AndroidJavaClass("net.hockeyapp.unity.HockeyUnityPlugin"); 
+		crashReporterKey =  jc.CallStatic<string>("getCrashReporterKey");
+		#endif
+
+		return crashReporterKey;
+	}
 
 	/// <summary>
 	/// Collect all header fields for the custom exception report.
@@ -227,8 +274,15 @@ protected virtual List<string> GetLogHeaders ()
 		string[] versionComponents = SystemInfo.operatingSystem.Split('/');
 		string osVersion = "Android: " + versionComponents[0].Replace("Android OS ", "");
 		list.Add (osVersion);
-
-		list.Add("Model: " + SystemInfo.deviceModel);
+
+		string manufacturer = GetManufacturer();
+		list.Add("Manufacturer: " + manufacturer);
+
+		string model = GetModel();
+		list.Add("Model: " + model);
+
+		string crashReporterKey = GetCrashReporterKey();
+		list.Add("CrashReporter Key: " + crashReporterKey);
 
 		list.Add("Date: " + DateTime.UtcNow.ToString("ddd MMM dd HH:mm:ss {}zzzz yyyy").Replace("{}", "GMT"));
 		#endif

HockeyAppUnityPlugin/hockeysdk-unity/build.gradle

@@ -5,8 +5,8 @@ android {
     buildToolsVersion "23.0.3"
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 18
+        minSdkVersion 9
+        targetSdkVersion 23
     }
 
     buildTypes {
@@ -25,5 +25,5 @@ repositories {
 }
 
 dependencies {
-    compile(name:'HockeySDK-4.0.0', ext:'aar')
+    compile(name:'HockeySDK-4.0.1', ext:'aar')
 }

HockeyAppUnityPlugin/hockeysdk-unity/src/main/java/net/hockeyapp/unity/HockeyUnityPlugin.java

@@ -189,6 +189,21 @@ public static String getVersionName() {
 	 */
 	public static String getSdkName() {return Constants.SDK_NAME; }
 
+	/**
+	 * @return unique identifier for crash reports.
+	 */
+	public static String getCrashReporterKey() {return Constants.CRASH_IDENTIFIER; }
+
+	/**
+	 * @return the device's model manufacturer name.
+	 */
+	public static String getManufacturer() {return Constants.PHONE_MANUFACTURER; }
+
+    /**
+     * @return the device's model name.
+     */
+    public static String getModel() {return Constants.PHONE_MODEL; }
+
 	//---------------------------------------------------------------------------------------
 	//endregion
 

Plugins/HockeyAppUnityAndroid/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.hockeyapp.unity"
-    android:versionCode="10"
-    android:versionName="1.1.0" >
+    android:versionCode="11"
+    android:versionName="1.1.1" >
 
     <uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

Plugins/HockeyAppUnityAndroid/HockeyAppUnity-Scripts/HockeyAppAndroid.cs

@@ -205,6 +205,53 @@ protected String GetSdkName ()
 		return sdkName;
 	}
 
+	/// <summary>
+	/// The device's model manufacturer name.
+	/// </summary>
+	/// <returns>The device's model manufacturer name.</returns>
+	protected String GetManufacturer ()
+	{
+		string manufacturer = null;
+
+		#if (UNITY_ANDROID && !UNITY_EDITOR)
+		AndroidJavaClass jc = new AndroidJavaClass("net.hockeyapp.unity.HockeyUnityPlugin"); 
+		manufacturer =  jc.CallStatic<string>("getManufacturer");
+		#endif
+
+		return manufacturer;
+	}
+
+	/// <summary>
+	/// The device's model name.
+	/// </summary>
+	/// <returns>The device's model name.</returns>
+	protected String GetModel ()
+	{
+		string model = null;
+
+		#if (UNITY_ANDROID && !UNITY_EDITOR)
+		AndroidJavaClass jc = new AndroidJavaClass("net.hockeyapp.unity.HockeyUnityPlugin"); 
+		model =  jc.CallStatic<string>("getModel");
+		#endif
+
+		return model;
+	}
+
+	/// <summary>
+	/// The device's model manufacturer name.
+	/// </summary>
+	/// <returns>The device's model manufacturer name.</returns>
+	protected String GetCrashReporterKey ()
+	{
+		string crashReporterKey = null;
+
+		#if (UNITY_ANDROID && !UNITY_EDITOR)
+		AndroidJavaClass jc = new AndroidJavaClass("net.hockeyapp.unity.HockeyUnityPlugin"); 
+		crashReporterKey =  jc.CallStatic<string>("getCrashReporterKey");
+		#endif
+
+		return crashReporterKey;
+	}
 
 	/// <summary>
 	/// Collect all header fields for the custom exception report.
@@ -227,8 +274,15 @@ protected virtual List<string> GetLogHeaders ()
 		string[] versionComponents = SystemInfo.operatingSystem.Split('/');
 		string osVersion = "Android: " + versionComponents[0].Replace("Android OS ", "");
 		list.Add (osVersion);
-
-		list.Add("Model: " + SystemInfo.deviceModel);
+
+		string manufacturer = GetManufacturer();
+		list.Add("Manufacturer: " + manufacturer);
+
+		string model = GetModel();
+		list.Add("Model: " + model);
+
+		string crashReporterKey = GetCrashReporterKey();
+		list.Add("CrashReporter Key: " + crashReporterKey);
 
 		list.Add("Date: " + DateTime.UtcNow.ToString("ddd MMM dd HH:mm:ss {}zzzz yyyy").Replace("{}", "GMT"));
 		#endif

README.md

@@ -1,4 +1,4 @@
-## Version 1.1.0
+## Version 1.1.1
 =======
 
 ## Introduction
@@ -21,19 +21,19 @@ The following features are currently supported:
 
 This document contains the following sections:
 
-1. [Requirements (Version 1.1.0-beta.1)](#1)
+1. [Requirements (Version 1.1.1)](#1)
 2. [Installation & Setup](#2)
 3. [Examples](#3)
 4. [Troubleshooting](#4)
 5. [Code of Conduct](#5)
 6. [Contributor License](#6)
 7. [Licenses](#7)
 
-## <a name="1"></a>Requirements (Version 1.1.0-beta.1)
+## <a name="1"></a>Requirements (Version 1.1.1)
 
 * [Changelog](Documentation/Changelog.md)
 * Unity 5.0 or newer (SDK versions with Unity 4 support can be found at the [Unity Asset Store](https://www.assetstore.unity3d.com/en/?gclid=CO) or by switching to the 1.0.3 tag on GitHub).
-* Android 2.1 or newer.
+* Android 2.3 or newer.
 
 ## <a name="2"></a>Installation & Setup