Singleton didn't work (worth a try though ^^) - Make a new constructor

[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 9f2e3e7..68ddafb 100644 (file)
--- a/src/eu/alefzero/owncloud/files/services/FileUploader.java
+++ b/src/eu/alefzero/owncloud/files/services/FileUploader.java
@@ -1,16 +1,7 @@
 package eu.alefzero.owncloud.files.services;
 
 import java.io.File;
 package eu.alefzero.owncloud.files.services;
 
 import java.io.File;

-import java.util.List;

 
 

-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
-import eu.alefzero.owncloud.datamodel.OCFile;
-import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener;
-import eu.alefzero.owncloud.utils.OwnCloudVersion;
-import eu.alefzero.webdav.WebdavClient;

 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Notification;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Notification;


@@ -18,7 +9,6 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Intent;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Intent;

-import android.net.Uri;

 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;


@@ -29,6 +19,11 @@ import android.util.Log;
 import android.webkit.MimeTypeMap;
 import android.widget.RemoteViews;
 import android.widget.Toast;
 import android.webkit.MimeTypeMap;
 import android.widget.RemoteViews;
 import android.widget.Toast;

+import eu.alefzero.owncloud.R;
+import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
+import eu.alefzero.owncloud.datamodel.OCFile;
+import eu.alefzero.owncloud.files.interfaces.OnDatatransferProgressListener;
+import eu.alefzero.webdav.WebdavClient;

 
 public class FileUploader extends Service implements OnDatatransferProgressListener {
 
 
 public class FileUploader extends Service implements OnDatatransferProgressListener {
 


@@ -47,14 +42,13 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
     private NotificationManager mNotificationManager;
     private Looper mServiceLooper;
     private ServiceHandler mServiceHandler;
     private NotificationManager mNotificationManager;
     private Looper mServiceLooper;
     private ServiceHandler mServiceHandler;

-    private AccountManager mAccountManager;

     private Account mAccount;
     private String[] mLocalPaths, mRemotePaths;
     private Account mAccount;
     private String[] mLocalPaths, mRemotePaths;

-    private boolean mResult;

     private int mUploadType;
     private Notification mNotification;
     private int mTotalDataToSend, mSendData;
     private int mCurrentIndexUpload, mPreviousPercent;
     private int mUploadType;
     private Notification mNotification;
     private int mTotalDataToSend, mSendData;
     private int mCurrentIndexUpload, mPreviousPercent;

+    private int mSuccessCounter;

 
     @Override
     public IBinder onBind(Intent arg0) {
 
     @Override
     public IBinder onBind(Intent arg0) {


@@ -82,7 +76,6 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
         thread.start();
         mServiceLooper = thread.getLooper();
         mServiceHandler = new ServiceHandler(mServiceLooper);
         thread.start();
         mServiceLooper = thread.getLooper();
         mServiceHandler = new ServiceHandler(mServiceLooper);

-        mAccountManager = AccountManager.get(this);

     }
 
     @Override
     }
 
     @Override


@@ -122,24 +115,18 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
     }
 
     public void run() {
     }
 
     public void run() {

-        if (mResult) {
-            Toast.makeText(this, "Upload successfull", Toast.LENGTH_SHORT)
-                    .show();
+        String message;
+        if (mSuccessCounter == mLocalPaths.length) {
+            message = getString(R.string.uploader_upload_succeed); 

         } else {
         } else {

-            Toast.makeText(this, "Upload could not be completed", Toast.LENGTH_SHORT).show();
+            message = getString(R.string.uploader_upload_failed); 
+            if (mLocalPaths.length > 1)
+                message += " (" + mSuccessCounter + " / " + mLocalPaths.length + getString(R.string.uploader_files_uploaded_suffix) + ")";

         }
         }

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

     }
 
     public void uploadFile() {
     }
 
     public void uploadFile() {

-        String baseUrl = mAccountManager.getUserData(mAccount,
-                AccountAuthenticator.KEY_OC_BASE_URL), ocVerStr = mAccountManager
-                .getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION);
-        OwnCloudVersion ocVer = new OwnCloudVersion(ocVerStr);
-        String webdav_path = AccountUtils.getWebdavPath(ocVer);
-        Uri ocUri = Uri.parse(baseUrl + webdav_path);
-        String username = mAccount.name.substring(0,
-                mAccount.name.lastIndexOf('@'));
-        String password = mAccountManager.getPassword(mAccount);

         FileDataStorageManager storageManager = new FileDataStorageManager(mAccount, getContentResolver());
         
         mTotalDataToSend = mSendData = mPreviousPercent = 0;
         FileDataStorageManager storageManager = new FileDataStorageManager(mAccount, getContentResolver());
         
         mTotalDataToSend = mSendData = mPreviousPercent = 0;


@@ -157,10 +144,8 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
         
         mNotificationManager.notify(42, mNotification);
 
         
         mNotificationManager.notify(42, mNotification);
 

-        WebdavClient wc = new WebdavClient(ocUri);
-        wc.allowSelfsignedCertificates();
+        WebdavClient wc = new WebdavClient(mAccount, getApplicationContext());

         wc.setDataTransferProgressListener(this);
         wc.setDataTransferProgressListener(this);

-        wc.setCredentials(username, password);

 
         for (int i = 0; i < mLocalPaths.length; ++i) {
             File f = new File(mLocalPaths[i]);
 
         for (int i = 0; i < mLocalPaths.length; ++i) {
             File f = new File(mLocalPaths[i]);


@@ -169,6 +154,8 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
         
         Log.d(TAG, "Will upload " + mTotalDataToSend + " bytes, with " + mLocalPaths.length + " files");
         
         
         Log.d(TAG, "Will upload " + mTotalDataToSend + " bytes, with " + mLocalPaths.length + " files");
         

+        mSuccessCounter = 0;
+        

         for (int i = 0; i < mLocalPaths.length; ++i) {
             
             String mimeType;
         for (int i = 0; i < mLocalPaths.length; ++i) {
             
             String mimeType;


@@ -182,10 +169,9 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
                 mimeType = "application/octet-stream";
             }
             
                 mimeType = "application/octet-stream";
             }
             

-            mResult = false;

             mCurrentIndexUpload = i;
             if (wc.putFile(mLocalPaths[i], mRemotePaths[i], mimeType)) {
             mCurrentIndexUpload = i;
             if (wc.putFile(mLocalPaths[i], mRemotePaths[i], mimeType)) {

-                mResult |= true;
+                mSuccessCounter++;

                 OCFile new_file = new OCFile(mRemotePaths[i]);
                 new_file.setMimetype(mimeType);
                 new_file.setFileLength(new File(mLocalPaths[i]).length());
                 OCFile new_file = new OCFile(mRemotePaths[i]);
                 new_file.setMimetype(mimeType);
                 new_file.setFileLength(new File(mLocalPaths[i]).length());