X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/fc2af5b03e9aeef0bcb985690dabb919984e874a..5dc43aab3cc1243f9989dd6a0c7dd3350c3f709b:/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 1e9d108a..a41f6eb9 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,18 +19,23 @@ package com.owncloud.android.ui.preview; import android.accounts.Account; import android.app.Dialog; import android.app.ProgressDialog; +import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.content.ServiceConnection; import android.os.Bundle; import android.os.IBinder; import android.support.v4.view.ViewPager; -import android.util.Log; +import android.view.MotionEvent; +import android.view.View; +import android.view.View.OnTouchListener; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.view.MenuItem; +import com.actionbarsherlock.view.Window; import com.owncloud.android.datamodel.DataStorageManager; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; @@ -39,11 +43,12 @@ import com.owncloud.android.files.services.FileDownloader; 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.activity.FileDetailActivity; -import com.owncloud.android.ui.fragment.FileDetailFragment; +import com.owncloud.android.ui.activity.FileActivity; +import com.owncloud.android.ui.activity.FileDisplayActivity; import com.owncloud.android.ui.fragment.FileFragment; import com.owncloud.android.AccountUtils; +import com.owncloud.android.Log_OC; import com.owncloud.android.R; /** @@ -51,13 +56,14 @@ import com.owncloud.android.R; * * @author David A. Velasco */ -public class PreviewImageActivity extends SherlockFragmentActivity implements FileFragment.ContainerActivity, ViewPager.OnPageChangeListener { +public class PreviewImageActivity extends FileActivity implements FileFragment.ContainerActivity, ViewPager.OnPageChangeListener, OnTouchListener { public static final int DIALOG_SHORT_WAIT = 0; public static final String TAG = PreviewImageActivity.class.getSimpleName(); public static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW"; + private static final String KEY_WAITING_FOR_BINDER = "WAITING_FOR_BINDER"; private OCFile mFile; private OCFile mParentFolder; @@ -70,15 +76,20 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi private FileDownloaderBinder mDownloaderBinder = null; private ServiceConnection mDownloadConnection, mUploadConnection = null; private FileUploaderBinder mUploaderBinder = null; - private OCFile mWaitingToPreview = null; + + private boolean mRequestWaitingForBinder; + + private DownloadFinishReceiver mDownloadFinishReceiver; + + private boolean mFullScreen; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mFile = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); - mAccount = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT); + mFile = getIntent().getParcelableExtra(FileActivity.EXTRA_FILE); + mAccount = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT); if (mFile == null) { throw new IllegalStateException("Instanced with a NULL OCFile"); } @@ -88,12 +99,15 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi if (!mFile.isImage()) { throw new IllegalArgumentException("Non-image file passed as argument"); } - + requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY); setContentView(R.layout.preview_image_activity); ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setTitle(mFile.getFileName()); + actionBar.hide(); + + mFullScreen = true; mStorageManager = new FileDataStorageManager(mAccount, getContentResolver()); mParentFolder = mStorageManager.getFileById(mFile.getParentId()); @@ -102,33 +116,44 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi mParentFolder = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR); } - createViewPager(); - - if (savedInstanceState == null) { - mWaitingToPreview = (mFile.isDown())?null:mFile; + if (savedInstanceState != null) { + mRequestWaitingForBinder = savedInstanceState.getBoolean(KEY_WAITING_FOR_BINDER); } else { - mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(KEY_WAITING_TO_PREVIEW); + mRequestWaitingForBinder = false; } - mDownloadConnection = new PreviewImageServiceConnection(); - bindService(new Intent(this, FileDownloader.class), mDownloadConnection, Context.BIND_AUTO_CREATE); - mUploadConnection = new PreviewImageServiceConnection(); - bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE); - + createViewPager(); + } private void createViewPager() { mPreviewImagePagerAdapter = new PreviewImagePagerAdapter(getSupportFragmentManager(), mParentFolder, mAccount, mStorageManager); mViewPager = (ViewPager) findViewById(R.id.fragmentPager); - mViewPager.setAdapter(mPreviewImagePagerAdapter); + int position = mPreviewImagePagerAdapter.getFilePosition(mFile); + position = (position >= 0) ? position : 0; + mViewPager.setAdapter(mPreviewImagePagerAdapter); mViewPager.setOnPageChangeListener(this); + mViewPager.setCurrentItem(position); + if (position == 0 && !mFile.isDown()) { + // this is necessary because mViewPager.setCurrentItem(0) just after setting the adapter does not result in a call to #onPageSelected(0) + mRequestWaitingForBinder = true; + } + } + + + @Override + public void onStart() { + super.onStart(); + mDownloadConnection = new PreviewImageServiceConnection(); + bindService(new Intent(this, FileDownloader.class), mDownloadConnection, Context.BIND_AUTO_CREATE); + mUploadConnection = new PreviewImageServiceConnection(); + bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE); } - @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putParcelable(KEY_WAITING_TO_PREVIEW, mWaitingToPreview); + outState.putBoolean(KEY_WAITING_FOR_BINDER, mRequestWaitingForBinder); } @@ -139,11 +164,15 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi public void onServiceConnected(ComponentName component, IBinder service) { if (component.equals(new ComponentName(PreviewImageActivity.this, FileDownloader.class))) { - Log.d(TAG, "Download service connected"); mDownloaderBinder = (FileDownloaderBinder) service; + if (mRequestWaitingForBinder) { + mRequestWaitingForBinder = false; + Log_OC.d(TAG, "Simulating reselection of current page after connection of download binder"); + onPageSelected(mViewPager.getCurrentItem()); + } } else if (component.equals(new ComponentName(PreviewImageActivity.this, FileUploader.class))) { - Log.d(TAG, "Upload service connected"); + Log_OC.d(TAG, "Upload service connected"); mUploaderBinder = (FileUploaderBinder) service; } else { return; @@ -154,10 +183,10 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi @Override public void onServiceDisconnected(ComponentName component) { if (component.equals(new ComponentName(PreviewImageActivity.this, FileDownloader.class))) { - Log.d(TAG, "Download service suddenly disconnected"); + Log_OC.d(TAG, "Download service suddenly disconnected"); mDownloaderBinder = null; } else if (component.equals(new ComponentName(PreviewImageActivity.this, FileUploader.class))) { - Log.d(TAG, "Upload service suddenly disconnected"); + Log_OC.d(TAG, "Upload service suddenly disconnected"); mUploaderBinder = null; } } @@ -165,8 +194,8 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi @Override - public void onDestroy() { - super.onDestroy(); + public void onStop() { + super.onStop(); if (mDownloadConnection != null) { unbindService(mDownloadConnection); mDownloadConnection = null; @@ -179,6 +208,12 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi @Override + public void onDestroy() { + super.onDestroy(); + } + + + @Override public boolean onOptionsItemSelected(MenuItem item) { boolean returnValue = false; @@ -198,17 +233,28 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi @Override protected void onResume() { super.onResume(); + //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); + } + + @Override + protected void onPostResume() { + //Log.e(TAG, "ACTIVITY, ONPOSTRESUME"); + super.onPostResume(); + } + + @Override + public void onPause() { + super.onPause(); + unregisterReceiver(mDownloadFinishReceiver); + mDownloadFinishReceiver = null; } private void backToDisplayActivity() { - /* - Intent intent = new Intent(this, FileDisplayActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - intent.putExtra(FileDetailFragment.EXTRA_FILE, mFile); - intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, mAccount); - startActivity(intent); - */ finish(); } @@ -258,43 +304,30 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi @Override - public void showFragmentWithDetails(OCFile file) { - Intent showDetailsIntent = new Intent(this, FileDetailActivity.class); - showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file); - showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this)); - showDetailsIntent.putExtra(FileDetailActivity.EXTRA_MODE, FileDetailActivity.MODE_DETAILS); + public void showDetails(OCFile file) { + Intent showDetailsIntent = new Intent(this, FileDisplayActivity.class); + showDetailsIntent.setAction(FileDisplayActivity.ACTION_DETAILS); + showDetailsIntent.putExtra(FileActivity.EXTRA_FILE, file); + showDetailsIntent.putExtra(FileActivity.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this)); startActivity(showDetailsIntent); + int pos = mPreviewImagePagerAdapter.getFilePosition(file); + file = mPreviewImagePagerAdapter.getFileAt(pos); + } - private void requestForDownload() { - Log.e(TAG, "REQUEST FOR DOWNLOAD : " + mWaitingToPreview.getFileName()); - if (!mDownloaderBinder.isDownloading(mAccount, mWaitingToPreview)) { + private void requestForDownload(OCFile file) { + if (mDownloaderBinder == null) { + Log_OC.d(TAG, "requestForDownload called without binder to download service"); + + } else if (!mDownloaderBinder.isDownloading(mAccount, file)) { Intent i = new Intent(this, FileDownloader.class); i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount); - i.putExtra(FileDownloader.EXTRA_FILE, mWaitingToPreview); + i.putExtra(FileDownloader.EXTRA_FILE, file); startService(i); } } - @Override - public void notifySuccessfulDownload(OCFile file, Intent intent, boolean success) { - if (success) { - if (mWaitingToPreview != null && mWaitingToPreview.equals(file)) { - mWaitingToPreview = null; - int position = mViewPager.getCurrentItem(); - mPreviewImagePagerAdapter.updateFile(position, file); - Log.e(TAG, "BEFORE NOTIFY DATA SET CHANGED"); - mPreviewImagePagerAdapter.notifyDataSetChanged(); - Log.e(TAG, "AFTER NOTIFY DATA SET CHANGED"); - //Log.e(TAG, "BEFORE INVALIDATE"); - //mViewPager.postInvalidate(); - //Log.e(TAG, "AFTER INVALIDATE"); - } - } - } - - /** * This method will be invoked when a new page becomes selected. Animation is not necessarily complete. * @@ -302,20 +335,23 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi */ @Override public void onPageSelected(int position) { - OCFile currentFile = mPreviewImagePagerAdapter.getFileAt(position); - getSupportActionBar().setTitle(currentFile.getFileName()); - if (currentFile.isDown()) { - mWaitingToPreview = null; + if (mDownloaderBinder == null) { + mRequestWaitingForBinder = true; + } else { - mWaitingToPreview = currentFile; - requestForDownload(); - mViewPager.invalidate(); + OCFile currentFile = mPreviewImagePagerAdapter.getFileAt(position); + getSupportActionBar().setTitle(currentFile.getFileName()); + if (!currentFile.isDown()) { + if (!mPreviewImagePagerAdapter.pendingErrorAt(position)) { + requestForDownload(currentFile); + } + } } } /** * Called when the scroll state changes. Useful for discovering when the user begins dragging, - * when the pager is automatically settling to the current page, or when it is fully stopped/idle. + * when the pager is automatically settling to the current page. when it is fully stopped/idle. * * @param State The new scroll state (SCROLL_STATE_IDLE, _DRAGGING, _SETTLING */ @@ -337,4 +373,71 @@ public class PreviewImageActivity extends SherlockFragmentActivity implements Fi public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { } + + /** + * Class waiting for broadcast events from the {@link FielDownloader} service. + * + * Updates the UI when a download is started or finished, provided that it is relevant for the + * folder displayed in the gallery. + */ + private class DownloadFinishReceiver extends BroadcastReceiver { + @Override + public void onReceive(Context context, Intent intent) { + String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME); + String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH); + if (mAccount.name.equals(accountName) && + downloadedRemotePath != null) { + + OCFile file = mStorageManager.getFileByPath(downloadedRemotePath); + int position = mPreviewImagePagerAdapter.getFilePosition(file); + 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 (downloadWasFine) { + mPreviewImagePagerAdapter.updateFile(position, file); + + } else { + mPreviewImagePagerAdapter.updateWithDownloadError(position); + } + mPreviewImagePagerAdapter.notifyDataSetChanged(); // will trigger the creation of new fragments + + } else { + Log_OC.d(TAG, "Download finished, but the fragment is offscreen"); + } + + } + removeStickyBroadcast(intent); + } + + } + + + @Override + public boolean onTouch(View v, MotionEvent event) { + if (event.getAction() == MotionEvent.ACTION_UP) { + toggleFullScreen(); + } + return true; + } + + + private void toggleFullScreen() { + ActionBar actionBar = getSupportActionBar(); + if (mFullScreen) { + actionBar.show(); + + } else { + actionBar.hide(); + + } + mFullScreen = !mFullScreen; + } + + @Override + protected void onAccountSet(boolean stateWasRecovered) { + // TODO + } + + }