X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/559ab6566b74e61c1b1748f0951be526a3620495..6d4ce68a81abaf0e37998ee9913986d6c2ebf1cc:/src/com/owncloud/android/ui/activity/FileDetailActivity.java diff --git a/src/com/owncloud/android/ui/activity/FileDetailActivity.java b/src/com/owncloud/android/ui/activity/FileDetailActivity.java index fbc4cb92..2db3d7fc 100644 --- a/src/com/owncloud/android/ui/activity/FileDetailActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDetailActivity.java @@ -40,7 +40,7 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; import com.owncloud.android.ui.fragment.FileDetailFragment; -import com.owncloud.android.ui.fragment.FilePreviewFragment; +import com.owncloud.android.ui.preview.PreviewMediaFragment; import com.owncloud.android.R; @@ -61,7 +61,7 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File public static final int MODE_DETAILS = 0; public static final int MODE_PREVIEW = 1; - private static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW"; + public static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW"; private boolean mConfigurationChangedToLandscape = false; private FileDownloaderBinder mDownloaderBinder = null; @@ -120,9 +120,9 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File int mode = getIntent().getIntExtra(EXTRA_MODE, MODE_PREVIEW); Fragment newFragment = null; - if (FilePreviewFragment.canBePreviewed(mFile) && mode == MODE_PREVIEW) { + if (PreviewMediaFragment.canBePreviewed(mFile) && mode == MODE_PREVIEW) { if (mFile.isDown()) { - newFragment = new FilePreviewFragment(mFile, mAccount); + newFragment = new PreviewMediaFragment(mFile, mAccount); } else { newFragment = new FileDetailFragment(mFile, mAccount); @@ -303,12 +303,14 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File } @Override - public void notifySuccessfulDownload(OCFile file) { - if (mWaitingToPreview) { - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.replace(R.id.fragment, new FilePreviewFragment(file, mAccount), FileDetailFragment.FTAG); - transaction.commit(); - mWaitingToPreview = false; + public void notifySuccessfulDownload(OCFile file, Intent intent, boolean success) { + if (success) { + if (mWaitingToPreview) { + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + transaction.replace(R.id.fragment, new PreviewMediaFragment(file, mAccount), FileDetailFragment.FTAG); + transaction.commit(); + mWaitingToPreview = false; + } } }