android-async-http#988 additional changes as of comments in PR

Author: smarek

library/src/main/java/com/loopj/android/http/AsyncHttpClient.java

@@ -16,7 +16,6 @@
 */
 
 import android.content.Context;
-import android.media.session.MediaSession;
 import android.os.Looper;
 
 import java.io.IOException;
@@ -75,7 +74,6 @@
 import cz.msebera.android.httpclient.conn.ssl.SSLSocketFactory;
 import cz.msebera.android.httpclient.entity.HttpEntityWrapper;
 import cz.msebera.android.httpclient.impl.auth.BasicScheme;
-import cz.msebera.android.httpclient.impl.client.BasicCredentialsProvider;
 import cz.msebera.android.httpclient.impl.client.DefaultHttpClient;
 import cz.msebera.android.httpclient.impl.conn.tsccm.ThreadSafeClientConnManager;
 import cz.msebera.android.httpclient.params.BasicHttpParams;
@@ -264,11 +262,10 @@ public void process(final HttpRequest request, final HttpContext context) throws
                 if (authState.getAuthScheme() == null) {
                     AuthScope authScope = new AuthScope(targetHost.getHostName(), targetHost.getPort());
                     Credentials creds = credsProvider.getCredentials(authScope);
-                    if(creds instanceof TokenCredentials) {
+                    if (creds instanceof TokenCredentials) {
                         authState.setAuthScheme(new BearerAuthSchemeFactory.BearerAuthScheme());
                         authState.setCredentials(creds);
-                    }
-                    else if (creds != null) {
+                    } else if (creds != null) {
                         authState.setAuthScheme(new BasicScheme());
                         authState.setCredentials(creds);
                     }
@@ -803,6 +800,7 @@ public void removeHeader(String header) {
     /**
      * Sets bearer authentication for the request. Uses AuthScope.ANY. This is the same as
      * setBearerAuth('token',AuthScope.ANY, false)
+     *
      * @param token Bearer Token
      */
     public void setBearerAuth(String token) {
@@ -813,8 +811,9 @@ public void setBearerAuth(String token) {
     /**
      * Sets bearer authentication for the request. You should pass in your AuthScope for security. It
      * should be like this setBearerAuth("token", new AuthScope("host",port,AuthScope.ANY_REALM), false)
-     * @param token Bearer Token
-     * @param scope an AuthScope object
+     *
+     * @param token      Bearer Token
+     * @param scope      an AuthScope object
      * @param preemptive sets authorization in preemptive manner
      */
     public void setBearerAuth(String token, AuthScope scope, boolean preemptive) {

library/src/main/java/com/loopj/android/http/AsyncHttpResponseHandler.java

@@ -78,7 +78,7 @@
  * });
  * </pre>
  */
-@SuppressWarnings("ALL")
+@SuppressWarnings("DesignForExtension")
 public abstract class AsyncHttpResponseHandler implements ResponseHandlerInterface {
 
     public static final String DEFAULT_CHARSET = "UTF-8";

library/src/main/java/com/loopj/android/http/BearerAuthSchemeFactory.java

@@ -1,3 +1,20 @@
+/*
+    Android Asynchronous Http Client
+    Copyright (c) 2011 James Smith <[email protected]>
+    https://loopj.com
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
 package com.loopj.android.http;
 
 import cz.msebera.android.httpclient.Header;
@@ -14,9 +31,6 @@
 import cz.msebera.android.httpclient.protocol.HttpContext;
 import cz.msebera.android.httpclient.util.CharArrayBuffer;
 
-/**
- * Created by chase on 08/10/2015.
- */
 public class BearerAuthSchemeFactory implements AuthSchemeFactory {
 
     @Override

library/src/main/java/com/loopj/android/http/TokenCredentials.java

@@ -1,8 +1,22 @@
+/*
+    Android Asynchronous Http Client
+    Copyright (c) 2011 James Smith <[email protected]>
+    https://loopj.com
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
 package com.loopj.android.http;
 
-/**
- * Created by chase on 08/10/2015.
- */
 import java.security.Principal;
 
 import cz.msebera.android.httpclient.auth.BasicUserPrincipal;