Merge pull request #4336 from srahim/timob-14012

[TIMOB-14012]Android: Providing proper user-agent information.
tidev · May 29, 2013 · 30296b3 · 30296b3
2 parents 1cf61fd + e4646da
commit 30296b3
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/android/modules/network/src/java/ti/modules/titanium/network/TiHTTPClient.java b/android/modules/network/src/java/ti/modules/titanium/network/TiHTTPClient.java
@@ -101,6 +101,7 @@
 import org.appcelerator.titanium.util.TiMimeTypeHelper;
 import org.appcelerator.titanium.util.TiPlatformHelper;
 import org.appcelerator.titanium.util.TiUrl;
+import android.os.Build;
 
 import ti.modules.titanium.xml.DocumentProxy;
 import ti.modules.titanium.xml.XMLModule;
@@ -113,7 +114,10 @@ public class TiHTTPClient
 	private static final String PROPERTY_MAX_BUFFER_SIZE = "ti.android.httpclient.maxbuffersize";
 	private static final int PROTOCOL_DEFAULT_PORT = -1;
 	private static final String TITANIUM_ID_HEADER = "X-Titanium-Id";
-
+	private static final String TITANIUM_USER_AGENT = "Appcelerator Titanium/" + TiApplication.getInstance().getTiBuildVersion()
+	                                                  + " ("+ Build.MODEL + "; Android API Level: "
+	                                                  + Integer.toString(Build.VERSION.SDK_INT) + "; "
+	                                                  + TiPlatformHelper.getLocale() +";)";
 	private static final String[] FALLBACK_CHARSETS = {HTTP.UTF_8, HTTP.ISO_8859_1};
 
 	// Regular expressions for detecting charset information in response documents (ex: html, xml).
@@ -871,7 +875,7 @@ public void open(String method, String url)
 			}
 		}
 		setReadyState(READY_STATE_OPENED);
-		setRequestHeader("User-Agent", (String) proxy.getProperty("userAgent"));
+		setRequestHeader("User-Agent", TITANIUM_USER_AGENT);
 		// Causes Auth to Fail with twitter and other size apparently block X- as well
 		// Ticket #729, ignore twitter for now
 		if (!hostString.contains("twitter.com")) {