Automatic download of previewable files in download mode

[pub/Android/ownCloud.git] / src / com / owncloud / android / files / services / FileDownloader.java

diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java
index 5fd6665..d3317d8 100644 (file)
--- a/src/com/owncloud/android/files/services/FileDownloader.java
+++ b/src/com/owncloud/android/files/services/FileDownloader.java
@@ -20,7 +20,9 @@ package com.owncloud.android.files.services;
 \r
 import java.io.File;\r
 import java.util.AbstractList;\r
 \r
 import java.io.File;\r
 import java.util.AbstractList;\r

+import java.util.HashMap;\r

 import java.util.Iterator;\r
 import java.util.Iterator;\r

+import java.util.Map;\r

 import java.util.Vector;\r
 import java.util.concurrent.ConcurrentHashMap;\r
 import java.util.concurrent.ConcurrentMap;\r
 import java.util.Vector;\r
 import java.util.concurrent.ConcurrentHashMap;\r
 import java.util.concurrent.ConcurrentMap;\r


@@ -49,7 +51,6 @@ import android.os.Looper;
 import android.os.Message;\r
 import android.os.Process;\r
 import android.util.Log;\r
 import android.os.Message;\r
 import android.os.Process;\r
 import android.util.Log;\r

-import android.widget.ProgressBar;\r

 import android.widget.RemoteViews;\r
 \r
 import com.owncloud.android.R;\r
 import android.widget.RemoteViews;\r
 \r
 import com.owncloud.android.R;\r


@@ -136,6 +137,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
             DownloadFileOperation newDownload = new DownloadFileOperation(account, file); \r
             mPendingDownloads.putIfAbsent(downloadKey, newDownload);\r
             newDownload.addDatatransferProgressListener(this);\r
             DownloadFileOperation newDownload = new DownloadFileOperation(account, file); \r
             mPendingDownloads.putIfAbsent(downloadKey, newDownload);\r
             newDownload.addDatatransferProgressListener(this);\r

+            newDownload.addDatatransferProgressListener((FileDownloaderBinder)mBinder);\r

             requestedDownloads.add(downloadKey);\r
             sendBroadcastNewDownload(newDownload);\r
             \r
             requestedDownloads.add(downloadKey);\r
             sendBroadcastNewDownload(newDownload);\r
             \r


@@ -165,13 +167,29 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
         return mBinder;\r
     }\r
 \r
         return mBinder;\r
     }\r
 \r

+\r
+    /**\r
+     * Called when ALL the bound clients were onbound.\r
+     */\r
+    @Override\r
+    public boolean onUnbind(Intent intent) {\r
+        ((FileDownloaderBinder)mBinder).clearListeners();\r
+        return false;   // not accepting rebinding (default behaviour)\r
+    }\r
+\r

     \r
     /**\r
      *  Binder to let client components to perform operations on the queue of downloads.\r
      * \r
      *  It provides by itself the available operations.\r
      */\r
     \r
     /**\r
      *  Binder to let client components to perform operations on the queue of downloads.\r
      * \r
      *  It provides by itself the available operations.\r
      */\r

-    public class FileDownloaderBinder extends Binder {\r
+    public class FileDownloaderBinder extends Binder implements OnDatatransferProgressListener {\r
+        \r
+        /** \r
+         * Map of listeners that will be reported about progress of downloads from a {@link FileDownloaderBinder} instance \r
+         */\r
+        private Map<String, OnDatatransferProgressListener> mBoundListeners = new HashMap<String, OnDatatransferProgressListener>();\r
+        \r

         \r
         /**\r
          * Cancels a pending or current download of a remote file.\r
         \r
         /**\r
          * Cancels a pending or current download of a remote file.\r


@@ -190,6 +208,11 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
         }\r
         \r
         \r
         }\r
         \r
         \r

+        public void clearListeners() {\r
+            mBoundListeners.clear();\r
+        }\r
+\r
+\r

         /**\r
          * Returns True when the file described by 'file' in the ownCloud account 'account' is downloading or waiting to download.\r
          * \r
         /**\r
          * Returns True when the file described by 'file' in the ownCloud account 'account' is downloading or waiting to download.\r
          * \r


@@ -225,22 +248,13 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
          * @param file          {@link OCfile} of interest for listener. \r
          */\r
         public void addDatatransferProgressListener (OnDatatransferProgressListener listener, Account account, OCFile file) {\r
          * @param file          {@link OCfile} of interest for listener. \r
          */\r
         public void addDatatransferProgressListener (OnDatatransferProgressListener listener, Account account, OCFile file) {\r

-            if (account == null || file == null) return;\r
+            if (account == null || file == null || listener == null) return;\r

             String targetKey = buildRemoteName(account, file);\r
             String targetKey = buildRemoteName(account, file);\r

-            DownloadFileOperation target = null;\r
-            synchronized (mPendingDownloads) {\r
-                if (!file.isDirectory()) {\r
-                    target = mPendingDownloads.get(targetKey);\r
-                } else {\r
-                    // nothing to do for directories, right now\r
-                }\r
-            }\r
-            if (target != null) {\r
-                target.addDatatransferProgressListener(listener);\r
-            }\r
+            mBoundListeners.put(targetKey, listener);\r

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

+        \r

         /**\r
          * Removes a listener interested in the progress of the download for a concrete file.\r
          * \r
         /**\r
          * Removes a listener interested in the progress of the download for a concrete file.\r
          * \r


@@ -249,18 +263,27 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
          * @param file          {@link OCfile} of interest for listener. \r
          */\r
         public void removeDatatransferProgressListener (OnDatatransferProgressListener listener, Account account, OCFile file) {\r
          * @param file          {@link OCfile} of interest for listener. \r
          */\r
         public void removeDatatransferProgressListener (OnDatatransferProgressListener listener, Account account, OCFile file) {\r

-            if (account == null || file == null) return;\r
+            if (account == null || file == null || listener == null) return;\r

             String targetKey = buildRemoteName(account, file);\r
             String targetKey = buildRemoteName(account, file);\r

-            DownloadFileOperation target = null;\r
-            synchronized (mPendingDownloads) {\r
-                if (!file.isDirectory()) {\r
-                    target = mPendingDownloads.get(targetKey);\r
-                } else {\r
-                    // nothing to do for directories, right now\r
-                }\r
+            if (mBoundListeners.get(targetKey) == listener) {\r
+                mBoundListeners.remove(targetKey);\r

             }\r
             }\r

-            if (target != null) {\r
-                target.removeDatatransferProgressListener(listener);\r
+        }\r
+\r
+\r
+        @Override\r
+        public void onTransferProgress(long progressRate) {\r
+            // old way, should not be in use any more\r
+        }\r
+\r
+\r
+        @Override\r
+        public void onTransferProgress(long progressRate, long totalTransferredSoFar, long totalToTransfer,\r
+                String fileName) {\r
+            String key = buildRemoteName(mCurrentDownload.getAccount(), mCurrentDownload.getFile());\r
+            OnDatatransferProgressListener boundListener = mBoundListeners.get(key);\r
+            if (boundListener != null) {\r
+                boundListener.onTransferProgress(progressRate, totalTransferredSoFar, totalToTransfer, fileName);\r

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


@@ -456,8 +479,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
      */\r
     private void sendBroadcastNewDownload(DownloadFileOperation download) {\r
         Intent added = new Intent(DOWNLOAD_ADDED_MESSAGE);\r
      */\r
     private void sendBroadcastNewDownload(DownloadFileOperation download) {\r
         Intent added = new Intent(DOWNLOAD_ADDED_MESSAGE);\r

-        /*added.putExtra(ACCOUNT_NAME, download.getAccount().name);\r
-        added.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());*/\r
+        added.putExtra(ACCOUNT_NAME, download.getAccount().name);\r
+        added.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());\r

         added.putExtra(EXTRA_FILE_PATH, download.getSavePath());\r
         sendStickyBroadcast(added);\r
     }\r
         added.putExtra(EXTRA_FILE_PATH, download.getSavePath());\r
         sendStickyBroadcast(added);\r
     }\r