Update data_folder value

[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 9ce0588..7c9ccd6 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -16,8 +16,6 @@
  */
 package com.owncloud.android.ui.preview;
 
-import android.app.Dialog;
-import android.app.ProgressDialog;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -84,7 +82,10 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
 
     private boolean mFullScreen;
     
-
+    private String mDownloadAddedMessage;
+    private String mDownloadFinishMessage;
+    
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -102,6 +103,10 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
         } else {
             mRequestWaitingForBinder = false;
         }
+        
+        FileDownloader downloader = new FileDownloader();
+        mDownloadAddedMessage = downloader.getDownloadAddedMessage();
+        mDownloadFinishMessage= downloader.getDownloadFinishMessage();
     }
 
     private void initViewPager() {
@@ -218,8 +223,9 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
         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);
     }
 
@@ -241,27 +247,6 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
         finish();
     }
     
-    
-//    @Override
-//    protected Dialog onCreateDialog(int id) {
-//        Dialog dialog = null;
-//        switch (id) {
-//        case DIALOG_SHORT_WAIT: {
-//            ProgressDialog working_dialog = new ProgressDialog(this);
-//            working_dialog.setMessage(getResources().getString(
-//                    R.string.wait_a_moment));
-//            working_dialog.setIndeterminate(true);
-//            working_dialog.setCancelable(false);
-//            dialog = working_dialog;
-//            break;
-//        }
-//        default:
-//            dialog = null;
-//        }
-//        return dialog;
-//    }
-    
-    
     /**
      * Show loading dialog 
      */
@@ -399,7 +384,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(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) {
+                if (position >= 0 && intent.getAction().equals(mDownloadFinishMessage)) {
                     if (downloadWasFine) {
                         mPreviewImagePagerAdapter.updateFile(position, file);