Merge branch 'develop' into setup_buttons

diff --combined src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
index 8d453f6,0e6ad9e..fbb6888
--- 1/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
--- 2/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
+++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
@@@ -20,13 -20,9 +20,13 @@@ package com.owncloud.android.files
  
  import java.io.File;
  
 +import com.owncloud.android.Log_OC;
 +import com.owncloud.android.MainApp;
  import com.owncloud.android.authentication.AccountUtils;
  import com.owncloud.android.db.DbHandler;
  import com.owncloud.android.files.services.FileUploader;
 +import com.owncloud.android.utils.FileStorageUtils;
 +
  
  import android.accounts.Account;
  import android.content.BroadcastReceiver;
@@@ -40,6 -36,9 +40,6 @@@ import android.preference.PreferenceMan
  import android.provider.MediaStore.Images.Media;
  import android.webkit.MimeTypeMap;
  
 -import com.owncloud.android.Log_OC;
 -import com.owncloud.android.MainApp;
 -import com.owncloud.android.utils.FileStorageUtils;
  
  public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
  
@@@ -53,9 -52,6 +53,6 @@@
      @Override
      public void onReceive(Context context, Intent intent) {
          Log_OC.d(TAG, "Received: " + intent.getAction());
-         
-         FileUploader fileUploader = new FileUploader();
-         
          if (intent.getAction().equals(android.net.ConnectivityManager.CONNECTIVITY_ACTION)) {
              handleConnectivityAction(context, intent);
          }else if (intent.getAction().equals(NEW_PHOTO_ACTION_UNOFFICIAL)) {
@@@ -64,7 -60,7 +61,7 @@@
          } else if (intent.getAction().equals(NEW_PHOTO_ACTION)) {
              handleNewPhotoAction(context, intent);
              Log_OC.d(TAG, "OFFICIAL processed: android.hardware.action.NEW_PICTURE");
-         } else if (intent.getAction().equals(fileUploader.getUploadFinishMessage())) {
+         } else if (intent.getAction().equals(FileUploader.getUploadFinishMessage())) {
              handleUploadFinished(context, intent);
          } else {
              Log_OC.e(TAG, "Incorrect intent sent: " + intent.getAction());

diff --combined src/com/owncloud/android/files/services/FileDownloader.java
index 64d5d3e,f71ce33..09103a1
--- 1/src/com/owncloud/android/files/services/FileDownloader.java
--- 2/src/com/owncloud/android/files/services/FileDownloader.java
+++ b/src/com/owncloud/android/files/services/FileDownloader.java
@@@ -28,12 -28,11 +28,12 @@@ import java.util.Vector
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
  
 +import com.owncloud.android.Log_OC;
 +import com.owncloud.android.MainApp;
 +import com.owncloud.android.R;
  import com.owncloud.android.authentication.AuthenticatorActivity;
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
 -import eu.alefzero.webdav.OnDatatransferProgressListener;
 -
  import com.owncloud.android.network.OwnCloudClientUtils;
  import com.owncloud.android.operations.DownloadFileOperation;
  import com.owncloud.android.operations.RemoteOperationResult;
@@@ -43,9 -42,6 +43,9 @@@ import com.owncloud.android.ui.activity
  import com.owncloud.android.ui.preview.PreviewImageActivity;
  import com.owncloud.android.ui.preview.PreviewImageFragment;
  
 +import eu.alefzero.webdav.OnDatatransferProgressListener;
 +
 +
  import android.accounts.Account;
  import android.accounts.AccountsException;
  import android.app.Notification;
@@@ -62,6 -58,9 +62,6 @@@ import android.os.Message
  import android.os.Process;
  import android.widget.RemoteViews;
  
 -import com.owncloud.android.Log_OC;
 -import com.owncloud.android.MainApp;
 -import com.owncloud.android.R;
  import eu.alefzero.webdav.WebdavClient;
  
  public class FileDownloader extends Service implements OnDatatransferProgressListener {
@@@ -93,12 -92,12 +93,12 @@@
      private int mLastPercent;
      
      
-     public String getDownloadAddedMessage() {
-         return getClass().getName().toString() + DOWNLOAD_ADDED_MESSAGE;
+     public static String getDownloadAddedMessage() {
+         return FileDownloader.class.getName().toString() + DOWNLOAD_ADDED_MESSAGE;
      }
      
-     public String getDownloadFinishMessage() {
-         return getClass().getName().toString() + DOWNLOAD_FINISH_MESSAGE;
+     public static String getDownloadFinishMessage() {
+         return FileDownloader.class.getName().toString() + DOWNLOAD_FINISH_MESSAGE;
      }
      
      /**

diff --combined src/com/owncloud/android/files/services/FileObserverService.java
index a0003be,8a6fd5a..7aa3fa9
--- 1/src/com/owncloud/android/files/services/FileObserverService.java
--- 2/src/com/owncloud/android/files/services/FileObserverService.java
+++ b/src/com/owncloud/android/files/services/FileObserverService.java
@@@ -30,7 -30,6 +30,7 @@@ import com.owncloud.android.files.OwnCl
  import com.owncloud.android.operations.SynchronizeFileOperation;
  import com.owncloud.android.utils.FileStorageUtils;
  
 +
  import android.accounts.Account;
  import android.accounts.AccountManager;
  import android.app.Service;
@@@ -58,9 -57,6 +58,6 @@@ public class FileObserverService extend
      private static DownloadCompletedReceiverBis mDownloadReceiver;
      private IBinder mBinder = new LocalBinder();
      
-     private String mDownloadAddedMessage;
-     private String mDownloadFinishMessage;
- 
      public class LocalBinder extends Binder {
          FileObserverService getService() {
              return FileObserverService.this;
@@@ -72,13 -68,9 +69,9 @@@
          super.onCreate();
          mDownloadReceiver = new DownloadCompletedReceiverBis();
          
-         FileDownloader downloader = new FileDownloader();
-         mDownloadAddedMessage = downloader.getDownloadAddedMessage();
-         mDownloadFinishMessage= downloader.getDownloadFinishMessage();
-         
          IntentFilter filter = new IntentFilter();
-         filter.addAction(mDownloadAddedMessage);
-         filter.addAction(mDownloadFinishMessage);        
+         filter.addAction(FileDownloader.getDownloadAddedMessage());
+         filter.addAction(FileDownloader.getDownloadFinishMessage());        
          registerReceiver(mDownloadReceiver, filter);
          
          mObserversMap = new HashMap<String, OwnCloudFileObserver>();
@@@ -268,12 -260,12 +261,12 @@@
              String downloadPath = intent.getStringExtra(FileDownloader.EXTRA_FILE_PATH);
              OwnCloudFileObserver observer = mObserversMap.get(downloadPath);
              if (observer != null) {
-                 if (intent.getAction().equals(mDownloadFinishMessage) &&
+                 if (intent.getAction().equals(FileDownloader.getDownloadFinishMessage()) &&
                          new File(downloadPath).exists()) {  // the download could be successful. not; in both cases, the file could be down, due to a former download or upload   
                      observer.startWatching();
                      Log_OC.d(TAG, "Watching again " + downloadPath);
                  
-                 } else if (intent.getAction().equals(mDownloadAddedMessage)) {
+                 } else if (intent.getAction().equals(FileDownloader.getDownloadAddedMessage())) {
                      observer.stopWatching();
                      Log_OC.d(TAG, "Disabling observance of " + downloadPath);
                  } 

diff --combined src/com/owncloud/android/files/services/FileUploader.java
index 1108462,997a9a4..51f8238
--- 1/src/com/owncloud/android/files/services/FileUploader.java
--- 2/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@@ -33,15 -33,10 +33,15 @@@ import org.apache.jackrabbit.webdav.Dav
  import org.apache.jackrabbit.webdav.MultiStatus;
  import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
  
 +import com.owncloud.android.Log_OC;
 +import com.owncloud.android.MainApp;
 +import com.owncloud.android.R;
  import com.owncloud.android.authentication.AccountAuthenticator;
  import com.owncloud.android.authentication.AuthenticatorActivity;
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
 +import com.owncloud.android.db.DbHandler;
 +import com.owncloud.android.network.OwnCloudClientUtils;
  import com.owncloud.android.operations.ChunkedUploadFileOperation;
  import com.owncloud.android.operations.CreateFolderOperation;
  import com.owncloud.android.operations.ExistenceCheckOperation;
@@@ -49,19 -44,13 +49,19 @@@ import com.owncloud.android.operations.
  import com.owncloud.android.operations.RemoteOperationResult;
  import com.owncloud.android.operations.UploadFileOperation;
  import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 +import com.owncloud.android.ui.activity.FailedUploadActivity;
 +import com.owncloud.android.ui.activity.FileActivity;
 +import com.owncloud.android.ui.activity.FileDisplayActivity;
 +import com.owncloud.android.ui.activity.InstantUploadActivity;
 +import com.owncloud.android.ui.preview.PreviewImageActivity;
 +import com.owncloud.android.ui.preview.PreviewImageFragment;
  import com.owncloud.android.utils.OwnCloudVersion;
  
 +
  import eu.alefzero.webdav.OnDatatransferProgressListener;
  import eu.alefzero.webdav.WebdavEntry;
  import eu.alefzero.webdav.WebdavUtils;
  
 -import com.owncloud.android.network.OwnCloudClientUtils;
  
  import android.accounts.Account;
  import android.accounts.AccountManager;
@@@ -81,6 -70,16 +81,6 @@@ import android.os.Process
  import android.webkit.MimeTypeMap;
  import android.widget.RemoteViews;
  
 -import com.owncloud.android.Log_OC;
 -import com.owncloud.android.MainApp;
 -import com.owncloud.android.R;
 -import com.owncloud.android.db.DbHandler;
 -import com.owncloud.android.ui.activity.FailedUploadActivity;
 -import com.owncloud.android.ui.activity.FileActivity;
 -import com.owncloud.android.ui.activity.FileDisplayActivity;
 -import com.owncloud.android.ui.activity.InstantUploadActivity;
 -import com.owncloud.android.ui.preview.PreviewImageActivity;
 -import com.owncloud.android.ui.preview.PreviewImageFragment;
  
  import eu.alefzero.webdav.WebdavClient;
  
@@@ -130,8 -129,8 +130,8 @@@ public class FileUploader extends Servi
      private RemoteViews mDefaultNotificationContentView;
  
      
-     public String getUploadFinishMessage() {
-         return getClass().getName().toString() + UPLOAD_FINISH_MESSAGE;
+     public static String getUploadFinishMessage() {
+         return FileUploader.class.getName().toString() + UPLOAD_FINISH_MESSAGE;
      }
      
      /**

diff --combined src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index 3d09b47,c7791cc..25f7ed3
--- 1/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
--- 2/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@@ -33,16 -33,15 +33,16 @@@ import org.apache.jackrabbit.webdav.Dav
  import org.apache.jackrabbit.webdav.MultiStatus;
  import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
  
 -import android.accounts.Account;
 -import android.content.Context;
 -
  import com.owncloud.android.Log_OC;
  import com.owncloud.android.datamodel.DataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
  import com.owncloud.android.utils.FileStorageUtils;
  
 +import android.accounts.Account;
 +import android.content.Context;
 +
 +
  import eu.alefzero.webdav.WebdavClient;
  import eu.alefzero.webdav.WebdavEntry;
  import eu.alefzero.webdav.WebdavUtils;
@@@ -361,5 -360,4 +361,4 @@@ public class SynchronizeFolderOperatio
          }
      }
  
- 
  }

diff --combined src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index 8c187cc,33e8dc3..a0ca988
--- 1/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
--- 2/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@@ -39,7 -39,6 +39,7 @@@ import com.owncloud.android.operations.
  import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
  import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;
  
 +
  import android.accounts.Account;
  import android.accounts.AccountsException;
  import android.app.Notification;
@@@ -288,9 -287,7 +288,7 @@@ public class FileSyncAdapter extends Ab
       * @param dirRemotePath     Remote path of a folder that was just synchronized (with or without success)
       */
      private void sendStickyBroadcast(boolean inProgress, String dirRemotePath, RemoteOperationResult result) {
-         FileSyncService fileSyncService = new FileSyncService();
-         
-         Intent i = new Intent(fileSyncService.getSyncMessage());
+         Intent i = new Intent(FileSyncService.getSyncMessage());
          i.putExtra(FileSyncService.IN_PROGRESS, inProgress);
          i.putExtra(FileSyncService.ACCOUNT_NAME, getAccount().name);
          if (dirRemotePath != null) {

diff --combined src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index b93321a,33cdadf..a709706
--- 1/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
--- 2/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -64,9 -64,9 +64,9 @@@ import com.owncloud.android.datamodel.D
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.files.services.FileDownloader;
 -import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
  import com.owncloud.android.files.services.FileObserverService;
  import com.owncloud.android.files.services.FileUploader;
 +import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
  import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
  import com.owncloud.android.operations.CreateFolderOperation;
  import com.owncloud.android.operations.OnRemoteOperationListener;
@@@ -86,10 -86,10 +86,10 @@@ import com.owncloud.android.ui.fragment
  import com.owncloud.android.ui.fragment.FileFragment;
  import com.owncloud.android.ui.fragment.OCFileListFragment;
  import com.owncloud.android.ui.preview.PreviewImageActivity;
 -import com.owncloud.android.ui.preview.PreviewImageFragment;
  import com.owncloud.android.ui.preview.PreviewMediaFragment;
  import com.owncloud.android.ui.preview.PreviewVideoActivity;
  
 +
  /**
   * Displays, what files the user has available in his ownCloud.
   * 
@@@ -139,9 -139,6 +139,6 @@@ OCFileListFragment.ContainerActivity, F
      private OCFile mWaitingToPreview;
      private Handler mHandler;
      
-     private String mDownloadAddedMessage;
-     private String mDownloadFinishMessage;
- 
      @Override
      protected void onCreate(Bundle savedInstanceState) {
          Log_OC.d(TAG, "onCreate() start");
@@@ -151,10 -148,6 +148,6 @@@
  
          mHandler = new Handler();
          
-         FileDownloader downloader = new FileDownloader();
-         mDownloadAddedMessage = downloader.getDownloadAddedMessage();
-         mDownloadFinishMessage= downloader.getDownloadFinishMessage();
- 
          /// bindings to transference services
          mUploadConnection = new ListServiceConnection(); 
          mDownloadConnection = new ListServiceConnection();
@@@ -412,12 -405,12 +405,12 @@@
                  // the user browsed to other file ; forget the automatic preview 
                  mWaitingToPreview = null;
  
-             } else if (downloadEvent.equals(mDownloadAddedMessage)) {
+             } else if (downloadEvent.equals(FileDownloader.getDownloadAddedMessage())) {
                  // grant that the right panel updates the progress bar
                  detailsFragment.listenForTransferProgress();
                  detailsFragment.updateFileDetails(true, false);
  
-             } else if (downloadEvent.equals(mDownloadFinishMessage)) {
+             } else if (downloadEvent.equals(FileDownloader.getDownloadFinishMessage())) {
                  //  update the right panel
                  boolean detailsFragmentChanged = false;
                  if (waitedPreview) {
@@@ -635,22 -628,19 +628,19 @@@
          super.onResume();
          Log_OC.e(TAG, "onResume() start");
  
-         FileUploader fileUploader = new FileUploader();
-         FileSyncService fileSyncService = new FileSyncService();
-         
          // Listen for sync messages
-         IntentFilter syncIntentFilter = new IntentFilter(fileSyncService.getSyncMessage());
+         IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.getSyncMessage());
          mSyncBroadcastReceiver = new SyncBroadcastReceiver();
          registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
  
          // Listen for upload messages
-         IntentFilter uploadIntentFilter = new IntentFilter(fileUploader.getUploadFinishMessage());
+         IntentFilter uploadIntentFilter = new IntentFilter(FileUploader.getUploadFinishMessage());
          mUploadFinishReceiver = new UploadFinishReceiver();
          registerReceiver(mUploadFinishReceiver, uploadIntentFilter);
  
          // Listen for download messages
-         IntentFilter downloadIntentFilter = new IntentFilter(mDownloadAddedMessage);
-         downloadIntentFilter.addAction(mDownloadFinishMessage);
+         IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.getDownloadAddedMessage());
+         downloadIntentFilter.addAction(FileDownloader.getDownloadFinishMessage());
          mDownloadFinishReceiver = new DownloadFinishReceiver();
          registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
      

diff --combined src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 36d7c21,ffe464a..317b98c
--- 1/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
--- 2/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@@ -48,17 -48,17 +48,17 @@@ import com.owncloud.android.Log_OC
  import com.owncloud.android.R;
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
 -import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
  import com.owncloud.android.files.services.FileObserverService;
  import com.owncloud.android.files.services.FileUploader;
 +import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
  import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
  import com.owncloud.android.operations.OnRemoteOperationListener;
  import com.owncloud.android.operations.RemoteOperation;
  import com.owncloud.android.operations.RemoteOperationResult;
 -import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
  import com.owncloud.android.operations.RemoveFileOperation;
  import com.owncloud.android.operations.RenameFileOperation;
  import com.owncloud.android.operations.SynchronizeFileOperation;
 +import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
  import com.owncloud.android.ui.activity.ConflictsResolveActivity;
  import com.owncloud.android.ui.activity.FileActivity;
  import com.owncloud.android.ui.activity.FileDisplayActivity;
@@@ -66,7 -66,6 +66,7 @@@ import com.owncloud.android.ui.dialog.E
  import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
  import com.owncloud.android.ui.preview.PreviewImageFragment;
  
 +
  import eu.alefzero.webdav.OnDatatransferProgressListener;
  
  /**
@@@ -208,8 -207,7 +208,7 @@@ public class FileDetailFragment extend
      public void onResume() {
          super.onResume();
          mUploadFinishReceiver = new UploadFinishReceiver();
-         FileUploader fileUploader = new FileUploader();
-         IntentFilter filter = new IntentFilter(fileUploader.getUploadFinishMessage());
+         IntentFilter filter = new IntentFilter(FileUploader.getUploadFinishMessage());
          getActivity().registerReceiver(mUploadFinishReceiver, filter);
  
      }

diff --combined src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index 8f12ac7,5ab92e4..87ddd56
--- 1/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
--- 2/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@@ -35,21 -35,21 +35,21 @@@ import android.view.View.OnTouchListene
  import com.actionbarsherlock.app.ActionBar;
  import com.actionbarsherlock.view.MenuItem;
  import com.actionbarsherlock.view.Window;
 +import com.owncloud.android.Log_OC;
 +import com.owncloud.android.R;
  import com.owncloud.android.authentication.AccountUtils;
  import com.owncloud.android.datamodel.DataStorageManager;
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.files.services.FileDownloader;
 -import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
  import com.owncloud.android.files.services.FileUploader;
 +import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
  import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
  import com.owncloud.android.ui.activity.FileActivity;
  import com.owncloud.android.ui.activity.FileDisplayActivity;
  import com.owncloud.android.ui.dialog.LoadingDialog;
  import com.owncloud.android.ui.fragment.FileFragment;
  
 -import com.owncloud.android.Log_OC;
 -import com.owncloud.android.R;
  
  /**
   *  Holds a swiping galley where image files contained in an ownCloud directory are shown
@@@ -82,9 -82,6 +82,6 @@@ public class PreviewImageActivity exten
  
      private boolean mFullScreen;
      
-     private String mDownloadAddedMessage;
-     private String mDownloadFinishMessage;
-     
      
      @Override
      protected void onCreate(Bundle savedInstanceState) {
@@@ -104,9 -101,6 +101,6 @@@
              mRequestWaitingForBinder = false;
          }
          
-         FileDownloader downloader = new FileDownloader();
-         mDownloadAddedMessage = downloader.getDownloadAddedMessage();
-         mDownloadFinishMessage= downloader.getDownloadFinishMessage();
      }
  
      private void initViewPager() {
@@@ -227,8 -221,8 +221,8 @@@
          //Log.e(TAG, "ACTIVITY, ONRESUME");
          mDownloadFinishReceiver = new DownloadFinishReceiver();
          
-         IntentFilter filter = new IntentFilter(mDownloadFinishMessage);
-         filter.addAction(mDownloadAddedMessage);
+         IntentFilter filter = new IntentFilter(FileDownloader.getDownloadFinishMessage());
+         filter.addAction(FileDownloader.getDownloadAddedMessage());
          registerReceiver(mDownloadFinishReceiver, filter);
      }
  
@@@ -387,7 -381,7 +381,7 @@@
                  boolean downloadWasFine = intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false);
                  //boolean isOffscreen =  Math.abs((mViewPager.getCurrentItem() - position)) <= mViewPager.getOffscreenPageLimit();
                  
-                 if (position >= 0 && intent.getAction().equals(mDownloadFinishMessage)) {
+                 if (position >= 0 && intent.getAction().equals(FileDownloader.getDownloadFinishMessage())) {
                      if (downloadWasFine) {
                          mPreviewImagePagerAdapter.updateFile(position, file);