Show the details of a file when the status notification of a download in progress...

diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java
index 4969c90..b346ed7 100644 (file)
--- a/src/com/owncloud/android/files/services/FileDownloader.java
+++ b/src/com/owncloud/android/files/services/FileDownloader.java
@@ -7,12 +7,15 @@ import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;\r
 import java.util.concurrent.ConcurrentMap;\r
 \r
 import java.util.concurrent.ConcurrentHashMap;\r
 import java.util.concurrent.ConcurrentMap;\r
 \r

+import com.owncloud.android.datamodel.OCFile;\r

 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;\r
 import eu.alefzero.webdav.OnDatatransferProgressListener;\r
 \r
 import com.owncloud.android.network.OwnCloudClientUtils;\r
 import com.owncloud.android.operations.DownloadFileOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult;\r
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;\r
 import eu.alefzero.webdav.OnDatatransferProgressListener;\r
 \r
 import com.owncloud.android.network.OwnCloudClientUtils;\r
 import com.owncloud.android.operations.DownloadFileOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult;\r

+import com.owncloud.android.ui.activity.FileDetailActivity;\r
+import com.owncloud.android.ui.fragment.FileDetailFragment;\r

 \r
 import android.accounts.Account;\r
 import android.app.Notification;\r
 \r
 import android.accounts.Account;\r
 import android.app.Notification;\r


@@ -32,16 +35,18 @@ import android.os.Message;
 import android.os.Process;\r
 import android.util.Log;\r
 import android.widget.RemoteViews;\r
 import android.os.Process;\r
 import android.util.Log;\r
 import android.widget.RemoteViews;\r

+\r

 import com.owncloud.android.R;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 public class FileDownloader extends Service implements OnDatatransferProgressListener {\r
 import com.owncloud.android.R;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 public class FileDownloader extends Service implements OnDatatransferProgressListener {\r

+    public static final String EXTRA_ACCOUNT = "ACCOUNT";\r
+    public static final String EXTRA_FILE = "FILE";\r
+    \r

     public static final String DOWNLOAD_FINISH_MESSAGE = "DOWNLOAD_FINISH";\r
     public static final String EXTRA_DOWNLOAD_RESULT = "RESULT";    \r
     public static final String DOWNLOAD_FINISH_MESSAGE = "DOWNLOAD_FINISH";\r
     public static final String EXTRA_DOWNLOAD_RESULT = "RESULT";    \r

-    public static final String EXTRA_ACCOUNT = "ACCOUNT";\r

     public static final String EXTRA_FILE_PATH = "FILE_PATH";\r
     public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH";\r
     public static final String EXTRA_FILE_PATH = "FILE_PATH";\r
     public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH";\r

-    public static final String EXTRA_FILE_SIZE = "FILE_SIZE";\r

     public static final String ACCOUNT_NAME = "ACCOUNT_NAME";\r
     \r
     private static final String TAG = "FileDownloader";\r
     public static final String ACCOUNT_NAME = "ACCOUNT_NAME";\r
     \r
     private static final String TAG = "FileDownloader";\r


@@ -63,8 +68,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
     /**\r
      * Builds a key for mDownloadsInProgress from the accountName and remotePath\r
      */\r
     /**\r
      * Builds a key for mDownloadsInProgress from the accountName and remotePath\r
      */\r

-    private static String buildRemoteName(String accountName, String remotePath) {\r
-        return accountName + remotePath;\r
+    private String buildRemoteName(Account account, OCFile file) {\r
+        return account.name + file.getRemotePath();\r

     }\r
     \r
     public static final String getSavePath(String accountName) {\r
     }\r
     \r
     public static final String getSavePath(String accountName) {\r


@@ -105,21 +110,20 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
     @Override\r
     public int onStartCommand(Intent intent, int flags, int startId) {\r
         if (    !intent.hasExtra(EXTRA_ACCOUNT) ||\r
     @Override\r
     public int onStartCommand(Intent intent, int flags, int startId) {\r
         if (    !intent.hasExtra(EXTRA_ACCOUNT) ||\r

-                !intent.hasExtra(EXTRA_FILE_PATH) ||\r
-                !intent.hasExtra(EXTRA_REMOTE_PATH)\r
+                !intent.hasExtra(EXTRA_FILE)\r
+                /*!intent.hasExtra(EXTRA_FILE_PATH) ||\r
+                !intent.hasExtra(EXTRA_REMOTE_PATH)*/\r

            ) {\r
             Log.e(TAG, "Not enough information provided in intent");\r
             return START_NOT_STICKY;\r
         }\r
         Account account = intent.getParcelableExtra(EXTRA_ACCOUNT);\r
            ) {\r
             Log.e(TAG, "Not enough information provided in intent");\r
             return START_NOT_STICKY;\r
         }\r
         Account account = intent.getParcelableExtra(EXTRA_ACCOUNT);\r

-        String filePath = intent.getStringExtra(EXTRA_FILE_PATH);\r
-        String remotePath = intent.getStringExtra(EXTRA_REMOTE_PATH);\r
-        long totalDownloadSize = intent.getLongExtra(EXTRA_FILE_SIZE, -1);\r
-\r
-        AbstractList<String> requestedDownloads = new Vector<String>(); // dvelasco: now this will always contain just one element, but that can change in a near future\r
-        String downloadKey = buildRemoteName(account.name, remotePath);\r
+        OCFile file = intent.getParcelableExtra(EXTRA_FILE);\r
+        \r
+        AbstractList<String> requestedDownloads = new Vector<String>(); // dvelasco: now this always contains just one element, but that can change in a near future (download of multiple selection)\r
+        String downloadKey = buildRemoteName(account, file);\r

         try {\r
         try {\r

-            DownloadFileOperation newDownload = new DownloadFileOperation(account, filePath, remotePath, (String)null, totalDownloadSize, false); \r
+            DownloadFileOperation newDownload = new DownloadFileOperation(account, file); \r

             mPendingDownloads.putIfAbsent(downloadKey, newDownload);\r
             newDownload.addDatatransferProgressListener(this);\r
             requestedDownloads.add(downloadKey);\r
             mPendingDownloads.putIfAbsent(downloadKey, newDownload);\r
             newDownload.addDatatransferProgressListener(this);\r
             requestedDownloads.add(downloadKey);\r


@@ -162,12 +166,12 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
          * Cancels a pending or current download of a remote file.\r
          * \r
          * @param account       Owncloud account where the remote file is stored.\r
          * Cancels a pending or current download of a remote file.\r
          * \r
          * @param account       Owncloud account where the remote file is stored.\r

-         * @param remotePath    URL to the remote file in the queue of downloads.\r
+         * @param file          A file in the queue of pending downloads\r

          */\r
          */\r

-        public void cancel(Account account, String remotePath) {\r
+        public void cancel(Account account, OCFile file) {\r

             DownloadFileOperation download = null;\r
             synchronized (mPendingDownloads) {\r
             DownloadFileOperation download = null;\r
             synchronized (mPendingDownloads) {\r

-                download = mPendingDownloads.remove(buildRemoteName(account.name, remotePath));\r
+                download = mPendingDownloads.remove(buildRemoteName(account, file));\r

             }\r
             if (download != null) {\r
                 download.cancel();\r
             }\r
             if (download != null) {\r
                 download.cancel();\r


@@ -179,15 +183,16 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
          * Returns True when the file referred by 'remotePath' in the ownCloud account 'account' is downloading\r
          * \r
          * @param account       Owncloud account where the remote file is stored.\r
          * Returns True when the file referred by 'remotePath' in the ownCloud account 'account' is downloading\r
          * \r
          * @param account       Owncloud account where the remote file is stored.\r

-         * @param remotePath    URL to the remote file in the queue of downloads.\r
+         * @param file          A file in the queue of downloads.\r

          */\r
          */\r

-        public boolean isDownloading(Account account, String remotePath) {\r
+        public boolean isDownloading(Account account, OCFile file) {\r

             synchronized (mPendingDownloads) {\r
             synchronized (mPendingDownloads) {\r

-                return (mPendingDownloads.containsKey(buildRemoteName(account.name, remotePath)));\r
+                return (mPendingDownloads.containsKey(buildRemoteName(account, file)));\r

             }\r
         }\r
     }\r
     \r
             }\r
         }\r
     }\r
     \r

+    \r

     /** \r
      * Download worker. Performs the pending downloads in the order they were requested. \r
      * \r
     /** \r
      * Download worker. Performs the pending downloads in the order they were requested. \r
      * \r


@@ -236,35 +241,31 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
             }\r
 \r
             /// perform the download\r
             }\r
 \r
             /// perform the download\r

-            //mDownloadsInProgress.add(buildRemoteName(mLastAccount.name, mCurrentDownload.getRemotePath()));\r

             RemoteOperationResult downloadResult = null;\r
             RemoteOperationResult downloadResult = null;\r

-            File newLocalFile = null;\r
-            //try {\r
+            try {\r

                 downloadResult = mCurrentDownload.execute(mDownloadClient);\r
                 if (downloadResult.isSuccess()) {\r
                     ContentValues cv = new ContentValues();\r
                 downloadResult = mCurrentDownload.execute(mDownloadClient);\r
                 if (downloadResult.isSuccess()) {\r
                     ContentValues cv = new ContentValues();\r

-                    newLocalFile = new File(getSavePath(mCurrentDownload.getAccount().name) + mCurrentDownload.getLocalPath());\r
-                    cv.put(ProviderTableMeta.FILE_STORAGE_PATH, newLocalFile.getAbsolutePath());\r
+                    cv.put(ProviderTableMeta.FILE_STORAGE_PATH, mCurrentDownload.getSavePath());\r

                     getContentResolver().update(\r
                             ProviderTableMeta.CONTENT_URI,\r
                             cv,\r
                             ProviderTableMeta.FILE_NAME + "=? AND "\r
                                     + ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",\r
                                     new String[] {\r
                     getContentResolver().update(\r
                             ProviderTableMeta.CONTENT_URI,\r
                             cv,\r
                             ProviderTableMeta.FILE_NAME + "=? AND "\r
                                     + ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",\r
                                     new String[] {\r

-                                    mCurrentDownload.getLocalPath().substring(mCurrentDownload.getLocalPath().lastIndexOf('/') + 1),\r
+                                    mCurrentDownload.getSavePath().substring(mCurrentDownload.getSavePath().lastIndexOf('/') + 1),\r

                                     mLastAccount.name });\r
                 }\r
             \r
                                     mLastAccount.name });\r
                 }\r
             \r

-            /*} finally {\r
-                mDownloadsInProgress.remove(buildRemoteName(mLastAccount.name, mCurrentDownload.getRemotePath()));\r
-            }*/\r
-        \r
-            mPendingDownloads.remove(downloadKey);\r
+            } finally {\r
+                mPendingDownloads.remove(downloadKey);\r
+            }\r
+\r

             \r
             /// notify result\r
             notifyDownloadResult(mCurrentDownload, downloadResult);\r
             \r
             \r
             /// notify result\r
             notifyDownloadResult(mCurrentDownload, downloadResult);\r
             \r

-            sendFinalBroadcast(mCurrentDownload, downloadResult, (downloadResult.isSuccess())? newLocalFile.getAbsolutePath():null);\r
+            sendFinalBroadcast(mCurrentDownload, downloadResult);\r

         }\r
     }\r
 \r
         }\r
     }\r
 \r


@@ -305,10 +306,16 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
         mNotification.flags |= Notification.FLAG_ONGOING_EVENT;\r
         mNotification.contentView = new RemoteViews(getApplicationContext().getPackageName(), R.layout.progressbar_layout);\r
         mNotification.contentView.setProgressBar(R.id.status_progress, 100, 0, download.getSize() == -1);\r
         mNotification.flags |= Notification.FLAG_ONGOING_EVENT;\r
         mNotification.contentView = new RemoteViews(getApplicationContext().getPackageName(), R.layout.progressbar_layout);\r
         mNotification.contentView.setProgressBar(R.id.status_progress, 100, 0, download.getSize() == -1);\r

-        mNotification.contentView.setTextViewText(R.id.status_text, String.format(getString(R.string.downloader_download_in_progress_content), 0, new File(download.getLocalPath()).getName()));\r
+        mNotification.contentView.setTextViewText(R.id.status_text, String.format(getString(R.string.downloader_download_in_progress_content), 0, new File(download.getSavePath()).getName()));\r

         mNotification.contentView.setImageViewResource(R.id.status_icon, R.drawable.icon);\r
         mNotification.contentView.setImageViewResource(R.id.status_icon, R.drawable.icon);\r

-        // TODO put something smart in the contentIntent below\r
-        mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT);\r
+        \r
+        /// includes a pending intent in the notification showing the details view of the file\r
+        Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
+        showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, download.getFile());\r
+        showDetailsIntent.putExtra(FileDownloader.EXTRA_ACCOUNT, download.getAccount());\r
+        showDetailsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
+        mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, showDetailsIntent, PendingIntent.FLAG_UPDATE_CURRENT);\r
+        \r

         mNotificationMngr.notify(R.string.downloader_download_in_progress_ticker, mNotification);\r
     }\r
 \r
         mNotificationMngr.notify(R.string.downloader_download_in_progress_ticker, mNotification);\r
     }\r
 \r


@@ -328,7 +335,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
             finalNotification.flags |= Notification.FLAG_AUTO_CANCEL;\r
             // TODO put something smart in the contentIntent below\r
             finalNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT);\r
             finalNotification.flags |= Notification.FLAG_AUTO_CANCEL;\r
             // TODO put something smart in the contentIntent below\r
             finalNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT);\r

-            finalNotification.setLatestEventInfo(getApplicationContext(), getString(tickerId), String.format(getString(contentId), new File(download.getLocalPath()).getName()), finalNotification.contentIntent);\r
+            finalNotification.setLatestEventInfo(getApplicationContext(), getString(tickerId), String.format(getString(contentId), new File(download.getSavePath()).getName()), finalNotification.contentIntent);\r

             mNotificationMngr.notify(tickerId, finalNotification);\r
         }\r
     }\r
             mNotificationMngr.notify(tickerId, finalNotification);\r
         }\r
     }\r


@@ -339,15 +346,14 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
      * \r
      * @param download          Finished download operation\r
      * @param downloadResult    Result of the download operation\r
      * \r
      * @param download          Finished download operation\r
      * @param downloadResult    Result of the download operation\r

-     * @param newFilePath       Absolute path to the downloaded file\r

      */\r
      */\r

-    private void sendFinalBroadcast(DownloadFileOperation download, RemoteOperationResult downloadResult, String newFilePath) {\r
+    private void sendFinalBroadcast(DownloadFileOperation download, RemoteOperationResult downloadResult) {\r

         Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE);\r
         end.putExtra(EXTRA_DOWNLOAD_RESULT, downloadResult.isSuccess());\r
         end.putExtra(ACCOUNT_NAME, download.getAccount().name);\r
         end.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());\r
         if (downloadResult.isSuccess()) {\r
         Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE);\r
         end.putExtra(EXTRA_DOWNLOAD_RESULT, downloadResult.isSuccess());\r
         end.putExtra(ACCOUNT_NAME, download.getAccount().name);\r
         end.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());\r
         if (downloadResult.isSuccess()) {\r

-            end.putExtra(EXTRA_FILE_PATH, newFilePath);\r
+            end.putExtra(EXTRA_FILE_PATH, download.getSavePath());\r

         }\r
         sendBroadcast(end);\r
     }\r
         }\r
         sendBroadcast(end);\r
     }\r

diff --git a/src/com/owncloud/android/operations/DownloadFileOperation.java b/src/com/owncloud/android/operations/DownloadFileOperation.java
index c41db78..f3ce4b1 100644 (file)
--- a/src/com/owncloud/android/operations/DownloadFileOperation.java
+++ b/src/com/owncloud/android/operations/DownloadFileOperation.java
@@ -31,6 +31,7 @@ import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.http.HttpStatus;
 
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.http.HttpStatus;
 

+import com.owncloud.android.datamodel.OCFile;

 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;


@@ -52,74 +53,68 @@ public class DownloadFileOperation extends RemoteOperation {
     private static final String TAG = DownloadFileOperation.class.getCanonicalName();
 
     private Account mAccount = null;
     private static final String TAG = DownloadFileOperation.class.getCanonicalName();
 
     private Account mAccount = null;

-    private String mLocalPath = null;
-    private String mRemotePath = null;
-    private String mMimeType = null;
-    private long mSize = -1;
+    private OCFile mFile;

     private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
     
     private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
 
     
     private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
     
     private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
 
     

-    public Account getAccount() {
-        return mAccount;
+    public DownloadFileOperation(Account account, OCFile file) {
+        if (account == null)
+            throw new IllegalArgumentException("Illegal null account in DownloadFileOperation creation");
+        if (file == null)
+            throw new IllegalArgumentException("Illegal null file in DownloadFileOperation creation");
+        
+        mAccount = account;
+        mFile = file;

     }
 
     }
 

-    public String getLocalPath() {
-        return mLocalPath;
+
+    public Account getAccount() {
+        return mAccount;

     }
     
     }
     

-    public String getRemotePath() {
-        return mRemotePath;
+    public OCFile getFile() {
+        return mFile;

     }
 
     }
 

-    public String getMimeType() {
-        return mMimeType;
+    public String getSavePath() {
+        return FileDownloader.getSavePath(mAccount.name) + mFile.getRemotePath();

     }
     
     }
     

-    public long getSize() {
-        return mSize;
+    public String getTmpPath() {
+        return FileDownloader.getTemporalPath(mAccount.name) + mFile.getRemotePath();

     }
     
     }
     

-    
-    public DownloadFileOperation( Account account, 
-                                String localPath, 
-                                String remotePath, 
-                                String mimeType, 
-                                long size,
-                                boolean forceOverwrite) {
-        
-        if (account == null)
-            throw new IllegalArgumentException("Illegal null account in DownloadFileOperation creation");
-        if (localPath == null)
-            throw new IllegalArgumentException("Illegal null local path in DownloadFileOperation creation");
-        if (remotePath == null)
-            throw new IllegalArgumentException("Illegal null remote path in DownloadFileOperation creation");
-        
-        mAccount = account;
-        mLocalPath = localPath;
-        mRemotePath = remotePath;
-        mMimeType = mimeType;
-        if (mMimeType == null) {
+    public String getRemotePath() {
+        return mFile.getRemotePath();
+    }
+
+    public String getMimeType() {
+        String mimeType = mFile.getMimetype();
+        if (mimeType == null || mimeType.length() <= 0) {

             try {
             try {

-                mMimeType = MimeTypeMap.getSingleton()
+                mimeType = MimeTypeMap.getSingleton()

                     .getMimeTypeFromExtension(
                     .getMimeTypeFromExtension(

-                            localPath.substring(localPath.lastIndexOf('.') + 1));
+                            mFile.getRemotePath().substring(mFile.getRemotePath().lastIndexOf('.') + 1));

             } catch (IndexOutOfBoundsException e) {
             } catch (IndexOutOfBoundsException e) {

-                Log.e(TAG, "Trying to find out MIME type of a file without extension: " + localPath);
+                Log.e(TAG, "Trying to find out MIME type of a file without extension: " + mFile.getRemotePath());

             }
         }
             }
         }

-        if (mMimeType == null) {
-            mMimeType = "application/octet-stream";
+        if (mimeType == null) {
+            mimeType = "application/octet-stream";

         }
         }

-        mSize = size;
+        return mimeType;

     }
     
     }
     

-    public void addDatatransferProgressListener (OnDatatransferProgressListener listener) {
-        mDataTransferListeners.add(listener);
+    public long getSize() {
+        return mFile.getFileLength();

     }
     
     
     }
     
     

+    public void addDatatransferProgressListener (OnDatatransferProgressListener listener) {
+        mDataTransferListeners.add(listener);
+    }

     
     @Override
     protected RemoteOperationResult run(WebdavClient client) {
     
     @Override
     protected RemoteOperationResult run(WebdavClient client) {


@@ -127,15 +122,15 @@ public class DownloadFileOperation extends RemoteOperation {
         File newFile = null;
         boolean moved = false;
         
         File newFile = null;
         boolean moved = false;
         

-        /// download will be in a temporal file
-        File tmpFile = new File(FileDownloader.getTemporalPath(mAccount.name) + mLocalPath);
+        /// download will be performed to a temporal file, then moved to the final location
+        File tmpFile = new File(getTmpPath());

         
         /// perform the download
         try {
             tmpFile.getParentFile().mkdirs();
             int status = downloadFile(client, tmpFile);
             if (isSuccess(status)) {
         
         /// perform the download
         try {
             tmpFile.getParentFile().mkdirs();
             int status = downloadFile(client, tmpFile);
             if (isSuccess(status)) {

-                newFile = new File(FileDownloader.getSavePath(mAccount.name) + mLocalPath);
+                newFile = new File(getSavePath());

                 newFile.getParentFile().mkdirs();
                 moved = tmpFile.renameTo(newFile);
             }
                 newFile.getParentFile().mkdirs();
                 moved = tmpFile.renameTo(newFile);
             }


@@ -143,11 +138,11 @@ public class DownloadFileOperation extends RemoteOperation {
                 result = new RemoteOperationResult(RemoteOperationResult.ResultCode.STORAGE_ERROR_MOVING_FROM_TMP);
             else
                 result = new RemoteOperationResult(isSuccess(status), status);
                 result = new RemoteOperationResult(RemoteOperationResult.ResultCode.STORAGE_ERROR_MOVING_FROM_TMP);
             else
                 result = new RemoteOperationResult(isSuccess(status), status);

-            Log.i(TAG, "Download of " + mLocalPath + " to " + mRemotePath + ": " + result.getLogMessage());
+            Log.i(TAG, "Download of " + mFile.getRemotePath() + " to " + getSavePath() + ": " + result.getLogMessage());

             
         } catch (Exception e) {
             result = new RemoteOperationResult(e);
             
         } catch (Exception e) {
             result = new RemoteOperationResult(e);

-            Log.e(TAG, "Download of " + mRemotePath + " to " + mLocalPath + ": " + result.getLogMessage(), e);
+            Log.e(TAG, "Download of " + mFile.getRemotePath() + " to " + getSavePath() + ": " + result.getLogMessage(), e);

         }
         
         return result;
         }
         
         return result;


@@ -162,7 +157,7 @@ public class DownloadFileOperation extends RemoteOperation {
     protected int downloadFile(WebdavClient client, File targetFile) throws HttpException, IOException, OperationCancelledException {
         int status = -1;
         boolean savedFile = false;
     protected int downloadFile(WebdavClient client, File targetFile) throws HttpException, IOException, OperationCancelledException {
         int status = -1;
         boolean savedFile = false;

-        GetMethod get = new GetMethod(client.getBaseUri() + WebdavUtils.encodePath(mRemotePath));
+        GetMethod get = new GetMethod(client.getBaseUri() + WebdavUtils.encodePath(mFile.getRemotePath()));

         Iterator<OnDatatransferProgressListener> it = null;
         
         FileOutputStream fos = null;
         Iterator<OnDatatransferProgressListener> it = null;
         
         FileOutputStream fos = null;


@@ -187,7 +182,7 @@ public class DownloadFileOperation extends RemoteOperation {
                     transferred += readResult;
                     it = mDataTransferListeners.iterator();
                     while (it.hasNext()) {
                     transferred += readResult;
                     it = mDataTransferListeners.iterator();
                     while (it.hasNext()) {

-                        it.next().onTransferProgress(readResult, transferred, mSize, targetFile.getName());
+                        it.next().onTransferProgress(readResult, transferred, mFile.getFileLength(), targetFile.getName());

                     }
                 }
                 savedFile = true;
                     }
                 }
                 savedFile = true;


@@ -210,5 +205,5 @@ public class DownloadFileOperation extends RemoteOperation {
     public void cancel() {
         mCancellationRequested.set(true);   // atomic set; there is no need of synchronizing it
     }
     public void cancel() {
         mCancellationRequested.set(true);   // atomic set; there is no need of synchronizing it
     }

-    
+

 }
 }

diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index 5f59475..e55d618 100644 (file)
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -207,9 +207,10 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                                                                          .getModificationTimestamp()) {\r
                         Intent intent = new Intent(this.getContext(), FileDownloader.class);\r
                         intent.putExtra(FileDownloader.EXTRA_ACCOUNT, getAccount());\r
                                                                          .getModificationTimestamp()) {\r
                         Intent intent = new Intent(this.getContext(), FileDownloader.class);\r
                         intent.putExtra(FileDownloader.EXTRA_ACCOUNT, getAccount());\r

-                        intent.putExtra(FileDownloader.EXTRA_FILE_PATH, file.getRemotePath());\r
+                        intent.putExtra(FileDownloader.EXTRA_FILE, file);\r
+                        /*intent.putExtra(FileDownloader.EXTRA_FILE_PATH, file.getRemotePath());\r

                         intent.putExtra(FileDownloader.EXTRA_REMOTE_PATH, file.getRemotePath());\r
                         intent.putExtra(FileDownloader.EXTRA_REMOTE_PATH, file.getRemotePath());\r

-                        intent.putExtra(FileDownloader.EXTRA_FILE_SIZE, file.getFileLength());\r
+                        intent.putExtra(FileDownloader.EXTRA_FILE_SIZE, file.getFileLength());*/\r

                         file.setKeepInSync(true);\r
                         getContext().startService(intent);\r
                     }\r
                         file.setKeepInSync(true);\r
                         getContext().startService(intent);\r
                     }\r

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 6b28f09..b88368f 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -123,7 +123,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
             ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);\r
             //if (FileDownloader.isDownloading(mAccount, file.getRemotePath())) {\r
             FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();\r
             ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);\r
             //if (FileDownloader.isDownloading(mAccount, file.getRemotePath())) {\r
             FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();\r

-            if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file.getRemotePath())) {\r
+            if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) {\r

                 localStateView.setImageResource(R.drawable.downloading_file_indicator);\r
                 localStateView.setVisibility(View.VISIBLE);\r
             } else if (FileUploader.isUploading(mAccount, file.getRemotePath())) {\r
                 localStateView.setImageResource(R.drawable.downloading_file_indicator);\r
                 localStateView.setVisibility(View.VISIBLE);\r
             } else if (FileUploader.isUploading(mAccount, file.getRemotePath())) {\r

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 91980e5..c84e2cf 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -245,8 +245,8 @@ public class FileDetailFragment extends SherlockFragment implements
             case R.id.fdDownloadBtn: {\r
                 //if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath())) {\r
                 FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();\r
             case R.id.fdDownloadBtn: {\r
                 //if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath())) {\r
                 FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();\r

-                if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile.getRemotePath())) {\r
-                    downloaderBinder.cancel(mAccount, mFile.getRemotePath());\r
+                if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile)) {\r
+                    downloaderBinder.cancel(mAccount, mFile);\r

                     if (mFile.isDown()) {\r
                         setButtonsForDown();\r
                     } else {\r
                     if (mFile.isDown()) {\r
                         setButtonsForDown();\r
                     } else {\r


@@ -256,9 +256,10 @@ public class FileDetailFragment extends SherlockFragment implements
                 } else {\r
                     Intent i = new Intent(getActivity(), FileDownloader.class);\r
                     i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);\r
                 } else {\r
                     Intent i = new Intent(getActivity(), FileDownloader.class);\r
                     i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);\r

-                    i.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mFile.getRemotePath());\r
+                    i.putExtra(FileDownloader.EXTRA_FILE, mFile);\r
+                    /*i.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mFile.getRemotePath());\r

                     i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getRemotePath());\r
                     i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getRemotePath());\r

-                    i.putExtra(FileDownloader.EXTRA_FILE_SIZE, mFile.getFileLength());\r
+                    i.putExtra(FileDownloader.EXTRA_FILE_SIZE, mFile.getFileLength());*/\r

                 \r
                     // update ui \r
                     setButtonsForTransferring();\r
                 \r
                     // update ui \r
                     setButtonsForTransferring();\r


@@ -443,7 +444,7 @@ public class FileDetailFragment extends SherlockFragment implements
             // configure UI for depending upon local state of the file\r
             //if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath()) || FileUploader.isUploading(mAccount, mFile.getRemotePath())) {\r
             FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();\r
             // configure UI for depending upon local state of the file\r
             //if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath()) || FileUploader.isUploading(mAccount, mFile.getRemotePath())) {\r
             FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();\r

-            if ((downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile.getRemotePath())) || FileUploader.isUploading(mAccount, mFile.getRemotePath())) {\r
+            if ((downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile)) || FileUploader.isUploading(mAccount, mFile.getRemotePath())) {\r

                 setButtonsForTransferring();\r
                 \r
             } else if (mFile.isDown()) {\r
                 setButtonsForTransferring();\r
                 \r
             } else if (mFile.isDown()) {\r