X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7101a04247be24d9eb3c1aa49b88ec2496c7d2d6..def870aa0fffb6127d77efe1bda3f7dc617406c8:/src/com/owncloud/android/ui/activity/FileDisplayActivity.java diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index fbce7cb8..bff3869e 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -21,6 +21,7 @@ package com.owncloud.android.ui.activity; import java.io.File; import android.accounts.Account; +import android.app.Activity; import android.app.AlertDialog; import android.app.ProgressDialog; import android.app.AlertDialog.Builder; @@ -91,6 +92,7 @@ import com.owncloud.android.ui.fragment.FileDetailFragment; import com.owncloud.android.ui.fragment.FileFragment; import com.owncloud.android.ui.fragment.FilePreviewFragment; import com.owncloud.android.ui.fragment.OCFileListFragment; +import com.owncloud.android.ui.preview.PreviewImageActivity; import com.owncloud.android.R; import eu.alefzero.webdav.WebdavClient; @@ -137,7 +139,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements private static final String TAG = "FileDisplayActivity"; - private static int[] mMenuIdentifiersToPatch = {R.id.about_app}; + private static int[] mMenuIdentifiersToPatch = {R.id.action_about_app}; + + private OCFile mWaitingToPreview; + private Handler mHandler; + @Override public void onCreate(Bundle savedInstanceState) { @@ -154,6 +160,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements if(savedInstanceState != null) { // TODO - test if savedInstanceState should take precedence over file in the intent ALWAYS (now), NEVER, or SOME TIMES mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE); + mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW); + + } else { + mWaitingToPreview = null; } if (!AccountUtils.accountsAreSetup(this)) { @@ -293,7 +303,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); if (mCurrentFile != null) { if (FilePreviewFragment.canBePreviewed(mCurrentFile)) { - transaction.replace(R.id.file_details_container, new FilePreviewFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); + if (mCurrentFile.isDown()) { + transaction.replace(R.id.file_details_container, new FilePreviewFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); + } else { + transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); + mWaitingToPreview = mCurrentFile; + } } else { transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); } @@ -320,7 +335,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getSherlock().getMenuInflater(); - inflater.inflate(R.menu.menu, menu); + inflater.inflate(R.menu.main_menu, menu); patchHiddenAccents(menu); @@ -351,11 +366,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements public boolean onOptionsItemSelected(MenuItem item) { boolean retval = true; switch (item.getItemId()) { - case R.id.createDirectoryItem: { + case R.id.action_create_dir: { showDialog(DIALOG_CREATE_DIR); break; } - case R.id.startSync: { + case R.id.action_sync_account: { startSynchronization(); break; } @@ -368,7 +383,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements startActivity(settingsIntent); break; } - case R.id.about_app : { + case R.id.action_about_app: { showDialog(DIALOG_ABOUT_APP); break; } @@ -541,6 +556,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } } } + outState.putParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview); Log.d(getClass().toString(), "onSaveInstanceState() end"); } @@ -570,7 +586,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements registerReceiver(mUploadFinishReceiver, uploadIntentFilter); // Listen for download messages - IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.DOWNLOAD_FINISH_MESSAGE); + IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.DOWNLOAD_ADDED_MESSAGE); + //downloadIntentFilter.addAction(FileDownloader.DOWNLOAD_FINISH_MESSAGE); mDownloadFinishReceiver = new DownloadFinishReceiver(); registerReceiver(mDownloadFinishReceiver, downloadIntentFilter); @@ -972,12 +989,27 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements public void onReceive(Context context, Intent intent) { String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH); String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME); - boolean sameAccount = accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name); - boolean isDescendant = (mCurrentDir != null) && (downloadedRemotePath != null) && (downloadedRemotePath.startsWith(mCurrentDir.getRemotePath())); - if (sameAccount && isDescendant) { - OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); - if (fileListFragment != null) { - fileListFragment.listDirectory(); + if (accountName != null && AccountUtils.getCurrentOwnCloudAccount(context) != null) { + boolean sameAccount = accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name); + boolean isDescendant = (mCurrentDir != null) && (downloadedRemotePath != null) && (downloadedRemotePath.startsWith(mCurrentDir.getRemotePath())); + if (sameAccount && isDescendant) { + OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); + if (fileListFragment != null) { + fileListFragment.listDirectory(); + if ( mWaitingToPreview != null && + mWaitingToPreview.getRemotePath().equals(downloadedRemotePath) && + intent.getAction().equals(FileDownloader.DOWNLOAD_ADDED_MESSAGE) ) { + + Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); + if (fragment != null && fragment instanceof FileDetailFragment ) { + FileDetailFragment detailFragment = (FileDetailFragment) fragment; + if (detailFragment.getFile().getRemotePath().equals(downloadedRemotePath)) { + detailFragment.listenForTransferProgress(); + detailFragment.updateFileDetails(true); + } + } + } + } } } } @@ -1022,19 +1054,37 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements @Override public void onFileClick(OCFile file) { - // If we are on a large device -> update fragment - if (mDualPane) { - // buttons in the details view are problematic when trying to reuse an existing fragment; create always a new one solves some of them, BUT no all; downloads are 'dangerous' - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - if (FilePreviewFragment.canBePreviewed(file)) { - transaction.replace(R.id.file_details_container, new FilePreviewFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); + if (file != null && FilePreviewFragment.canBePreviewed(file)) { + if (file.isDown()) { + // preview it + startPreview(file); + } else { - transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); + // automatic download, preview on finish + startDownloadForPreview(file); + } - //transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE); + } else { + // details view + startDetails(file); + } + } + + private void startPreview(OCFile file) { + if (mDualPane && + !file.isImage() // this is a trick to get a quick-to-implement 'full screen' preview for images in landscape + ) { + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + transaction.replace(R.id.file_details_container, new FilePreviewFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); transaction.commit(); - } else { // small or medium screen device -> new Activity + } else if (file.isImage()) { + Intent showDetailsIntent = new Intent(this, PreviewImageActivity.class); + showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file); + showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this)); + startActivity(showDetailsIntent); + + } else { Intent showDetailsIntent = new Intent(this, FileDetailActivity.class); showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file); showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this)); @@ -1042,7 +1092,37 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } } + private void startDownloadForPreview(OCFile file) { + if (mDualPane) { + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); + transaction.commit(); + mWaitingToPreview = file; + requestForDownload(); + + } else { + Intent showDetailsIntent = new Intent(this, FileDetailActivity.class); + showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file); + showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this)); + startActivity(showDetailsIntent); + } + } + + private void startDetails(OCFile file) { + if (mDualPane && !file.isImage()) { + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); + transaction.commit(); + } else { + Intent showDetailsIntent = new Intent(this, FileDetailActivity.class); + showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file); + showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this)); + startActivity(showDetailsIntent); + } + } + + /** * {@inheritDoc} */ @@ -1090,6 +1170,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) { Log.d(TAG, "Download service connected"); mDownloaderBinder = (FileDownloaderBinder) service; + if (mWaitingToPreview != null) { + requestForDownload(); + } + } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) { Log.d(TAG, "Upload service connected"); mUploaderBinder = (FileUploaderBinder) service; @@ -1102,7 +1186,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements if (mDualPane) { Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); if (fragment != null && fragment instanceof FileDetailFragment) { - ((FileDetailFragment)fragment).updateFileDetails(false); + FileDetailFragment detailFragment = (FileDetailFragment)fragment; + detailFragment.listenForTransferProgress(); + detailFragment.updateFileDetails(false); } } } @@ -1292,7 +1378,46 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } - + @Override + public void showFragmentWithDetails(OCFile file) { + if (mDualPane) { + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); + transaction.commit(); + + } else { + 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); + startActivity(showDetailsIntent); + } + } + + + @Override + public void notifySuccessfulDownload(OCFile file, Intent intent, boolean success) { + if (success) { + if (mWaitingToPreview != null) { + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + transaction.replace(R.id.file_details_container, new FilePreviewFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); + transaction.commit(); + mWaitingToPreview = null; + } + } + mDownloadFinishReceiver.onReceive(this, intent); + } + private void requestForDownload() { + Account account = AccountUtils.getCurrentOwnCloudAccount(this); + if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) { + Intent i = new Intent(this, FileDownloader.class); + i.putExtra(FileDownloader.EXTRA_ACCOUNT, account); + i.putExtra(FileDownloader.EXTRA_FILE, mWaitingToPreview); + startService(i); + } + } + + }