osmdroid user-agent

Index: osmdroid-android/src/main/java/org/osmdroid/http/HttpClientFactory.java
===================================================================
--- osmdroid-android/src/main/java/org/osmdroid/http/HttpClientFactory.java (revision 1400)
+++ osmdroid-android/src/main/java/org/osmdroid/http/HttpClientFactory.java (working copy)
@@ -2,6 +2,7 @@

 import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.CoreProtocolPNames;

 /**
  * Factory class for creating an instance of {@link HttpClient}.
@@ -35,5 +36,11 @@
    public static HttpClient createHttpClient() {
        return mFactoryInstance.createHttpClient();
    }
+
+   public static HttpClient createHttpClient(String pUserAgent) {
+       HttpClient httpClient = mFactoryInstance.createHttpClient();
+       httpClient.getParams().setParameter(CoreProtocolPNames.USER_AGENT, pUserAgent);
+       return httpClient;
+   }

 }
Index: osmdroid-android/src/main/java/org/osmdroid/tileprovider/MapTileProviderBasic.java
===================================================================
--- osmdroid-android/src/main/java/org/osmdroid/tileprovider/MapTileProviderBasic.java  (revision 1400)
+++ osmdroid-android/src/main/java/org/osmdroid/tileprovider/MapTileProviderBasic.java  (working copy)
@@ -36,7 +36,7 @@
     */
    public MapTileProviderBasic(final Context pContext, final ITileSource pTileSource) {
        this(new SimpleRegisterReceiver(pContext), new NetworkAvailabliltyCheck(pContext),
-               pTileSource);
+               pTileSource, pContext);
    }

    /**
@@ -43,7 +43,8 @@
     * Creates a {@link MapTileProviderBasic}.
     */
    public MapTileProviderBasic(final IRegisterReceiver pRegisterReceiver,
-           final INetworkAvailablityCheck aNetworkAvailablityCheck, final ITileSource pTileSource) {
+           final INetworkAvailablityCheck aNetworkAvailablityCheck, final ITileSource pTileSource,
+           final Context pContext) {
        super(pTileSource, pRegisterReceiver);

        final TileWriter tileWriter = new TileWriter();
@@ -57,7 +58,7 @@
        mTileProviderList.add(archiveProvider);

        final MapTileDownloader downloaderProvider = new MapTileDownloader(pTileSource, tileWriter,
-               aNetworkAvailablityCheck);
+               aNetworkAvailablityCheck, "osmdroid (" + pContext.getPackageName() + ")");
        mTileProviderList.add(downloaderProvider);
    }
 }
Index: osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/MapTileDownloader.java
===================================================================
--- osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/MapTileDownloader.java (revision 1400)
+++ osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/MapTileDownloader.java (working copy)
@@ -56,6 +56,8 @@
    private final AtomicReference<OnlineTileSourceBase> mTileSource = new AtomicReference<OnlineTileSourceBase>();

    private final INetworkAvailablityCheck mNetworkAvailablityCheck;
+
+   private final String mUserAgent;

    // ===========================================================
    // Constructors
@@ -62,28 +64,31 @@
    // ===========================================================

    public MapTileDownloader(final ITileSource pTileSource) {
-       this(pTileSource, null, null);
+       this(pTileSource, null, null, null);
    }

    public MapTileDownloader(final ITileSource pTileSource, final IFilesystemCache pFilesystemCache) {
-       this(pTileSource, pFilesystemCache, null);
+       this(pTileSource, pFilesystemCache, null, null);
    }

    public MapTileDownloader(final ITileSource pTileSource,
            final IFilesystemCache pFilesystemCache,
-           final INetworkAvailablityCheck pNetworkAvailablityCheck) {
+           final INetworkAvailablityCheck pNetworkAvailablityCheck,
+           final String pUserAgent) {
        this(pTileSource, pFilesystemCache, pNetworkAvailablityCheck,
-               NUMBER_OF_TILE_DOWNLOAD_THREADS, TILE_DOWNLOAD_MAXIMUM_QUEUE_SIZE);
+               NUMBER_OF_TILE_DOWNLOAD_THREADS, TILE_DOWNLOAD_MAXIMUM_QUEUE_SIZE, pUserAgent);
    }

    public MapTileDownloader(final ITileSource pTileSource,
            final IFilesystemCache pFilesystemCache,
            final INetworkAvailablityCheck pNetworkAvailablityCheck, int pThreadPoolSize,
-           int pPendingQueueSize) {
+           int pPendingQueueSize,
+           final String pUserAgent) {
        super(pThreadPoolSize, pPendingQueueSize);

        mFilesystemCache = pFilesystemCache;
        mNetworkAvailablityCheck = pNetworkAvailablityCheck;
+       mUserAgent = pUserAgent;
        setTileSource(pTileSource);
    }

@@ -180,7 +185,7 @@
                    return null;
                }

-               final HttpClient client = HttpClientFactory.createHttpClient();
+               final HttpClient client = HttpClientFactory.createHttpClient(mUserAgent);
                final HttpUriRequest head = new HttpGet(tileURLString);
                final HttpResponse response = client.execute(head);