Merge branch 'develop' into setup_buttons

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / preview / PreviewImageActivity.java

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index 8f12ac7..87ddd56 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -82,9 +82,6 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
 
     private boolean mFullScreen;
     
-    private String mDownloadAddedMessage;
-    private String mDownloadFinishMessage;
-    
     
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -104,9 +101,6 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
             mRequestWaitingForBinder = false;
         }
         
-        FileDownloader downloader = new FileDownloader();
-        mDownloadAddedMessage = downloader.getDownloadAddedMessage();
-        mDownloadFinishMessage= downloader.getDownloadFinishMessage();
     }
 
     private void initViewPager() {
@@ -227,8 +221,8 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
         //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 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
                 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);