Removed more code and string about unused location tracking

[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 50cab7e..6a80ffb 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -82,7 +82,10 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
 
     private boolean mFullScreen;
     
 
     private boolean mFullScreen;
     

-
+    private String mDownloadAddedMessage;
+    private String mDownloadFinishMessage;
+    
+    

     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);


@@ -100,6 +103,10 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
         } else {
             mRequestWaitingForBinder = false;
         }
         } else {
             mRequestWaitingForBinder = false;
         }

+        
+        FileDownloader downloader = new FileDownloader();
+        mDownloadAddedMessage = downloader.getDownloadAddedMessage();
+        mDownloadFinishMessage= downloader.getDownloadFinishMessage();

     }
 
     private void initViewPager() {
     }
 
     private void initViewPager() {


@@ -219,8 +226,9 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
         super.onResume();
         //Log.e(TAG, "ACTIVITY, ONRESUME");
         mDownloadFinishReceiver = new DownloadFinishReceiver();
         super.onResume();
         //Log.e(TAG, "ACTIVITY, ONRESUME");
         mDownloadFinishReceiver = new DownloadFinishReceiver();

-        IntentFilter filter = new IntentFilter(FileDownloader.DOWNLOAD_FINISH_MESSAGE);
-        filter.addAction(FileDownloader.DOWNLOAD_ADDED_MESSAGE);
+        
+        IntentFilter filter = new IntentFilter(mDownloadFinishMessage);
+        filter.addAction(mDownloadAddedMessage);

         registerReceiver(mDownloadFinishReceiver, filter);
     }
 
         registerReceiver(mDownloadFinishReceiver, filter);
     }
 


@@ -379,7 +387,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();
                 
                 boolean downloadWasFine = intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false);
                 //boolean isOffscreen =  Math.abs((mViewPager.getCurrentItem() - position)) <= mViewPager.getOffscreenPageLimit();
                 

-                if (position >= 0 && intent.getAction().equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) {
+                if (position >= 0 && intent.getAction().equals(mDownloadFinishMessage)) {

                     if (downloadWasFine) {
                         mPreviewImagePagerAdapter.updateFile(position, file);   
                         
                     if (downloadWasFine) {
                         mPreviewImagePagerAdapter.updateFile(position, file);