1. Multipart entity submit fixed

lemberg · Apr 28, 2015 · 85a8476 · 85a8476
1 parent 369b256
commit 85a8476
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 3 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -31,6 +31,7 @@ android {
 
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/NOTICE'
     }
 }
 

diff --git a/library/libs/httpclient-android-4.3.5.jar b/library/libs/httpclient-android-4.3.5.jar
diff --git a/library/libs/httpcore-4.4.1.jar b/library/libs/httpcore-4.4.1.jar
diff --git a/library/libs/httpmime-4.3.6.jar b/library/libs/httpmime-4.3.6.jar
diff --git a/library/libs/httpmime-4.4.1.jar b/library/libs/httpmime-4.4.1.jar
diff --git a/library/src/main/java/com/ls/drupal/DrupalClient.java b/library/src/main/java/com/ls/drupal/DrupalClient.java
@@ -194,7 +194,6 @@ protected ResponseData performRequestNoLoginRestore(BaseRequest request, Object
             this.onNewRequestStarted();
             return request.performRequest(synchronous, queue);
         }else{
-//            L.e("Request was rejected:"+request.getUrl());
             return null;
         }
     }

diff --git a/library/src/main/java/com/ls/http/base/handler/MultipartRequestHandler.java b/library/src/main/java/com/ls/http/base/handler/MultipartRequestHandler.java
@@ -90,7 +90,7 @@ private void formMultipartEntity(Object source)
                     if(value != null)
                     {
                         if(value instanceof IMultiPartEntityPart) {
-                            ContentBody body = ((IMultiPartEntityPart)source).getContentBody();
+                            ContentBody body = ((IMultiPartEntityPart)value).getContentBody();
                             entity.addPart(name,body);
                         }else{
                             entity.addTextBody(name,value.toString());

diff --git a/library/src/main/java/com/ls/util/image/DrupalImageView.java b/library/src/main/java/com/ls/util/image/DrupalImageView.java
@@ -329,7 +329,6 @@ public void onRequestCompleted(AbstractBaseDrupalEntity entity, Object tag, Resp
                 applyNoImageDrawableIfNeeded();
             }
 
-//            L.e("Request completed for:"+tag);
             if(imageLoadingListener != null)
             {
                 imageLoadingListener.onImageLoadingComplete(DrupalImageView.this,image);
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,7 @@ android { @@
         packagingOptions {
             exclude 'META-INF/DEPENDENCIES'
+            exclude 'META-INF/NOTICE'
         }
     }
@@ Expand Down @@