X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/979bdc83b227022f7b0047326753e3e3e06846a2..c2abbaaedb69dba35866a48b745b68f3519cbca1:/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 6b852b21..a7097060 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -33,7 +33,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.ServiceConnection; import android.content.SharedPreferences; -import android.content.res.Configuration; import android.content.res.Resources.NotFoundException; import android.database.Cursor; import android.net.Uri; @@ -43,7 +42,9 @@ import android.os.IBinder; import android.preference.PreferenceManager; import android.provider.MediaStore; import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; +import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; @@ -57,15 +58,15 @@ import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.Window; import com.owncloud.android.Log_OC; +import com.owncloud.android.MainApp; import com.owncloud.android.R; -import com.owncloud.android.authentication.AccountAuthenticator; import com.owncloud.android.datamodel.DataStorageManager; import com.owncloud.android.datamodel.FileDataStorageManager; 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.FileObserverService; import com.owncloud.android.files.services.FileUploader; +import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; import com.owncloud.android.operations.CreateFolderOperation; import com.owncloud.android.operations.OnRemoteOperationListener; @@ -77,6 +78,7 @@ import com.owncloud.android.operations.SynchronizeFileOperation; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.syncadapter.FileSyncService; import com.owncloud.android.ui.dialog.EditNameDialog; +import com.owncloud.android.ui.dialog.LoadingDialog; import com.owncloud.android.ui.dialog.SslValidatorDialog; import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener; import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener; @@ -84,10 +86,10 @@ import com.owncloud.android.ui.fragment.FileDetailFragment; import com.owncloud.android.ui.fragment.FileFragment; import com.owncloud.android.ui.fragment.OCFileListFragment; import com.owncloud.android.ui.preview.PreviewImageActivity; -import com.owncloud.android.ui.preview.PreviewImageFragment; import com.owncloud.android.ui.preview.PreviewMediaFragment; import com.owncloud.android.ui.preview.PreviewVideoActivity; + /** * Displays, what files the user has available in his ownCloud. * @@ -96,15 +98,13 @@ import com.owncloud.android.ui.preview.PreviewVideoActivity; */ public class FileDisplayActivity extends FileActivity implements - OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener, OnSslValidatorListener, OnRemoteOperationListener, EditNameDialogListener { - +OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener, OnSslValidatorListener, OnRemoteOperationListener, EditNameDialogListener { + private ArrayAdapter mDirectories; - //private OCFile mCurrentDir = null; - private OCFile mChosenFile = null; /** Access point to the cached database for the current ownCloud {@link Account} */ private DataStorageManager mStorageManager = null; - + private SyncBroadcastReceiver mSyncBroadcastReceiver; private UploadFinishReceiver mUploadFinishReceiver; private DownloadFinishReceiver mDownloadFinishReceiver; @@ -112,43 +112,41 @@ public class FileDisplayActivity extends FileActivity implements private FileUploaderBinder mUploaderBinder = null; private ServiceConnection mDownloadConnection = null, mUploadConnection = null; private RemoteOperationResult mLastSslUntrustedServerResult = null; - - private OCFileListFragment mFileList; - + private boolean mDualPane; - private boolean mBackFromCreatingFirstAccount; - + private View mLeftFragmentContainer; + private View mRightFragmentContainer; + + private static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW"; + public static final int DIALOG_SHORT_WAIT = 0; private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 1; private static final int DIALOG_SSL_VALIDATOR = 2; private static final int DIALOG_CERT_NOT_SAVED = 3; + private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT"; + + public static final String ACTION_DETAILS = "com.owncloud.android.ui.activity.action.DETAILS"; + private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1; private static final int ACTION_SELECT_MULTIPLE_FILES = 2; - + private static final String TAG = FileDisplayActivity.class.getSimpleName(); + private static final String TAG_LIST_OF_FILES = "LIST_OF_FILES"; + private static final String TAG_SECOND_FRAGMENT = "SECOND_FRAGMENT"; + private OCFile mWaitingToPreview; private Handler mHandler; - private Configuration mNewConfigurationChangeToApplyOnStart; - private boolean mStarted; - @Override protected void onCreate(Bundle savedInstanceState) { Log_OC.d(TAG, "onCreate() start"); - super.onCreate(savedInstanceState); - - mStarted = false; - mHandler = new Handler(); + requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); - /// Load of saved instance state: keep this always before initDataFromCurrentAccount() - if(savedInstanceState != null) { - mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW); + super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account is valid - } else { - mWaitingToPreview = null; - } + mHandler = new Handler(); /// bindings to transference services mUploadConnection = new ListServiceConnection(); @@ -161,181 +159,331 @@ public class FileDisplayActivity extends FileActivity implements requestPinCode(); } - // file observer + /// file observer Intent observer_intent = new Intent(this, FileObserverService.class); observer_intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_INIT_OBSERVED_LIST); startService(observer_intent); - - /// USER INTERFACE - requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); - - // Drop-down navigation - mDirectories = new CustomArrayAdapter(this, R.layout.sherlock_spinner_dropdown_item); - OCFile currFile = getFile(); - while(mStorageManager != null && currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) { - mDirectories.add(currFile.getFileName()); - currFile = mStorageManager.getFileById(currFile.getParentId()); + + /// Load of saved instance state + if(savedInstanceState != null) { + mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW); + + } else { + mWaitingToPreview = null; } - mDirectories.add(OCFile.PATH_SEPARATOR); + + /// USER INTERFACE // Inflate and set the layout view setContentView(R.layout.files); - mFileList = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); - mDualPane = (findViewById(R.id.file_details_container) != null); - if (mDualPane && savedInstanceState == null) { - initFileDetailsInDualPane(); + mDualPane = getResources().getBoolean(R.bool.large_land_layout); + mLeftFragmentContainer = findViewById(R.id.left_fragment_container); + mRightFragmentContainer = findViewById(R.id.right_fragment_container); + if (savedInstanceState == null) { + createMinFragments(); } - + // Action bar setup - ActionBar actionBar = getSupportActionBar(); - actionBar.setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation - actionBar.setDisplayHomeAsUpEnabled(getFile() != null && getFile().getParentId() != 0); - actionBar.setDisplayShowTitleEnabled(false); - actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); - actionBar.setListNavigationCallbacks(mDirectories, this); - setSupportProgressBarIndeterminateVisibility(false); // always AFTER setContentView(...) ; to workaround bug in its implementation + mDirectories = new CustomArrayAdapter(this, R.layout.sherlock_spinner_dropdown_item); + getSupportActionBar().setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation + setSupportProgressBarIndeterminateVisibility(false); // always AFTER setContentView(...) ; to work around bug in its implementation + - mBackFromCreatingFirstAccount = false; Log_OC.d(TAG, "onCreate() end"); } - + @Override - public void onConfigurationChanged (Configuration newConfig) { - super.onConfigurationChanged(newConfig); - if (mStarted) { - checkConfigurationChange(newConfig); - } else { - mNewConfigurationChangeToApplyOnStart = newConfig; - } + protected void onDestroy() { + super.onDestroy(); + if (mDownloadConnection != null) + unbindService(mDownloadConnection); + if (mUploadConnection != null) + unbindService(mUploadConnection); } - - - private void initFileDetailsInDualPane() { - if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) { - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - if (mChosenFile != null) { - if (PreviewMediaFragment.canBePreviewed(mChosenFile)) { - if (mChosenFile.isDown()) { - int startPlaybackPosition = getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0); - boolean autoplay = getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true); - transaction.replace(R.id.file_details_container, new PreviewMediaFragment(mChosenFile, getAccount(), startPlaybackPosition, autoplay), FileDetailFragment.FTAG); - } else { - transaction.replace(R.id.file_details_container, new FileDetailFragment(mChosenFile, getAccount()), FileDetailFragment.FTAG); - mWaitingToPreview = mChosenFile; - } + + + /** + * Called when the ownCloud {@link Account} associated to the Activity was just updated. + */ + @Override + protected void onAccountSet(boolean stateWasRecovered) { + if (getAccount() != null) { + mStorageManager = new FileDataStorageManager(getAccount(), getContentResolver()); + + /// Check whether the 'main' OCFile handled by the Activity is contained in the current Account + OCFile file = getFile(); + // get parent from path + String parentPath = ""; + if (file != null) { + if (file.isDown() && file.getLastSyncDateForProperties() == 0) { + // upload in progress - right now, files are not inserted in the local cache until the upload is successful + // get parent from path + parentPath = file.getRemotePath().substring(0, file.getRemotePath().lastIndexOf(file.getFileName())); + if (mStorageManager.getFileByPath(parentPath) == null) + file = null; // not able to know the directory where the file is uploading } else { - transaction.replace(R.id.file_details_container, new FileDetailFragment(mChosenFile, getAccount()), FileDetailFragment.FTAG); + file = mStorageManager.getFileByPath(file.getRemotePath()); // currentDir = null if not in the current Account } - mChosenFile = null; + } + if (file == null) { + // fall back to root folder + file = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR); // never returns null + } + setFile(file); + mDirectories.clear(); + OCFile fileIt = file; + while(fileIt != null && fileIt.getFileName() != OCFile.PATH_SEPARATOR) { + if (fileIt.isDirectory()) { + mDirectories.add(fileIt.getFileName()); + } + // get parent from path + parentPath = fileIt.getRemotePath().substring(0, fileIt.getRemotePath().lastIndexOf(fileIt.getFileName())); + fileIt = mStorageManager.getFileByPath(parentPath); + } + mDirectories.add(OCFile.PATH_SEPARATOR); + if (!stateWasRecovered) { + Log_OC.e(TAG, "Initializing Fragments in onAccountChanged.."); + initFragmentsWithFile(); } else { - transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment + updateFragmentsVisibility(!file.isDirectory()); + updateNavigationElementsInActionBar(file.isDirectory() ? null : file); } - transaction.commit(); + + + } else { + Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!"); } } - - - @Override - protected void onStart() { - super.onStart(); - if (mNewConfigurationChangeToApplyOnStart != null) { - checkConfigurationChange(mNewConfigurationChangeToApplyOnStart); - mNewConfigurationChangeToApplyOnStart = null; + + + private void createMinFragments() { + OCFileListFragment listOfFiles = new OCFileListFragment(); + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + transaction.add(R.id.left_fragment_container, listOfFiles, TAG_LIST_OF_FILES); + transaction.commit(); + } + + private void initFragmentsWithFile() { + if (getAccount() != null && getFile() != null) { + /// First fragment + OCFileListFragment listOfFiles = getListOfFilesFragment(); + if (listOfFiles != null) { + listOfFiles.listDirectory(getCurrentDir()); + } else { + Log.e(TAG, "Still have a chance to lose the initializacion of list fragment >("); + } + + /// Second fragment + OCFile file = getFile(); + Fragment secondFragment = chooseInitialSecondFragment(file); + if (secondFragment != null) { + setSecondFragment(secondFragment); + updateFragmentsVisibility(true); + updateNavigationElementsInActionBar(file); + + } else { + cleanSecondFragment(); + } + + } else { + Log.wtf(TAG, "initFragments() called with invalid NULLs!"); + if (getAccount() == null) { + Log.wtf(TAG, "\t account is NULL"); + } + if (getFile() == null) { + Log.wtf(TAG, "\t file is NULL"); + } } - mStarted = true; } - - @Override - protected void onStop() { - super.onStop(); - mStarted = false; + + private Fragment chooseInitialSecondFragment(OCFile file) { + Fragment secondFragment = null; + if (file != null && !file.isDirectory()) { + if (file.isDown() && PreviewMediaFragment.canBePreviewed(file) + && file.getLastSyncDateForProperties() > 0 // temporal fix + ) { + int startPlaybackPosition = getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0); + boolean autoplay = getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true); + secondFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition, autoplay); + + } else { + secondFragment = new FileDetailFragment(file, getAccount()); + } + } + return secondFragment; } - - - private void checkConfigurationChange(Configuration newConfig) { - FileFragment fragment = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); - if (fragment != null - && fragment.getFile() != null - && (newConfig.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE - && newConfig.orientation != Configuration.ORIENTATION_LANDSCAPE) { - - onFileClick(fragment.getFile(), true); - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.remove((Fragment)fragment); - transaction.commit(); - + + + /** + * Replaces the second fragment managed by the activity with the received as + * a parameter. + * + * Assumes never will be more than two fragments managed at the same time. + * + * @param fragment New second Fragment to set. + */ + private void setSecondFragment(Fragment fragment) { + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + transaction.replace(R.id.right_fragment_container, fragment, TAG_SECOND_FRAGMENT); + transaction.commit(); + } + + + private void updateFragmentsVisibility(boolean existsSecondFragment) { + if (mDualPane) { + if (mLeftFragmentContainer.getVisibility() != View.VISIBLE) { + mLeftFragmentContainer.setVisibility(View.VISIBLE); + } + if (mRightFragmentContainer.getVisibility() != View.VISIBLE) { + mRightFragmentContainer.setVisibility(View.VISIBLE); + } + + } else if (existsSecondFragment) { + if (mLeftFragmentContainer.getVisibility() != View.GONE) { + mLeftFragmentContainer.setVisibility(View.GONE); + } + if (mRightFragmentContainer.getVisibility() != View.VISIBLE) { + mRightFragmentContainer.setVisibility(View.VISIBLE); + } + } else { - finish(); - Intent intent = new Intent(this, FileDisplayActivity.class); - intent.putExtra(FileDetailFragment.EXTRA_FILE, getFile()); - intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getAccount()); - startActivity(intent); + if (mLeftFragmentContainer.getVisibility() != View.VISIBLE) { + mLeftFragmentContainer.setVisibility(View.VISIBLE); + } + if (mRightFragmentContainer.getVisibility() != View.GONE) { + mRightFragmentContainer.setVisibility(View.GONE); + } } } - @Override - protected void onDestroy() { - super.onDestroy(); - if (mDownloadConnection != null) - unbindService(mDownloadConnection); - if (mUploadConnection != null) - unbindService(mUploadConnection); + private OCFileListFragment getListOfFilesFragment() { + Fragment listOfFiles = getSupportFragmentManager().findFragmentByTag(FileDisplayActivity.TAG_LIST_OF_FILES); + if (listOfFiles != null) { + return (OCFileListFragment)listOfFiles; + } + Log_OC.wtf(TAG, "Access to unexisting list of files fragment!!"); + return null; } - + protected FileFragment getSecondFragment() { + Fragment second = getSupportFragmentManager().findFragmentByTag(FileDisplayActivity.TAG_SECOND_FRAGMENT); + if (second != null) { + return (FileFragment)second; + } + return null; + } + + public void cleanSecondFragment() { + Fragment second = getSecondFragment(); + if (second != null) { + FragmentTransaction tr = getSupportFragmentManager().beginTransaction(); + tr.remove(second); + tr.commit(); + } + updateFragmentsVisibility(false); + updateNavigationElementsInActionBar(null); + } + + protected void refeshListOfFilesFragment() { + OCFileListFragment fileListFragment = getListOfFilesFragment(); + if (fileListFragment != null) { + fileListFragment.listDirectory(); + } + } + + protected void refreshSecondFragment(String downloadEvent, String downloadedRemotePath, boolean success) { + FileFragment secondFragment = getSecondFragment(); + boolean waitedPreview = (mWaitingToPreview != null && mWaitingToPreview.getRemotePath().equals(downloadedRemotePath)); + if (secondFragment != null && secondFragment instanceof FileDetailFragment) { + FileDetailFragment detailsFragment = (FileDetailFragment) secondFragment; + OCFile fileInFragment = detailsFragment.getFile(); + if (fileInFragment != null && !downloadedRemotePath.equals(fileInFragment.getRemotePath())) { + // the user browsed to other file ; forget the automatic preview + mWaitingToPreview = null; + + } else if (downloadEvent.equals(FileDownloader.getDownloadAddedMessage())) { + // grant that the right panel updates the progress bar + detailsFragment.listenForTransferProgress(); + detailsFragment.updateFileDetails(true, false); + + } else if (downloadEvent.equals(FileDownloader.getDownloadFinishMessage())) { + // update the right panel + boolean detailsFragmentChanged = false; + if (waitedPreview) { + if (success) { + mWaitingToPreview = mStorageManager.getFileById(mWaitingToPreview.getFileId()); // update the file from database, for the local storage path + if (PreviewMediaFragment.canBePreviewed(mWaitingToPreview)) { + startMediaPreview(mWaitingToPreview, 0, true); + detailsFragmentChanged = true; + } else { + openFile(mWaitingToPreview); + } + } + mWaitingToPreview = null; + } + if (!detailsFragmentChanged) { + detailsFragment.updateFileDetails(false, (success)); + } + } + } + } + + @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getSherlock().getMenuInflater(); - inflater.inflate(R.menu.main_menu, menu); - - return true; + inflater.inflate(R.menu.main_menu, menu); + return true; } @Override public boolean onOptionsItemSelected(MenuItem item) { boolean retval = true; switch (item.getItemId()) { - case R.id.action_create_dir: { - EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.uploader_info_dirname), "", -1, -1, this); - dialog.show(getSupportFragmentManager(), "createdirdialog"); - break; - } - case R.id.action_sync_account: { - startSynchronization(); - break; - } - case R.id.action_upload: { - showDialog(DIALOG_CHOOSE_UPLOAD_SOURCE); - break; - } - case R.id.action_settings: { - Intent settingsIntent = new Intent(this, Preferences.class); - startActivity(settingsIntent); - break; - } - case android.R.id.home: { - if(getFile() != null && getFile().getParentId() != 0){ - onBackPressed(); - } - break; + case R.id.action_create_dir: { + EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.uploader_info_dirname), "", -1, -1, this); + dialog.show(getSupportFragmentManager(), "createdirdialog"); + break; + } + case R.id.action_sync_account: { + startSynchronization(); + break; + } + case R.id.action_upload: { + showDialog(DIALOG_CHOOSE_UPLOAD_SOURCE); + break; + } + case R.id.action_settings: { + Intent settingsIntent = new Intent(this, Preferences.class); + startActivity(settingsIntent); + break; + } + case android.R.id.home: { + FileFragment second = getSecondFragment(); + OCFile currentDir = getCurrentDir(); + if((currentDir != null && currentDir.getParentId() != 0) || + (second != null && second.getFile() != null)) { + onBackPressed(); } - default: - retval = super.onOptionsItemSelected(item); + break; + } + default: + retval = super.onOptionsItemSelected(item); } return retval; } private void startSynchronization() { - ContentResolver.cancelSync(null, AccountAuthenticator.AUTHORITY); // cancel the current synchronizations of any ownCloud account + ContentResolver.cancelSync(null, MainApp.getAuthTokenType()); // cancel the current synchronizations of any ownCloud account Bundle bundle = new Bundle(); bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true); ContentResolver.requestSync( getAccount(), - AccountAuthenticator.AUTHORITY, bundle); + MainApp.getAuthTokenType(), bundle); } @@ -358,13 +506,13 @@ public class FileDisplayActivity extends FileActivity implements */ protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - + if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) { requestSimpleUpload(data, resultCode); - + } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) { requestMultipleUpload(data, resultCode); - + } } @@ -390,9 +538,9 @@ public class FileDisplayActivity extends FileActivity implements if (resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE) i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_MOVE); startService(i); - + } else { - Log_OC.d("FileDisplay", "User clicked on 'Update' with no selection"); + Log_OC.d(TAG, "User clicked on 'Update' with no selection"); Toast t = Toast.makeText(this, getString(R.string.filedisplay_no_file_selected), Toast.LENGTH_LONG); t.show(); return; @@ -412,14 +560,14 @@ public class FileDisplayActivity extends FileActivity implements filepath = selectedImagePath; else filepath = filemanagerstring; - + } catch (Exception e) { - Log_OC.e("FileDisplay", "Unexpected exception when trying to read the result of Intent.ACTION_GET_CONTENT", e); + Log_OC.e(TAG, "Unexpected exception when trying to read the result of Intent.ACTION_GET_CONTENT", e); e.printStackTrace(); - + } finally { if (filepath == null) { - Log_OC.e("FileDisplay", "Couldnt resolve path to file"); + Log_OC.e(TAG, "Couldnt resolve path to file"); Toast t = Toast.makeText(this, getString(R.string.filedisplay_unexpected_bad_get_content), Toast.LENGTH_LONG); t.show(); return; @@ -445,83 +593,65 @@ public class FileDisplayActivity extends FileActivity implements startService(i); } - @Override public void onBackPressed() { - if (mDirectories.getCount() <= 1) { - finish(); - return; - } - popDirname(); - mFileList.onNavigateUp(); - setFile(mFileList.getCurrentFile()); - - if (mDualPane) { - // Resets the FileDetailsFragment on Tablets so that it always displays - Fragment fileFragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); - if (fileFragment != null && (fileFragment instanceof PreviewMediaFragment || !((FileDetailFragment) fileFragment).isEmpty())) { - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment - transaction.commit(); + OCFileListFragment listOfFiles = getListOfFilesFragment(); + if (mDualPane || getSecondFragment() == null) { + if (listOfFiles != null) { // should never be null, indeed + if (mDirectories.getCount() <= 1) { + finish(); + return; + } + popDirname(); + listOfFiles.onBrowseUp(); } } - - if(getFile().getParentId() == 0){ - ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayHomeAsUpEnabled(false); - } + if (listOfFiles != null) { // should never be null, indeed + setFile(listOfFiles.getCurrentFile()); + } + cleanSecondFragment(); } @Override protected void onSaveInstanceState(Bundle outState) { // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved - Log_OC.d(TAG, "onSaveInstanceState() start"); + Log_OC.e(TAG, "onSaveInstanceState() start"); super.onSaveInstanceState(outState); - if (mDualPane) { - FileFragment fragment = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); - if (fragment != null) { - OCFile file = fragment.getFile(); - if (file != null) { - outState.putParcelable(FileActivity.EXTRA_FILE, file); - } - } - } - outState.putParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview); + outState.putParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview); Log_OC.d(TAG, "onSaveInstanceState() end"); } + + @Override protected void onResume() { - Log_OC.d(TAG, "onResume() start"); super.onResume(); + Log_OC.e(TAG, "onResume() start"); // Listen for sync messages - IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE); + IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.getSyncMessage()); mSyncBroadcastReceiver = new SyncBroadcastReceiver(); registerReceiver(mSyncBroadcastReceiver, syncIntentFilter); - + // Listen for upload messages - IntentFilter uploadIntentFilter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE); + IntentFilter uploadIntentFilter = new IntentFilter(FileUploader.getUploadFinishMessage()); mUploadFinishReceiver = new UploadFinishReceiver(); registerReceiver(mUploadFinishReceiver, uploadIntentFilter); - + // Listen for download messages - IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.DOWNLOAD_ADDED_MESSAGE); - downloadIntentFilter.addAction(FileDownloader.DOWNLOAD_FINISH_MESSAGE); + IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.getDownloadAddedMessage()); + downloadIntentFilter.addAction(FileDownloader.getDownloadFinishMessage()); mDownloadFinishReceiver = new DownloadFinishReceiver(); registerReceiver(mDownloadFinishReceiver, downloadIntentFilter); - // List current directory - mFileList.listDirectory(getFile()); // TODO we should find the way to avoid the need of this (maybe it's not necessary yet; to check) - Log_OC.d(TAG, "onResume() end"); } - + @Override protected void onPause() { - Log_OC.d(TAG, "onPause() start"); super.onPause(); + Log_OC.e(TAG, "onPause() start"); if (mSyncBroadcastReceiver != null) { unregisterReceiver(mSyncBroadcastReceiver); mSyncBroadcastReceiver = null; @@ -534,11 +664,11 @@ public class FileDisplayActivity extends FileActivity implements unregisterReceiver(mDownloadFinishReceiver); mDownloadFinishReceiver = null; } - + Log_OC.d(TAG, "onPause() end"); } - + @Override protected void onPrepareDialog(int id, Dialog dialog, Bundle args) { if (id == DIALOG_SSL_VALIDATOR && mLastSslUntrustedServerResult != null) { @@ -546,7 +676,7 @@ public class FileDisplayActivity extends FileActivity implements } } - + @Override protected Dialog onCreateDialog(int id) { Dialog dialog = null; @@ -562,34 +692,34 @@ public class FileDisplayActivity extends FileActivity implements break; } case DIALOG_CHOOSE_UPLOAD_SOURCE: { - + String[] items = null; - + String[] allTheItems = { getString(R.string.actionbar_upload_files), - getString(R.string.actionbar_upload_from_apps), - getString(R.string.actionbar_failed_instant_upload) }; - + getString(R.string.actionbar_upload_from_apps), + getString(R.string.actionbar_failed_instant_upload) }; + String[] commonItems = { getString(R.string.actionbar_upload_files), - getString(R.string.actionbar_upload_from_apps) }; - + getString(R.string.actionbar_upload_from_apps) }; + if (InstantUploadActivity.IS_ENABLED) items = allTheItems; else items = commonItems; - + builder = new AlertDialog.Builder(this); builder.setTitle(R.string.actionbar_upload); builder.setItems(items, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int item) { if (item == 0) { // if (!mDualPane) { - Intent action = new Intent(FileDisplayActivity.this, UploadFilesActivity.class); - action.putExtra(UploadFilesActivity.EXTRA_ACCOUNT, FileDisplayActivity.this.getAccount()); - startActivityForResult(action, ACTION_SELECT_MULTIPLE_FILES); - // } else { - // TODO create and handle new fragment - // LocalFileListFragment - // } + Intent action = new Intent(FileDisplayActivity.this, UploadFilesActivity.class); + action.putExtra(UploadFilesActivity.EXTRA_ACCOUNT, FileDisplayActivity.this.getAccount()); + startActivityForResult(action, ACTION_SELECT_MULTIPLE_FILES); + // } else { + // TODO create and handle new fragment + // LocalFileListFragment + // } } else if (item == 1) { Intent action = new Intent(Intent.ACTION_GET_CONTENT); action = action.setType("*/*").addCategory(Intent.CATEGORY_OPENABLE); @@ -614,21 +744,45 @@ public class FileDisplayActivity extends FileActivity implements builder.setMessage(getResources().getString(R.string.ssl_validator_not_saved)); builder.setCancelable(false); builder.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - }; - }); + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + }; + }); dialog = builder.create(); break; } default: dialog = null; } - + return dialog; } + + /** + * Show loading dialog + */ + public void showLoadingDialog() { + // Construct dialog + LoadingDialog loading = new LoadingDialog(getResources().getString(R.string.wait_a_moment)); + FragmentManager fm = getSupportFragmentManager(); + FragmentTransaction ft = fm.beginTransaction(); + loading.show(ft, DIALOG_WAIT_TAG); + + } + + /** + * Dismiss loading dialog + */ + public void dismissLoadingDialog(){ + Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG); + if (frag != null) { + LoadingDialog loading = (LoadingDialog) frag; + loading.dismiss(); + } + } + /** * Translates a content URI of an image to a physical path @@ -647,7 +801,7 @@ public class FileDisplayActivity extends FileActivity implements } return null; } - + /** * Pushes a directory to the drop down list * @param directory to push @@ -672,29 +826,29 @@ public class FileDisplayActivity extends FileActivity implements // Custom array adapter to override text colors private class CustomArrayAdapter extends ArrayAdapter { - + public CustomArrayAdapter(FileDisplayActivity ctx, int view) { super(ctx, view); } - + public View getView(int position, View convertView, ViewGroup parent) { View v = super.getView(position, convertView, parent); - + ((TextView) v).setTextColor(getResources().getColorStateList( android.R.color.white)); return v; } - + public View getDropDownView(int position, View convertView, ViewGroup parent) { View v = super.getDropDownView(position, convertView, parent); - + ((TextView) v).setTextColor(getResources().getColorStateList( android.R.color.white)); - + return v; } - + } private class SyncBroadcastReceiver extends BroadcastReceiver { @@ -707,43 +861,38 @@ public class FileDisplayActivity extends FileActivity implements boolean inProgress = intent.getBooleanExtra(FileSyncService.IN_PROGRESS, false); String accountName = intent.getStringExtra(FileSyncService.ACCOUNT_NAME); - Log_OC.d("FileDisplay", "sync of account " + accountName + " is in_progress: " + inProgress); + Log_OC.d(TAG, "sync of account " + accountName + " is in_progress: " + inProgress); + + if (getAccount() != null && accountName.equals(getAccount().name) + && mStorageManager != null + ) { - if (getAccount() != null && accountName.equals(getAccount().name)) { - String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); - + boolean fillBlankRoot = false; - OCFile currentDir = getFile(); + OCFile currentDir = getCurrentDir(); if (currentDir == null) { currentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR); - fillBlankRoot = (currentDir != null); + fillBlankRoot = (currentDir != null); } if ((synchFolderRemotePath != null && currentDir != null && (currentDir.getRemotePath().equals(synchFolderRemotePath))) || fillBlankRoot ) { if (!fillBlankRoot) - currentDir = getStorageManager().getFileByPath(synchFolderRemotePath); - OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager() - .findFragmentById(R.id.fileList); + currentDir = mStorageManager.getFileByPath(synchFolderRemotePath); + OCFileListFragment fileListFragment = getListOfFilesFragment(); if (fileListFragment != null) { fileListFragment.listDirectory(currentDir); } + if (getSecondFragment() == null) + setFile(currentDir); } - setFile(currentDir); setSupportProgressBarIndeterminateVisibility(inProgress); - if (mBackFromCreatingFirstAccount) { - // awful patch to fix problem with visibility of progress circle with the first refresh of the first account - // TODO - kill this Activity when the first account has to be created instead of stack the account creation on it - getSupportActionBar().hide(); - getSupportActionBar().show(); - mBackFromCreatingFirstAccount = false; - } removeStickyBroadcast(intent); - + } - + RemoteOperationResult synchResult = (RemoteOperationResult)intent.getSerializableExtra(FileSyncService.SYNC_RESULT); if (synchResult != null) { if (synchResult.getCode().equals(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)) { @@ -753,7 +902,7 @@ public class FileDisplayActivity extends FileActivity implements } } } - + private class UploadFinishReceiver extends BroadcastReceiver { /** @@ -766,18 +915,16 @@ public class FileDisplayActivity extends FileActivity implements String uploadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH); String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME); boolean sameAccount = getAccount() != null && accountName.equals(getAccount().name); - boolean isDescendant = (getFile() != null) && (uploadedRemotePath != null) && (uploadedRemotePath.startsWith(getFile().getRemotePath())); + OCFile currentDir = getCurrentDir(); + boolean isDescendant = (currentDir != null) && (uploadedRemotePath != null) && (uploadedRemotePath.startsWith(currentDir.getRemotePath())); if (sameAccount && isDescendant) { - OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); - if (fileListFragment != null) { - fileListFragment.listDirectory(); - } + refeshListOfFilesFragment(); } } - + } - - + + /** * Class waiting for broadcast events from the {@link FielDownloader} service. * @@ -790,19 +937,18 @@ public class FileDisplayActivity extends FileActivity implements boolean sameAccount = isSameAccount(context, intent); String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH); boolean isDescendant = isDescendant(downloadedRemotePath); - + if (sameAccount && isDescendant) { - updateLeftPanel(); - if (mDualPane) { - updateRightPanel(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false)); - } + refeshListOfFilesFragment(); + refreshSecondFragment(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false)); } - + removeStickyBroadcast(intent); } private boolean isDescendant(String downloadedRemotePath) { - return (getFile() != null && downloadedRemotePath != null && downloadedRemotePath.startsWith(getFile().getRemotePath())); + OCFile currentDir = getCurrentDir(); + return (currentDir != null && downloadedRemotePath != null && downloadedRemotePath.startsWith(currentDir.getRemotePath())); } private boolean isSameAccount(Context context, Intent intent) { @@ -810,45 +956,6 @@ public class FileDisplayActivity extends FileActivity implements return (accountName != null && getAccount() != null && accountName.equals(getAccount().name)); } } - - - protected void updateLeftPanel() { - OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); - if (fileListFragment != null) { - fileListFragment.listDirectory(); - } - } - - protected void updateRightPanel(String downloadEvent, String downloadedRemotePath, boolean success) { - Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); - boolean waitedPreview = (mWaitingToPreview != null && mWaitingToPreview.getRemotePath().equals(downloadedRemotePath)); - if (fragment != null && fragment instanceof FileDetailFragment) { - FileDetailFragment detailsFragment = (FileDetailFragment) fragment; - OCFile fileInFragment = detailsFragment.getFile(); - if (fileInFragment != null && !downloadedRemotePath.equals(fileInFragment.getRemotePath())) { - // the user browsed to other file ; forget the automatic preview - mWaitingToPreview = null; - - } else if (downloadEvent.equals(FileDownloader.DOWNLOAD_ADDED_MESSAGE)) { - // grant that the right panel updates the progress bar - detailsFragment.listenForTransferProgress(); - detailsFragment.updateFileDetails(true, false); - - } else if (downloadEvent.equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) { - // update the right panel - if (success && waitedPreview) { - mWaitingToPreview = mStorageManager.getFileById(mWaitingToPreview.getFileId()); // update the file from database, for the local storage path - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.replace(R.id.file_details_container, new PreviewMediaFragment(mWaitingToPreview, getAccount(), 0, true), FileDetailFragment.FTAG); - transaction.commit(); - mWaitingToPreview = null; - - } else { - detailsFragment.updateFileDetails(false, (success)); - } - } - } - } /** @@ -858,141 +965,115 @@ public class FileDisplayActivity extends FileActivity implements public DataStorageManager getStorageManager() { return mStorageManager; } - + /** * {@inheritDoc} + * + * Updates action bar and second fragment, if in dual pane mode. */ @Override - public void onDirectoryClick(OCFile directory) { + public void onBrowsedDownTo(OCFile directory) { pushDirname(directory); - ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); - - if (mDualPane) { - // Resets the FileDetailsFragment on Tablets so that it always displays - Fragment fileFragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); - if (fileFragment != null && (fileFragment instanceof PreviewMediaFragment || !((FileDetailFragment) fileFragment).isEmpty())) { - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment - transaction.commit(); - } - } + cleanSecondFragment(); } - - + /** - * {@inheritDoc} + * Opens the image gallery showing the image {@link OCFile} received as parameter. + * + * @param file Image {@link OCFile} to show. */ @Override - public void onFileClick(OCFile file, boolean onOrientationChange) { - if (file != null && PreviewImageFragment.canBePreviewed(file)) { - // preview image - it handles the download, if needed - startPreviewImage(file); - - } else if (file != null && PreviewMediaFragment.canBePreviewed(file)) { - if (file.isDown()) { - // general preview - if (!onOrientationChange) { - startMediaPreview(file, 0, true, onOrientationChange); - } else { - int startPlaybackPosition = 0; - boolean autoplay = true; - Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); - if (fragment != null && file.isVideo()) { - PreviewMediaFragment videoFragment = (PreviewMediaFragment)fragment; - startPlaybackPosition = videoFragment.getPosition(); - autoplay = videoFragment.isPlaying(); - } - startMediaPreview(file, startPlaybackPosition, autoplay, onOrientationChange); - } - - } else { - // automatic download, preview on finish - startDownloadForPreview(file, onOrientationChange); - - } - } else { - // details view - startDetails(file, onOrientationChange); - } - } - - private void startPreviewImage(OCFile file) { + public void startImagePreview(OCFile file) { Intent showDetailsIntent = new Intent(this, PreviewImageActivity.class); - showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file); - showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getAccount()); + showDetailsIntent.putExtra(EXTRA_FILE, file); + showDetailsIntent.putExtra(EXTRA_ACCOUNT, getAccount()); startActivity(showDetailsIntent); } - - private void startMediaPreview(OCFile file, int startPlaybackPosition, boolean autoplay, boolean onOrientationChange) { - if (mDualPane && !onOrientationChange) { - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.replace(R.id.file_details_container, new PreviewMediaFragment(file, getAccount(), startPlaybackPosition, autoplay), FileDetailFragment.FTAG); - transaction.commit(); - - } else { - Intent showDetailsIntent = new Intent(this, FileDetailActivity.class); - showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file); - showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getAccount()); - showDetailsIntent.putExtra(PreviewVideoActivity.EXTRA_START_POSITION, startPlaybackPosition); - showDetailsIntent.putExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, autoplay); - startActivity(showDetailsIntent); - } - } - - private void startDownloadForPreview(OCFile file, boolean onOrientationChange) { - if (mDualPane && !onOrientationChange) { - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.replace(R.id.file_details_container, new FileDetailFragment(file, getAccount()), 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, getAccount()); - startActivity(showDetailsIntent); - } + + /** + * Stars the preview of an already down media {@link OCFile}. + * + * @param file Media {@link OCFile} to preview. + * @param startPlaybackPosition Media position where the playback will be started, in milliseconds. + * @param autoplay When 'true', the playback will start without user interactions. + */ + @Override + public void startMediaPreview(OCFile file, int startPlaybackPosition, boolean autoplay) { + Fragment mediaFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition, autoplay); + setSecondFragment(mediaFragment); + updateFragmentsVisibility(true); + updateNavigationElementsInActionBar(file); + setFile(file); } - - private void startDetails(OCFile file, boolean onOrientationChange) { - if (mDualPane && !file.isImage() && !onOrientationChange) { - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.replace(R.id.file_details_container, new FileDetailFragment(file, getAccount()), FileDetailFragment.FTAG); - transaction.commit(); - } else { - Intent showDetailsIntent = new Intent(this, FileDetailActivity.class); - showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file); - showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getAccount()); - startActivity(showDetailsIntent); - } + /** + * Requests the download of the received {@link OCFile} , updates the UI + * to monitor the download progress and prepares the activity to preview + * or open the file when the download finishes. + * + * @param file {@link OCFile} to download and preview. + */ + @Override + public void startDownloadForPreview(OCFile file) { + Fragment detailFragment = new FileDetailFragment(file, getAccount()); + setSecondFragment(detailFragment); + mWaitingToPreview = file; + requestForDownload(); + updateFragmentsVisibility(true); + updateNavigationElementsInActionBar(file); + setFile(file); } /** - * {@inheritDoc} + * Shows the information of the {@link OCFile} received as a + * parameter in the second fragment. + * + * @param file {@link OCFile} whose details will be shown */ @Override - public OCFile getInitialDirectory() { - return getFile(); + public void showDetails(OCFile file) { + Fragment detailFragment = new FileDetailFragment(file, getAccount()); + setSecondFragment(detailFragment); + updateFragmentsVisibility(true); + updateNavigationElementsInActionBar(file); + setFile(file); } - - + + + /** + * TODO + */ + private void updateNavigationElementsInActionBar(OCFile chosenFile) { + ActionBar actionBar = getSupportActionBar(); + if (chosenFile == null || mDualPane) { + // only list of files - set for browsing through folders + OCFile currentDir = getCurrentDir(); + actionBar.setDisplayHomeAsUpEnabled(currentDir != null && currentDir.getParentId() != 0); + actionBar.setDisplayShowTitleEnabled(false); + actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); + actionBar.setListNavigationCallbacks(mDirectories, this); // assuming mDirectories is updated + + } else { + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setDisplayShowTitleEnabled(true); + actionBar.setTitle(chosenFile.getFileName()); + actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); + } + } + + /** * {@inheritDoc} */ @Override public void onFileStateChanged() { - OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); - if (fileListFragment != null) { - fileListFragment.listDirectory(); - } + refeshListOfFilesFragment(); + updateNavigationElementsInActionBar(getSecondFragment().getFile()); } - + /** * {@inheritDoc} */ @@ -1001,7 +1082,7 @@ public class FileDisplayActivity extends FileActivity implements return mDownloaderBinder; } - + /** * {@inheritDoc} */ @@ -1009,8 +1090,8 @@ public class FileDisplayActivity extends FileActivity implements public FileUploaderBinder getFileUploaderBinder() { return mUploaderBinder; } - - + + /** Defines callbacks for service binding, passed to bindService() */ private class ListServiceConnection implements ServiceConnection { @@ -1022,7 +1103,7 @@ public class FileDisplayActivity extends FileActivity implements if (mWaitingToPreview != null) { requestForDownload(); } - + } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) { Log_OC.d(TAG, "Upload service connected"); mUploaderBinder = (FileUploaderBinder) service; @@ -1030,15 +1111,15 @@ public class FileDisplayActivity extends FileActivity implements return; } // a new chance to get the mDownloadBinder through getFileDownloadBinder() - THIS IS A MESS - if (mFileList != null) - mFileList.listDirectory(); - if (mDualPane) { - Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); - if (fragment != null && fragment instanceof FileDetailFragment) { - FileDetailFragment detailFragment = (FileDetailFragment)fragment; - detailFragment.listenForTransferProgress(); - detailFragment.updateFileDetails(false, false); - } + OCFileListFragment listOfFiles = getListOfFilesFragment(); + if (listOfFiles != null) { + listOfFiles.listDirectory(); + } + FileFragment secondFragment = getSecondFragment(); + if (secondFragment != null && secondFragment instanceof FileDetailFragment) { + FileDetailFragment detailFragment = (FileDetailFragment)secondFragment; + detailFragment.listenForTransferProgress(); + detailFragment.updateFileDetails(false, false); } } @@ -1054,8 +1135,8 @@ public class FileDisplayActivity extends FileActivity implements } }; - - + + /** * Launch an intent to request the PIN code to the user before letting him use the app */ @@ -1094,10 +1175,10 @@ public class FileDisplayActivity extends FileActivity implements public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) { if (operation instanceof RemoveFileOperation) { onRemoveFileOperationFinish((RemoveFileOperation)operation, result); - + } else if (operation instanceof RenameFileOperation) { onRenameFileOperationFinish((RenameFileOperation)operation, result); - + } else if (operation instanceof SynchronizeFileOperation) { onSynchronizeFileOperationFinish((SynchronizeFileOperation)operation, result); @@ -1115,23 +1196,20 @@ public class FileDisplayActivity extends FileActivity implements * @param result Result of the removal. */ private void onRemoveFileOperationFinish(RemoveFileOperation operation, RemoteOperationResult result) { - dismissDialog(DIALOG_SHORT_WAIT); + dismissLoadingDialog(); if (result.isSuccess()) { Toast msg = Toast.makeText(this, R.string.remove_success_msg, Toast.LENGTH_LONG); msg.show(); OCFile removedFile = operation.getFile(); - if (mDualPane) { - FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); - if (details != null && removedFile.equals(details.getFile())) { - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment - transaction.commit(); - } + getSecondFragment(); + FileFragment second = getSecondFragment(); + if (second != null && removedFile.equals(second.getFile())) { + cleanSecondFragment(); } - if (mStorageManager.getFileById(removedFile.getParentId()).equals(getFile())) { - mFileList.listDirectory(); + if (mStorageManager.getFileById(removedFile.getParentId()).equals(getCurrentDir())) { + refeshListOfFilesFragment(); } - + } else { Toast msg = Toast.makeText(this, R.string.remove_fail_msg, Toast.LENGTH_LONG); msg.show(); @@ -1150,22 +1228,23 @@ public class FileDisplayActivity extends FileActivity implements */ private void onCreateFolderOperationFinish(CreateFolderOperation operation, RemoteOperationResult result) { if (result.isSuccess()) { - dismissDialog(DIALOG_SHORT_WAIT); - mFileList.listDirectory(); - + dismissLoadingDialog(); + refeshListOfFilesFragment(); + } else { - dismissDialog(DIALOG_SHORT_WAIT); + //dismissDialog(DIALOG_SHORT_WAIT); + dismissLoadingDialog(); try { Toast msg = Toast.makeText(FileDisplayActivity.this, R.string.create_dir_fail_msg, Toast.LENGTH_LONG); msg.show(); - + } catch (NotFoundException e) { Log_OC.e(TAG, "Error while trying to show fail message " , e); } } } - - + + /** * Updates the view associated to the activity after the finish of an operation trying to rename a * file. @@ -1174,19 +1253,19 @@ public class FileDisplayActivity extends FileActivity implements * @param result Result of the renaming. */ private void onRenameFileOperationFinish(RenameFileOperation operation, RemoteOperationResult result) { - dismissDialog(DIALOG_SHORT_WAIT); + dismissLoadingDialog(); OCFile renamedFile = operation.getFile(); if (result.isSuccess()) { if (mDualPane) { - FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); + FileFragment details = getSecondFragment(); if (details != null && details instanceof FileDetailFragment && renamedFile.equals(details.getFile()) ) { ((FileDetailFragment) details).updateFileDetails(renamedFile, getAccount()); } } - if (mStorageManager.getFileById(renamedFile.getParentId()).equals(getFile())) { - mFileList.listDirectory(); + if (mStorageManager.getFileById(renamedFile.getParentId()).equals(getCurrentDir())) { + refeshListOfFilesFragment(); } - + } else { if (result.getCode().equals(ResultCode.INVALID_LOCAL_FILE_NAME)) { Toast msg = Toast.makeText(this, R.string.rename_local_fail_msg, Toast.LENGTH_LONG); @@ -1205,7 +1284,7 @@ public class FileDisplayActivity extends FileActivity implements private void onSynchronizeFileOperationFinish(SynchronizeFileOperation operation, RemoteOperationResult result) { - dismissDialog(DIALOG_SHORT_WAIT); + dismissLoadingDialog(); OCFile syncedFile = operation.getLocalFile(); if (!result.isSuccess()) { if (result.getCode() == ResultCode.SYNC_CONFLICT) { @@ -1213,17 +1292,17 @@ public class FileDisplayActivity extends FileActivity implements i.putExtra(ConflictsResolveActivity.EXTRA_FILE, syncedFile); i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, getAccount()); startActivity(i); - + } else { Toast msg = Toast.makeText(this, R.string.sync_file_fail_msg, Toast.LENGTH_LONG); msg.show(); } - + } else { if (operation.transferWasRequested()) { - mFileList.listDirectory(); + refeshListOfFilesFragment(); onTransferStateChanged(syncedFile, true, true); - + } else { Toast msg = Toast.makeText(this, R.string.sync_file_nothing_to_do_msg, Toast.LENGTH_LONG); msg.show(); @@ -1237,12 +1316,8 @@ public class FileDisplayActivity extends FileActivity implements */ @Override public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading) { - /*OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); - if (fileListFragment != null) { - fileListFragment.listDirectory(); - }*/ if (mDualPane) { - FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG); + FileFragment details = getSecondFragment(); if (details != null && details instanceof FileDetailFragment && file.equals(details.getFile()) ) { if (downloading || uploading) { ((FileDetailFragment)details).updateFileDetails(file, getAccount()); @@ -1254,53 +1329,28 @@ public class FileDisplayActivity extends FileActivity implements } - @Override - public void showFragmentWithDetails(OCFile file) { - if (mDualPane) { - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.replace(R.id.file_details_container, new FileDetailFragment(file, getAccount()), FileDetailFragment.FTAG); - transaction.commit(); - - } else { - Intent showDetailsIntent = new Intent(this, FileDetailActivity.class); - showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file); - showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getAccount()); - showDetailsIntent.putExtra(FileDetailActivity.EXTRA_MODE, FileDetailActivity.MODE_DETAILS); - startActivity(showDetailsIntent); - } - } - public void onDismiss(EditNameDialog dialog) { if (dialog.getResult()) { String newDirectoryName = dialog.getNewFilename().trim(); Log_OC.d(TAG, "'create directory' dialog dismissed with new name " + newDirectoryName); if (newDirectoryName.length() > 0) { - String path; - if (getFile() == null) { - // this is just a patch; we should ensure that mCurrentDir never is null - if (!mStorageManager.fileExists(OCFile.PATH_SEPARATOR)) { - OCFile file = new OCFile(OCFile.PATH_SEPARATOR); - mStorageManager.saveFile(file); - } - setFile(mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR)); - } - path = FileDisplayActivity.this.getFile().getRemotePath(); - + String path = getCurrentDir().getRemotePath(); + // Create directory path += newDirectoryName + OCFile.PATH_SEPARATOR; - RemoteOperation operation = new CreateFolderOperation(path, getFile().getFileId(), mStorageManager); + RemoteOperation operation = new CreateFolderOperation(path, false, mStorageManager); operation.execute( getAccount(), - FileDisplayActivity.this, - FileDisplayActivity.this, - mHandler, - FileDisplayActivity.this); - - showDialog(DIALOG_SHORT_WAIT); + FileDisplayActivity.this, + FileDisplayActivity.this, + mHandler, + FileDisplayActivity.this); + + showLoadingDialog(); } } } - - + + private void requestForDownload() { Account account = getAccount(); if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) { @@ -1312,42 +1362,17 @@ public class FileDisplayActivity extends FileActivity implements } - /** - * {@inheritDoc} - */ - @Override - protected void onAccountChanged() { - if (getAccount() != null) { - mStorageManager = new FileDataStorageManager(getAccount(), getContentResolver()); - - /// Check if the 'main' @OCFile handled by the Activity is a directory - OCFile currentDir = getFile(); - if(currentDir != null && !currentDir.isDirectory()) { - mChosenFile = getFile(); - currentDir = mStorageManager.getFileById(currentDir.getParentId()); - } - - /// Check if currentDir and mChosenFile are in the current account, and update them - if (currentDir != null) { - currentDir = mStorageManager.getFileByPath(currentDir.getRemotePath()); // currentDir = null if not in the current Account - } - if (mChosenFile != null) { - if (mChosenFile.fileExists()) { - mChosenFile = mStorageManager.getFileByPath(mChosenFile.getRemotePath()); // mChosenFile = null if not in the current Account - } // else : keep mChosenFile with the received value; this is currently the case of an upload in progress, when the user presses the status notification in a landscape tablet - } - - /// Default to root if mCurrentDir was not found - if (currentDir == null) { - currentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR); // never returns null + private OCFile getCurrentDir() { + OCFile file = getFile(); + if (file != null) { + if (file.isDirectory()) { + return file; + } else if (mStorageManager != null) { + String parentPath = file.getRemotePath().substring(0, file.getRemotePath().lastIndexOf(file.getFileName())); + return mStorageManager.getFileByPath(parentPath); } - - setFile(currentDir); - - } else { - Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!"); } + return null; } - }