Merge tag '1.0.7' into develop

1.0.7

ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml

@@ -1,44 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  package="net.hockeyapp.ExampleGameAndroid"
- android:versionName="1.0.6"
- android:versionCode="7"
- android:installLocation="preferExternal">
-  <supports-screens
-  android:smallScreens="true"
-  android:normalScreens="true"
-  android:largeScreens="true"
-  android:xlargeScreens="true"
-  android:anyDensity="true" />
-
-  <application
-    android:icon="@drawable/app_icon"
-    android:label="@string/app_name"
-    android:debuggable="true">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="net.hockeyapp.unity"
+    android:versionCode="7"
+    android:versionName="1.0.7" >
 
-    <activity
-      android:label="@string/app_name"
-      android:screenOrientation="portrait"
-      android:launchMode="singleTask"
-      android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale"
-      android:name="com.unity3d.player.UnityPlayerNativeActivity">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-      <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
-      <meta-data android:name="unityplayer.ForwardNativeEventsToDalvik" android:value="false" />
-    </activity>
-
-    <activity android:name="net.hockeyapp.android.UpdateActivity" />
-    <activity android:name="net.hockeyapp.android.FeedbackActivity" />
-
-  </application>
-
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19" />
-  <uses-feature android:glEsVersion="0x00020000" />
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-</manifest>
+    <uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="18" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+
+        <activity android:name="net.hockeyapp.android.UpdateActivity" />
+        <activity android:name="net.hockeyapp.android.FeedbackActivity" />
+    </application>
+
+</manifest>

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

@@ -2,7 +2,7 @@
  *
  * Author: Christoph Wendt
  * 
- * Version: 1.0.6
+ * Version: 1.0.7
  *
  * Copyright (c) 2013-2015 HockeyApp, Bit Stadium GmbH.
  * All rights reserved.
@@ -60,7 +60,7 @@ void Awake(){
 			List<string> logFileDirs = GetLogFiles();
 			if(logFileDirs.Count > 0)
 			{
-				StartCoroutine(SendLogs(GetLogFiles()));
+				StartCoroutine(SendLogs(logFileDirs));
 			}
 		}
 		string urlString = GetBaseURL();
@@ -325,11 +325,13 @@ protected virtual IEnumerator SendLogs(List<string> logs){
 		string crashPath = HOCKEYAPP_CRASHESPATH;
 		string url = GetBaseURL() + crashPath.Replace("[APPID]", appID);
 
+		#if (UNITY_ANDROID && !UNITY_EDITOR)
 		string sdkVersion = GetSdkVersion ();
 		string sdkName = GetSdkName ();
 		if (sdkName != null && sdkVersion != null) {
-			url += "?sdk=" + sdkName + "&sdk_version=" + sdkVersion;
+			url+= "?sdk=" + WWW.EscapeURL(sdkName) + "&sdk_version=" + sdkVersion;
 		}
+		#endif
 
 		foreach (string log in logs)
 		{		

ExampleGame/Assets/TestUI/TestUI.cs

@@ -157,7 +157,7 @@ public void ShowFeedbackForm(){
 		AndroidJavaClass unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer"); 
 		AndroidJavaObject currentActivity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity"); 
 		AndroidJavaClass pluginClass = new AndroidJavaClass("net.hockeyapp.unity.HockeyUnityPlugin"); 
-		pluginClass.CallStatic("startFeedbackForm", currentActivity, serverURL.Trim(), appID);
+		pluginClass.CallStatic("startFeedbackForm", currentActivity);
 		#endif
 	}
 }

ExampleGame/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 5.0.2f1
+m_EditorVersion: 5.2.0f3
 m_StandardAssetsVersion: 0

HockeyAppUnity/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="5"
-    android:versionName="1.0.4" >
+    android:versionCode="7"
+    android:versionName="1.0.7" >
 
     <uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

HockeyAppUnity/project.properties

@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-23
 android.library=true