Quick patch to fix operations not ready for HTTPS

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / files / services / FileUploader.java

diff --git a/src/eu/alefzero/owncloud/files/services/FileUploader.java b/src/eu/alefzero/owncloud/files/services/FileUploader.java
index 93ee82f..db2461c 100644 (file)
--- a/src/eu/alefzero/owncloud/files/services/FileUploader.java
+++ b/src/eu/alefzero/owncloud/files/services/FileUploader.java
@@ -120,9 +120,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
         if (mSuccessCounter == mLocalPaths.length) {
             message = getString(R.string.uploader_upload_succeed); 
         } else {
         if (mSuccessCounter == mLocalPaths.length) {
             message = getString(R.string.uploader_upload_succeed); 
         } else {

-            message = getString(R.string.uploader_upload_failed); 
-            if (mLocalPaths.length > 1)
-                message += " (" + mSuccessCounter + " / " + mLocalPaths.length + getString(R.string.uploader_files_uploaded_suffix) + ")";
+            message = String.format(getString(R.string.uploader_upload_failed), mSuccessCounter, mLocalPaths.length); 

         }
         Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
     }
         }
         Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
     }


@@ -146,6 +144,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
         mNotificationManager.notify(42, mNotification);
 
         WebdavClient wc = new WebdavClient(mAccount, getApplicationContext());
         mNotificationManager.notify(42, mNotification);
 
         WebdavClient wc = new WebdavClient(mAccount, getApplicationContext());

+        wc.allowSelfsignedCertificates();

         wc.setDataTransferProgressListener(this);
 
         for (int i = 0; i < mLocalPaths.length; ++i) {
         wc.setDataTransferProgressListener(this);
 
         for (int i = 0; i < mLocalPaths.length; ++i) {