From: masensio <masensio@solidgear.es>
Date: Fri, 18 Oct 2013 08:33:26 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.4.6
X-Git-Tag: oc-android-1.4.6^0
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/194a7360f88e309608b990e52674ca2f884e6d0a?ds=inline;hp=-c

Merge branch 'develop' into release-1.4.6
---

194a7360f88e309608b990e52674ca2f884e6d0a
diff --combined src/com/owncloud/android/files/services/FileUploader.java
index aa7925d1,93d2ace5..4a7a83d0
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@@ -29,6 -29,7 +29,7 @@@ import java.util.concurrent.ConcurrentH
  import java.util.concurrent.ConcurrentMap;
  
  import org.apache.http.HttpStatus;
+ import org.apache.jackrabbit.webdav.DavConstants;
  import org.apache.jackrabbit.webdav.MultiStatus;
  import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
  
@@@ -529,11 -530,6 +530,11 @@@ public class FileUploader extends Servi
                      mPendingUploads.remove(uploadKey);
                      Log_OC.i(TAG, "Remove CurrentUploadItem from pending upload Item Map.");
                  }
 +                if (uploadResult.isException()) {
 +                    // enforce the creation of a new client object for next uploads; this grant that a new socket will 
 +                    // be created in the future if the current exception is due to an abrupt lose of network connection
 +                    mUploadClient = null;
 +                }
              }
              
              /// notify result
@@@ -616,8 -612,9 +617,9 @@@
          PropFindMethod propfind = null;
          RemoteOperationResult result = null;
          try {
-             propfind = new PropFindMethod(mUploadClient.getBaseUri()
-                     + WebdavUtils.encodePath(mCurrentUpload.getRemotePath()));
+             propfind = new PropFindMethod(mUploadClient.getBaseUri() + WebdavUtils.encodePath(mCurrentUpload.getRemotePath()),
+                     DavConstants.PROPFIND_ALL_PROP,
+                     DavConstants.DEPTH_0);
              int status = mUploadClient.executeMethod(propfind);
              boolean isMultiStatus = (status == HttpStatus.SC_MULTI_STATUS);
              if (isMultiStatus) {
@@@ -722,7 -719,12 +724,7 @@@
          mNotification.contentView.setImageViewResource(R.id.status_icon, R.drawable.icon);
          
          /// includes a pending intent in the notification showing the details view of the file
 -        Intent showDetailsIntent = null;
 -        if (PreviewImageFragment.canBePreviewed(upload.getFile())) {
 -            showDetailsIntent = new Intent(this, PreviewImageActivity.class);
 -        } else {
 -            showDetailsIntent = new Intent(this, FileDisplayActivity.class);
 -        }
 +        Intent showDetailsIntent = new Intent(this, FileDisplayActivity.class);
          showDetailsIntent.putExtra(FileActivity.EXTRA_FILE, upload.getFile());
          showDetailsIntent.putExtra(FileActivity.EXTRA_ACCOUNT, upload.getAccount());
          showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);