From 56eb98979140d1902331cab61dc8790b7aa61180 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Thu, 11 Dec 2014 12:18:47 +0000 Subject: [PATCH] Remove references to apache-http from various documents. Most of them are pointless links to a "text/plain" constant which are far clearer when inlined with the relevant text. Change-Id: Iaed51b4548cb2836741106dc19c9cf500c205d32 --- docs/html/guide/components/intents-common.jd | 6 +++--- docs/html/guide/components/intents-filters.jd | 4 +--- docs/html/tools/debugging/ddms.jd | 11 ++++------- docs/html/training/articles/security-gms-provider.jd | 3 +-- docs/html/training/basics/network-ops/connecting.jd | 4 ++-- docs/html/training/volley/requestqueue.jd | 8 ++++---- 6 files changed, 15 insertions(+), 21 deletions(-) diff --git a/docs/html/guide/components/intents-common.jd b/docs/html/guide/components/intents-common.jd index adba1cdf4418b..5238cd95a33ec 100644 --- a/docs/html/guide/components/intents-common.jd +++ b/docs/html/guide/components/intents-common.jd @@ -1027,7 +1027,7 @@ and include email details such as the recipient and subject using the extra keys
MIME Type
-
{@link org.apache.http.protocol.HTTP#PLAIN_TEXT_TYPE} ("text/plain") +
"text/plain"
"*/*"
@@ -2447,7 +2447,7 @@ details such as the phone number, subject, and message body using the extra keys
MIME Type
-
{@link org.apache.http.protocol.HTTP#PLAIN_TEXT_TYPE} ("text/plain") +
"text/plain"
"image/*"
"video/*"
@@ -2558,7 +2558,7 @@ and specify the web URL in the intent data.

MIME Type
-
{@link org.apache.http.protocol.HTTP#PLAIN_TEXT_TYPE} ("text/plain") +
"text/plain"
"text/html"
"application/xhtml+xml"
"application/vnd.wap.xhtml+xml" diff --git a/docs/html/guide/components/intents-filters.jd b/docs/html/guide/components/intents-filters.jd index 3dec216f459d2..0759088c5d674 100644 --- a/docs/html/guide/components/intents-filters.jd +++ b/docs/html/guide/components/intents-filters.jd @@ -376,9 +376,7 @@ the intent.

Intent sendIntent = new Intent(); sendIntent.setAction(Intent.ACTION_SEND); sendIntent.putExtra(Intent.EXTRA_TEXT, textMessage); -sendIntent.setType({@link - org.apache.http.protocol.HTTP#PLAIN_TEXT_TYPE - HTTP.PLAIN_TEXT_TYPE}); // "text/plain" MIME type +sendIntent.setType("text/plain"); // Verify that the intent will resolve to an activity if (sendIntent.resolveActivity(getPackageManager()) != null) { diff --git a/docs/html/tools/debugging/ddms.jd b/docs/html/tools/debugging/ddms.jd index 1b598758c44a2..e9c2877a82148 100644 --- a/docs/html/tools/debugging/ddms.jd +++ b/docs/html/tools/debugging/ddms.jd @@ -246,10 +246,8 @@ TrafficStats.tagSocket(outputSocket); // Transfer data using socket TrafficStats.untagSocket(outputSocket); -

Alternatively, the Apache {@link org.apache.http.client.HttpClient} and -{@link java.net.URLConnection} APIs included in the platform -automatically tag sockets internally based on the active tag (as -identified by +

Alternatively, the {@link java.net.URLConnection} APIs included in the platform +automatically tag sockets internally based on the active tag (as identified by {@link android.net.TrafficStats#getThreadStatsTag getThreadStatsTag()}). These APIs correctly tag/untag sockets when recycled through keep-alive pools. In the following example, @@ -258,15 +256,14 @@ sets the active tag to be {@code 0xF00D}. There can only be one active tag per thread. That is the value that will be returned by {@link android.net.TrafficStats#getThreadStatsTag getThreadStatsTag()} -and thus used by {@link org.apache.http.client.HttpClient} - to tag sockets. The {@code finally} statement +and thus used by the HTTP client to tag sockets. The {@code finally} statement invokes {@link android.net.TrafficStats#clearThreadStatsTag clearThreadStatsTag()} to clear the tag.

TrafficStats.setThreadStatsTag(0xF00D);
     try {
-        // Make network request using HttpClient.execute()
+        // Make network request using your http client.
     } finally {
         TrafficStats.clearThreadStatsTag();
 }
diff --git a/docs/html/training/articles/security-gms-provider.jd b/docs/html/training/articles/security-gms-provider.jd index 0d3cf1eec3ce5..59983cc17292a 100644 --- a/docs/html/training/articles/security-gms-provider.jd +++ b/docs/html/training/articles/security-gms-provider.jd @@ -52,8 +52,7 @@ android.net.SSLCertificateSocketFactory android.net.SSLCertificateSocketFactory}. Rather than using this class, we encourage app developers to use high-level methods for interacting with cryptography. Most apps can use APIs like {@link -javax.net.ssl.HttpsURLConnection}, {@link org.apache.http.client.HttpClient}, -and {@link android.net.http.AndroidHttpClient} without needing to set a custom +javax.net.ssl.HttpsURLConnection} without needing to set a custom {@link javax.net.ssl.TrustManager} or create an {@link android.net.SSLCertificateSocketFactory}.

diff --git a/docs/html/training/basics/network-ops/connecting.jd b/docs/html/training/basics/network-ops/connecting.jd index 1452ded925f0b..060148064a92b 100644 --- a/docs/html/training/basics/network-ops/connecting.jd +++ b/docs/html/training/basics/network-ops/connecting.jd @@ -50,8 +50,8 @@ application manifest must include the following permissions:

Choose an HTTP Client

Most network-connected Android apps use HTTP to send and receive data. -Android includes two HTTP clients: {@link java.net.HttpURLConnection} and Apache - {@link org.apache.http.client.HttpClient}. Both support HTTPS, streaming uploads and downloads, configurable +Android includes two HTTP clients: {@link java.net.HttpURLConnection} and the Apache HTTP client. +Both support HTTPS, streaming uploads and downloads, configurable timeouts, IPv6, and connection pooling. We recommend using {@link java.net.HttpURLConnection} for applications targeted at Gingerbread and higher. For more discussion of this topic, see the blog post +on your choice of the Apache HTTP client {@code android.net.http.AndroidHttpClient} or +{@link java.net.HttpURLConnection}.

{@code BasicNetwork} is Volley's default network implementation. A {@code BasicNetwork} must be initialized with the HTTP client your app is using to connect to the network. -Typically this is {@link android.net.http.AndroidHttpClient} or -{@link java.net.HttpURLConnection}:

+Typically this is a {@link java.net.HttpURLConnection}: