From: David A. Velasco Date: Fri, 1 Mar 2013 14:30:46 +0000 (+0100) Subject: Quick fix for undesired progress bar shown in details view, when this is opened from... X-Git-Tag: oc-android-1.4.3~39^2~21 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/48e7e403949f85dc4186440faeeabbbdb54f8585?ds=inline;hp=-c Quick fix for undesired progress bar shown in details view, when this is opened from the gallery, from an image just downloaded --- 48e7e403949f85dc4186440faeeabbbdb54f8585 diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java index 8dd02319..74ce769b 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -240,6 +240,7 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi //Log.e(TAG, "ACTIVITY, ONRESUME"); mDownloadFinishReceiver = new DownloadFinishReceiver(); IntentFilter filter = new IntentFilter(FileDownloader.DOWNLOAD_FINISH_MESSAGE); + filter.addAction(FileDownloader.DOWNLOAD_ADDED_MESSAGE); registerReceiver(mDownloadFinishReceiver, filter); } @@ -320,6 +321,9 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this)); showDetailsIntent.putExtra(FileDetailActivity.EXTRA_MODE, FileDetailActivity.MODE_DETAILS); startActivity(showDetailsIntent); + int pos = mPreviewImagePagerAdapter.getFilePosition(file); + file = mPreviewImagePagerAdapter.getFileAt(pos); + } @@ -400,7 +404,7 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi boolean downloadWasFine = intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false); //boolean isOffscreen = Math.abs((mViewPager.getCurrentItem() - position)) <= mViewPager.getOffscreenPageLimit(); - if (position >= 0) { + if (position >= 0 && intent.getAction().equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) { if (downloadWasFine) { mPreviewImagePagerAdapter.updateFile(position, file);