Fixed crash when download notification is pressed in landscape 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 2e0c686..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


@@ -52,40 +57,19 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
     private WebdavClient mDownloadClient = null;\r
     private Account mLastAccount = null;\r
     \r
     private WebdavClient mDownloadClient = null;\r
     private Account mLastAccount = null;\r
     \r

-    //private AbstractList<Account> mAccounts = new Vector<Account>();\r

     private ConcurrentMap<String, DownloadFileOperation> mPendingDownloads = new ConcurrentHashMap<String, DownloadFileOperation>();\r
     private DownloadFileOperation mCurrentDownload = null;\r
     \r
     private ConcurrentMap<String, DownloadFileOperation> mPendingDownloads = new ConcurrentHashMap<String, DownloadFileOperation>();\r
     private DownloadFileOperation mCurrentDownload = null;\r
     \r

-    /*\r
-    private Account mAccount;\r
-    private String mFilePath;\r
-    private String mRemotePath;\r
-    private long mTotalDownloadSize;\r
-    private long mCurrentDownloadSize;\r
-    */\r
-    \r

     private NotificationManager mNotificationMngr;\r
     private Notification mNotification;\r
     private int mLastPercent;\r
     \r
     \r
     /**\r
     private NotificationManager mNotificationMngr;\r
     private Notification mNotification;\r
     private int mLastPercent;\r
     \r
     \r
     /**\r

-     * Static map with the files being download and the path to the temporal file were are download\r
-     */\r
-    //private static Set<String> mDownloadsInProgress = Collections.synchronizedSet(new HashSet<String>());\r
-    \r
-    /**\r
-     * Returns True when the file referred by 'remotePath' in the ownCloud account 'account' is downloading\r
-     */\r
-    /*public static boolean isDownloading(Account account, String remotePath) {\r
-        return (mDownloadsInProgress.contains(buildRemoteName(account.name, remotePath)));\r
-    }*/\r
-    \r
-    /**\r

      * Builds a key for mDownloadsInProgress from the accountName and remotePath\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


@@ -126,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


@@ -183,14 +166,15 @@ 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
             synchronized (mPendingDownloads) {\r

-                DownloadFileOperation download = mPendingDownloads.remove(buildRemoteName(account.name, remotePath));\r
-                if (download != null) {\r
-                    download.cancel();\r
-                }\r
+                download = mPendingDownloads.remove(buildRemoteName(account, file));\r
+            }\r
+            if (download != null) {\r
+                download.cancel();\r

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


@@ -199,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


@@ -256,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


@@ -325,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


@@ -348,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


@@ -359,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