Merge pull request android-async-http#898 from condda/master

Renamed "mFile" (38,08%) to "file" (61,92%)

Author: smarek

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

@@ -31,7 +31,7 @@
 
 public abstract class FileAsyncHttpResponseHandler extends AsyncHttpResponseHandler {
 
-    protected final File mFile;
+    protected final File file;
     protected final boolean append;
     private static final String LOG_TAG = "FileAsyncHttpResponseHandler";
 
@@ -57,7 +57,7 @@ public FileAsyncHttpResponseHandler(File file, boolean append) {
         if (!file.getParentFile().isDirectory()) {
             Utils.asserts(file.getParentFile().mkdirs(), "Cannot create parent directories for requested File location");
         }
-        this.mFile = file;
+        this.file = file;
         this.append = append;
     }
 
@@ -68,7 +68,7 @@ public FileAsyncHttpResponseHandler(File file, boolean append) {
      */
     public FileAsyncHttpResponseHandler(Context context) {
         super();
-        this.mFile = getTemporaryFile(context);
+        this.file = getTemporaryFile(context);
         this.append = false;
     }
 
@@ -105,8 +105,8 @@ protected File getTemporaryFile(Context context) {
      * @return File file in which the response is stored
      */
     protected File getTargetFile() {
-        assert (mFile != null);
-        return mFile;
+        assert (file != null);
+        return file;
     }
 
     @Override

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

@@ -101,8 +101,8 @@ protected byte[] getResponseData(HttpEntity entity) throws IOException {
     }
 
     public void updateRequestHeaders(HttpUriRequest uriRequest) {
-        if (mFile.exists() && mFile.canWrite())
-            current = mFile.length();
+        if (file.exists() && file.canWrite())
+            current = file.length();
         if (current > 0) {
             append = true;
             uriRequest.setHeader("Range", "bytes=" + current + "-");

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

@@ -61,9 +61,9 @@ private void writeObject(ObjectOutputStream out) throws IOException {
     }
 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-        String name = (String) in.readObject();
+        String key = (String) in.readObject();
         String value = (String) in.readObject();
-        clientCookie = new BasicClientCookie(name, value);
+        clientCookie = new BasicClientCookie(key, value);
         clientCookie.setComment((String) in.readObject());
         clientCookie.setDomain((String) in.readObject());
         clientCookie.setExpiryDate((Date) in.readObject());

sample/src/main/java/com/loopj/android/http/sample/PrePostProcessingSample.java

@@ -126,8 +126,8 @@ public void run() {
 
     private class PrePostProcessRequest extends AsyncHttpRequest {
 
-        public PrePostProcessRequest(AbstractHttpClient client, HttpContext context, HttpUriRequest request, ResponseHandlerInterface responseHandler) {
-            super(client, context, request, responseHandler);
+        public PrePostProcessRequest(AbstractHttpClient client, HttpContext httpContext, HttpUriRequest request, ResponseHandlerInterface responseHandler) {
+            super(client, httpContext, request, responseHandler);
         }
 
         @Override