X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/b416f87c9201b63cb162a5ff3a059a2de81863a4..bcc7bd2744fd3c6f6f9fb33ed46479a55914fdb9:/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 7937b901..97f719f4 100644 --- a/src/com/owncloud/android/ui/activity/FileDetailActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDetailActivity.java @@ -17,6 +17,8 @@ */ package com.owncloud.android.ui.activity; +import java.lang.ref.WeakReference; + import android.accounts.Account; import android.app.Dialog; import android.app.ProgressDialog; @@ -27,7 +29,10 @@ import android.content.ServiceConnection; import android.content.res.Configuration; import android.os.Bundle; import android.os.IBinder; +import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; +import android.util.Log; +import android.widget.ProgressBar; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockFragmentActivity; @@ -35,24 +40,40 @@ import com.actionbarsherlock.view.MenuItem; import com.owncloud.android.datamodel.OCFile; 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.fragment.FileDetailFragment; +import com.owncloud.android.ui.fragment.FilePreviewFragment; import com.owncloud.android.R; +import eu.alefzero.webdav.OnDatatransferProgressListener; + /** * This activity displays the details of a file like its name, its size and so * on. * * @author Bartek Przybylski - * + * @author David A. Velasco */ public class FileDetailActivity extends SherlockFragmentActivity implements FileDetailFragment.ContainerActivity { public static final int DIALOG_SHORT_WAIT = 0; + + public static final String TAG = FileDetailActivity.class.getSimpleName(); + + public static final String EXTRA_MODE = "MODE"; + 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"; private boolean mConfigurationChangedToLandscape = false; private FileDownloaderBinder mDownloaderBinder = null; - private ServiceConnection mConnection = null; + private ServiceConnection mDownloadConnection, mUploadConnection = null; + private FileUploaderBinder mUploaderBinder = null; + private boolean mWaitingToPreview; + @Override protected void onCreate(Bundle savedInstanceState) { @@ -65,21 +86,22 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File ); if (!mConfigurationChangedToLandscape) { - mConnection = new DetailsServiceConnection(); - bindService(new Intent(this, FileDownloader.class), mConnection, Context.BIND_AUTO_CREATE); + mDownloadConnection = new DetailsServiceConnection(); + bindService(new Intent(this, FileDownloader.class), mDownloadConnection, Context.BIND_AUTO_CREATE); + mUploadConnection = new DetailsServiceConnection(); + bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE); setContentView(R.layout.file_activity_details); ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); - OCFile file = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); - Account account = getIntent().getParcelableExtra(FileDownloader.EXTRA_ACCOUNT); - FileDetailFragment mFileDetail = new FileDetailFragment(file, account); - - FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - ft.replace(R.id.fragment, mFileDetail, FileDetailFragment.FTAG); - ft.commit(); + if (savedInstanceState == null) { + mWaitingToPreview = false; + createChildFragment(); + } else { + mWaitingToPreview = savedInstanceState.getBoolean(KEY_WAITING_TO_PREVIEW); + } } else { backToDisplayActivity(); // the 'back' won't be effective until this.onStart() and this.onResume() are completed; @@ -87,32 +109,89 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File } + + /** + * Creates the proper fragment depending upon the state of the handled {@link OCFile} and + * the requested {@link Intent}. + */ + private void createChildFragment() { + OCFile file = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); + Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT); + int mode = getIntent().getIntExtra(EXTRA_MODE, MODE_PREVIEW); + + Fragment newFragment = null; + if (FilePreviewFragment.canBePreviewed(file) && mode == MODE_PREVIEW) { + if (file.isDown()) { + newFragment = new FilePreviewFragment(file, account); + + } else { + newFragment = new FileDetailFragment(file, account); + mWaitingToPreview = true; + } + + } else { + newFragment = new FileDetailFragment(file, account); + } + FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); + ft.replace(R.id.fragment, newFragment, FileDetailFragment.FTAG); + ft.commit(); + } - + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putBoolean(KEY_WAITING_TO_PREVIEW, mWaitingToPreview); + } + + /** Defines callbacks for service binding, passed to bindService() */ private class DetailsServiceConnection implements ServiceConnection { @Override - public void onServiceConnected(ComponentName className, IBinder service) { - mDownloaderBinder = (FileDownloaderBinder) service; - FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); - if (fragment != null) - fragment.updateFileDetails(); // let the fragment gets the mDownloadBinder through getDownloadBinder() (see FileDetailFragment#updateFileDetais()) + public void onServiceConnected(ComponentName component, IBinder service) { + + if (component.equals(new ComponentName(FileDetailActivity.this, FileDownloader.class))) { + Log.d(TAG, "Download service connected"); + mDownloaderBinder = (FileDownloaderBinder) service; + } else if (component.equals(new ComponentName(FileDetailActivity.this, FileUploader.class))) { + Log.d(TAG, "Upload service connected"); + mUploaderBinder = (FileUploaderBinder) service; + } else { + return; + } + + Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); + FileDetailFragment detailsFragment = (fragment instanceof FileDetailFragment) ? (FileDetailFragment) fragment : null; + if (detailsFragment != null) { + detailsFragment.listenForTransferProgress(); + detailsFragment.updateFileDetails(false); // let the fragment gets the mDownloadBinder through getDownloadBinder() (see FileDetailFragment#updateFileDetais()) + } } @Override - public void onServiceDisconnected(ComponentName arg0) { - mDownloaderBinder = null; + public void onServiceDisconnected(ComponentName component) { + if (component.equals(new ComponentName(FileDetailActivity.this, FileDownloader.class))) { + Log.d(TAG, "Download service disconnected"); + mDownloaderBinder = null; + } else if (component.equals(new ComponentName(FileDetailActivity.this, FileUploader.class))) { + Log.d(TAG, "Upload service disconnected"); + mUploaderBinder = null; + } } }; - + @Override public void onDestroy() { super.onDestroy(); - if (mConnection != null) { - unbindService(mConnection); - mConnection = null; + if (mDownloadConnection != null) { + unbindService(mDownloadConnection); + mDownloadConnection = null; + } + if (mUploadConnection != null) { + unbindService(mUploadConnection); + mUploadConnection = null; } } @@ -125,6 +204,9 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File case android.R.id.home: backToDisplayActivity(); returnValue = true; + break; + default: + returnValue = super.onOptionsItemSelected(item); } return returnValue; @@ -136,9 +218,11 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File protected void onResume() { super.onResume(); - if (!mConfigurationChangedToLandscape) { - FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); - fragment.updateFileDetails(); + if (!mConfigurationChangedToLandscape) { + Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); + if (fragment != null && fragment instanceof FileDetailFragment) { + ((FileDetailFragment) fragment).updateFileDetails(false); + } } } @@ -147,6 +231,7 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File Intent intent = new Intent(this, FileDisplayActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); intent.putExtra(FileDetailFragment.EXTRA_FILE, getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE)); + intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT)); startActivity(intent); finish(); } @@ -188,5 +273,19 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File public FileDownloaderBinder getFileDownloaderBinder() { return mDownloaderBinder; } + + + @Override + public FileUploaderBinder getFileUploaderBinder() { + return mUploaderBinder; + } + + + @Override + public void showFragmentWithDetails(OCFile file) { + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + transaction.replace(R.id.fragment, new FileDetailFragment(file, (Account) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT)), FileDetailFragment.FTAG); + transaction.commit(); + } }