|
|
@@ -24,12 +24,10 @@ import java.util.List;
|
|
|
|
|
|
import android.accounts.Account;
|
|
|
import android.app.Activity;
|
|
|
-import android.content.ActivityNotFoundException;
|
|
|
import android.content.BroadcastReceiver;
|
|
|
import android.content.Context;
|
|
|
import android.content.Intent;
|
|
|
import android.content.IntentFilter;
|
|
|
-import android.net.Uri;
|
|
|
import android.os.Bundle;
|
|
|
import android.os.Handler;
|
|
|
import android.support.v4.app.FragmentTransaction;
|
|
|
@@ -37,14 +35,12 @@ import android.view.LayoutInflater;
|
|
|
import android.view.View;
|
|
|
import android.view.View.OnClickListener;
|
|
|
import android.view.ViewGroup;
|
|
|
-import android.webkit.MimeTypeMap;
|
|
|
import android.widget.CheckBox;
|
|
|
import android.widget.ImageView;
|
|
|
import android.widget.ProgressBar;
|
|
|
import android.widget.TextView;
|
|
|
import android.widget.Toast;
|
|
|
|
|
|
-import com.actionbarsherlock.app.SherlockFragment;
|
|
|
import com.actionbarsherlock.view.Menu;
|
|
|
import com.actionbarsherlock.view.MenuInflater;
|
|
|
import com.actionbarsherlock.view.MenuItem;
|
|
|
@@ -65,7 +61,6 @@ import com.owncloud.android.operations.RenameFileOperation;
|
|
|
import com.owncloud.android.operations.SynchronizeFileOperation;
|
|
|
import com.owncloud.android.ui.activity.ConflictsResolveActivity;
|
|
|
import com.owncloud.android.ui.activity.FileActivity;
|
|
|
-import com.owncloud.android.ui.activity.FileDetailActivity;
|
|
|
import com.owncloud.android.ui.activity.FileDisplayActivity;
|
|
|
import com.owncloud.android.ui.dialog.EditNameDialog;
|
|
|
import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
|
|
|
@@ -73,7 +68,6 @@ import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
|
|
|
import com.owncloud.android.R;
|
|
|
|
|
|
import eu.alefzero.webdav.OnDatatransferProgressListener;
|
|
|
-import eu.alefzero.webdav.WebdavUtils;
|
|
|
|
|
|
|
|
|
* This Fragment is used to display the details about a file.
|
|
|
@@ -81,16 +75,14 @@ import eu.alefzero.webdav.WebdavUtils;
|
|
|
* @author Bartek Przybylski
|
|
|
* @author David A. Velasco
|
|
|
*/
|
|
|
-public class FileDetailFragment extends SherlockFragment implements
|
|
|
+public class FileDetailFragment extends FileFragment implements
|
|
|
OnClickListener,
|
|
|
- ConfirmationDialogFragment.ConfirmationDialogFragmentListener, OnRemoteOperationListener, EditNameDialogListener,
|
|
|
- FileFragment {
|
|
|
+ ConfirmationDialogFragment.ConfirmationDialogFragmentListener, OnRemoteOperationListener, EditNameDialogListener {
|
|
|
|
|
|
private FileFragment.ContainerActivity mContainerActivity;
|
|
|
|
|
|
private int mLayout;
|
|
|
private View mView;
|
|
|
- private OCFile mFile;
|
|
|
private Account mAccount;
|
|
|
private FileDataStorageManager mStorageManager;
|
|
|
|
|
|
@@ -101,7 +93,6 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
private RemoteOperation mLastRemoteOperation;
|
|
|
|
|
|
private static final String TAG = FileDetailFragment.class.getSimpleName();
|
|
|
- public static final String FTAG = "FileDetails";
|
|
|
public static final String FTAG_CONFIRMATION = "REMOVE_CONFIRMATION_FRAGMENT";
|
|
|
|
|
|
|
|
|
@@ -111,7 +102,7 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
* It's necessary to keep a public constructor without parameters; the system uses it when tries to reinstantiate a fragment automatically.
|
|
|
*/
|
|
|
public FileDetailFragment() {
|
|
|
- mFile = null;
|
|
|
+ super();
|
|
|
mAccount = null;
|
|
|
mStorageManager = null;
|
|
|
mLayout = R.layout.file_details_empty;
|
|
|
@@ -127,7 +118,7 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
* @param ocAccount An ownCloud account; needed to start downloads
|
|
|
*/
|
|
|
public FileDetailFragment(OCFile fileToDetail, Account ocAccount) {
|
|
|
- mFile = fileToDetail;
|
|
|
+ super(fileToDetail);
|
|
|
mAccount = ocAccount;
|
|
|
mStorageManager = null;
|
|
|
mLayout = R.layout.file_details_empty;
|
|
|
@@ -146,19 +137,20 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
@Override
|
|
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
|
Bundle savedInstanceState) {
|
|
|
- super.onCreateView(inflater, container, savedInstanceState);
|
|
|
+
|
|
|
|
|
|
if (savedInstanceState != null) {
|
|
|
- mFile = savedInstanceState.getParcelable(FileActivity.EXTRA_FILE);
|
|
|
+ setFile((OCFile)savedInstanceState.getParcelable(FileActivity.EXTRA_FILE));
|
|
|
mAccount = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT);
|
|
|
}
|
|
|
|
|
|
- if(mFile != null && mAccount != null) {
|
|
|
+ if(getFile() != null && mAccount != null) {
|
|
|
mLayout = R.layout.file_details_fragment;
|
|
|
}
|
|
|
|
|
|
View view = null;
|
|
|
- view = inflater.inflate(mLayout, container, false);
|
|
|
+
|
|
|
+ view = inflater.inflate(mLayout, null);
|
|
|
mView = view;
|
|
|
|
|
|
if (mLayout == R.layout.file_details_fragment) {
|
|
|
@@ -202,7 +194,7 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
@Override
|
|
|
public void onSaveInstanceState(Bundle outState) {
|
|
|
super.onSaveInstanceState(outState);
|
|
|
- outState.putParcelable(FileActivity.EXTRA_FILE, mFile);
|
|
|
+ outState.putParcelable(FileActivity.EXTRA_FILE, getFile());
|
|
|
outState.putParcelable(FileActivity.EXTRA_ACCOUNT, mAccount);
|
|
|
}
|
|
|
|
|
|
@@ -269,11 +261,12 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
|
|
|
List<Integer> toHide = new ArrayList<Integer>();
|
|
|
List<Integer> toShow = new ArrayList<Integer>();
|
|
|
+ OCFile file = getFile();
|
|
|
|
|
|
FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
|
|
|
- boolean downloading = downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile);
|
|
|
+ boolean downloading = downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file);
|
|
|
FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
|
|
|
- boolean uploading = uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile);
|
|
|
+ boolean uploading = uploaderBinder != null && uploaderBinder.isUploading(mAccount, getFile());
|
|
|
|
|
|
if (downloading || uploading) {
|
|
|
toHide.add(R.id.action_download_file);
|
|
|
@@ -288,7 +281,7 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
toShow.add(R.id.action_cancel_download);
|
|
|
}
|
|
|
|
|
|
- } else if (mFile != null && mFile.isDown()) {
|
|
|
+ } else if (file != null && file.isDown()) {
|
|
|
toHide.add(R.id.action_download_file);
|
|
|
toHide.add(R.id.action_cancel_download);
|
|
|
toHide.add(R.id.action_cancel_upload);
|
|
|
@@ -298,7 +291,7 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
toShow.add(R.id.action_open_file_with);
|
|
|
toShow.add(R.id.action_sync_file);
|
|
|
|
|
|
- } else if (mFile != null) {
|
|
|
+ } else if (file != null) {
|
|
|
toHide.add(R.id.action_open_file_with);
|
|
|
toHide.add(R.id.action_cancel_download);
|
|
|
toHide.add(R.id.action_cancel_upload);
|
|
|
@@ -344,7 +337,7 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
public boolean onOptionsItemSelected(MenuItem item) {
|
|
|
switch (item.getItemId()) {
|
|
|
case R.id.action_open_file_with: {
|
|
|
- openFile();
|
|
|
+ mContainerActivity.openFile(getFile());
|
|
|
return true;
|
|
|
}
|
|
|
case R.id.action_remove_file: {
|
|
|
@@ -386,8 +379,9 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
|
|
|
private void toggleKeepInSync() {
|
|
|
CheckBox cb = (CheckBox) getView().findViewById(R.id.fdKeepInSync);
|
|
|
- mFile.setKeepInSync(cb.isChecked());
|
|
|
- mStorageManager.saveFile(mFile);
|
|
|
+ OCFile file = getFile();
|
|
|
+ file.setKeepInSync(cb.isChecked());
|
|
|
+ mStorageManager.saveFile(file);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -397,22 +391,23 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
(cb.isChecked()?
|
|
|
FileObserverService.CMD_ADD_OBSERVED_FILE:
|
|
|
FileObserverService.CMD_DEL_OBSERVED_FILE));
|
|
|
- intent.putExtra(FileObserverService.KEY_CMD_ARG_FILE, mFile);
|
|
|
+ intent.putExtra(FileObserverService.KEY_CMD_ARG_FILE, file);
|
|
|
intent.putExtra(FileObserverService.KEY_CMD_ARG_ACCOUNT, mAccount);
|
|
|
getActivity().startService(intent);
|
|
|
|
|
|
- if (mFile.keepInSync()) {
|
|
|
+ if (file.keepInSync()) {
|
|
|
synchronizeFile();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
private void removeFile() {
|
|
|
+ OCFile file = getFile();
|
|
|
ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance(
|
|
|
R.string.confirmation_remove_alert,
|
|
|
- new String[]{mFile.getFileName()},
|
|
|
- mFile.isDown() ? R.string.confirmation_remove_remote_and_local : R.string.confirmation_remove_remote,
|
|
|
- mFile.isDown() ? R.string.confirmation_remove_local : -1,
|
|
|
+ new String[]{file.getFileName()},
|
|
|
+ file.isDown() ? R.string.confirmation_remove_remote_and_local : R.string.confirmation_remove_remote,
|
|
|
+ file.isDown() ? R.string.confirmation_remove_local : -1,
|
|
|
R.string.common_cancel);
|
|
|
confDialog.setOnConfirmationListener(this);
|
|
|
confDialog.show(getFragmentManager(), FTAG_CONFIRMATION);
|
|
|
@@ -420,116 +415,61 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
|
|
|
|
|
|
private void renameFile() {
|
|
|
- String fileName = mFile.getFileName();
|
|
|
- int extensionStart = mFile.isDirectory() ? -1 : fileName.lastIndexOf(".");
|
|
|
+ OCFile file = getFile();
|
|
|
+ String fileName = file.getFileName();
|
|
|
+ int extensionStart = file.isDirectory() ? -1 : fileName.lastIndexOf(".");
|
|
|
int selectionEnd = (extensionStart >= 0) ? extensionStart : fileName.length();
|
|
|
EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.rename_dialog_title), fileName, 0, selectionEnd, this);
|
|
|
dialog.show(getFragmentManager(), "nameeditdialog");
|
|
|
}
|
|
|
|
|
|
private void synchronizeFile() {
|
|
|
+ OCFile file = getFile();
|
|
|
FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
|
|
|
FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
|
|
|
- if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile)) {
|
|
|
- downloaderBinder.cancel(mAccount, mFile);
|
|
|
- if (mFile.isDown()) {
|
|
|
+ if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) {
|
|
|
+ downloaderBinder.cancel(mAccount, file);
|
|
|
+ if (file.isDown()) {
|
|
|
setButtonsForDown();
|
|
|
} else {
|
|
|
setButtonsForRemote();
|
|
|
}
|
|
|
|
|
|
- } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile)) {
|
|
|
- uploaderBinder.cancel(mAccount, mFile);
|
|
|
- if (!mFile.fileExists()) {
|
|
|
+ } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file)) {
|
|
|
+ uploaderBinder.cancel(mAccount, file);
|
|
|
+ if (!file.fileExists()) {
|
|
|
|
|
|
- if (getActivity() instanceof FileDisplayActivity) {
|
|
|
-
|
|
|
- FragmentTransaction transaction = getActivity().getSupportFragmentManager().beginTransaction();
|
|
|
- transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FTAG);
|
|
|
- transaction.commit();
|
|
|
- mContainerActivity.onFileStateChanged();
|
|
|
- } else {
|
|
|
- getActivity().finish();
|
|
|
- }
|
|
|
+ ((FileDisplayActivity)getActivity()).cleanSecondFragment();
|
|
|
|
|
|
- } else if (mFile.isDown()) {
|
|
|
+ } else if (file.isDown()) {
|
|
|
setButtonsForDown();
|
|
|
} else {
|
|
|
setButtonsForRemote();
|
|
|
}
|
|
|
|
|
|
} else {
|
|
|
- mLastRemoteOperation = new SynchronizeFileOperation(mFile, null, mStorageManager, mAccount, true, false, getActivity());
|
|
|
+ mLastRemoteOperation = new SynchronizeFileOperation(file, null, mStorageManager, mAccount, true, false, getActivity());
|
|
|
mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity());
|
|
|
|
|
|
|
|
|
boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;
|
|
|
- getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- * Opens mFile.
|
|
|
- */
|
|
|
- private void openFile() {
|
|
|
-
|
|
|
- String storagePath = mFile.getStoragePath();
|
|
|
- String encodedStoragePath = WebdavUtils.encodePath(storagePath);
|
|
|
- try {
|
|
|
- Intent i = new Intent(Intent.ACTION_VIEW);
|
|
|
- i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mFile.getMimetype());
|
|
|
- i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
|
|
|
- startActivity(i);
|
|
|
-
|
|
|
- } catch (Throwable t) {
|
|
|
- Log_OC.e(TAG, "Fail when trying to open with the mimeType provided from the ownCloud server: " + mFile.getMimetype());
|
|
|
- boolean toastIt = true;
|
|
|
- String mimeType = "";
|
|
|
- try {
|
|
|
- Intent i = new Intent(Intent.ACTION_VIEW);
|
|
|
- mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));
|
|
|
- if (mimeType == null || !mimeType.equals(mFile.getMimetype())) {
|
|
|
- if (mimeType != null) {
|
|
|
- i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mimeType);
|
|
|
- } else {
|
|
|
-
|
|
|
- i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), "*/*");
|
|
|
- }
|
|
|
- i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
|
|
|
- startActivity(i);
|
|
|
- toastIt = false;
|
|
|
- }
|
|
|
-
|
|
|
- } catch (IndexOutOfBoundsException e) {
|
|
|
- Log_OC.e(TAG, "Trying to find out MIME type of a file without extension: " + storagePath);
|
|
|
-
|
|
|
- } catch (ActivityNotFoundException e) {
|
|
|
- Log_OC.e(TAG, "No activity found to handle: " + storagePath + " with MIME type " + mimeType + " obtained from extension");
|
|
|
-
|
|
|
- } catch (Throwable th) {
|
|
|
- Log_OC.e(TAG, "Unexpected problem when opening: " + storagePath, th);
|
|
|
-
|
|
|
- } finally {
|
|
|
- if (toastIt) {
|
|
|
- Toast.makeText(getActivity(), "There is no application to handle file " + mFile.getFileName(), Toast.LENGTH_SHORT).show();
|
|
|
- }
|
|
|
- }
|
|
|
+ getActivity().showDialog(FileDisplayActivity.DIALOG_SHORT_WAIT);
|
|
|
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public void onConfirmation(String callerTag) {
|
|
|
+ OCFile file = getFile();
|
|
|
if (callerTag.equals(FTAG_CONFIRMATION)) {
|
|
|
- if (mStorageManager.getFileById(mFile.getFileId()) != null) {
|
|
|
- mLastRemoteOperation = new RemoveFileOperation( mFile,
|
|
|
+ if (mStorageManager.getFileById(file.getFileId()) != null) {
|
|
|
+ mLastRemoteOperation = new RemoveFileOperation( file,
|
|
|
true,
|
|
|
mStorageManager);
|
|
|
mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity());
|
|
|
|
|
|
boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;
|
|
|
- getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);
|
|
|
+ getActivity().showDialog(FileDisplayActivity.DIALOG_SHORT_WAIT);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -537,11 +477,12 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
@Override
|
|
|
public void onNeutral(String callerTag) {
|
|
|
File f = null;
|
|
|
- if (mFile.isDown() && (f = new File(mFile.getStoragePath())).exists()) {
|
|
|
+ OCFile file = getFile();
|
|
|
+ if (file.isDown() && (f = new File(file.getStoragePath())).exists()) {
|
|
|
f.delete();
|
|
|
- mFile.setStoragePath(null);
|
|
|
- mStorageManager.saveFile(mFile);
|
|
|
- updateFileDetails(mFile, mAccount);
|
|
|
+ file.setStoragePath(null);
|
|
|
+ mStorageManager.saveFile(file);
|
|
|
+ updateFileDetails(file, mAccount);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -557,24 +498,17 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
* @return True when the fragment was created with the empty layout.
|
|
|
*/
|
|
|
public boolean isEmpty() {
|
|
|
- return (mLayout == R.layout.file_details_empty || mFile == null || mAccount == null);
|
|
|
+ return (mLayout == R.layout.file_details_empty || getFile() == null || mAccount == null);
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
- * {@inheritDoc}
|
|
|
- */
|
|
|
- public OCFile getFile(){
|
|
|
- return mFile;
|
|
|
- }
|
|
|
-
|
|
|
|
|
|
* Use this method to signal this Activity that it shall update its view.
|
|
|
*
|
|
|
* @param file : An {@link OCFile}
|
|
|
*/
|
|
|
public void updateFileDetails(OCFile file, Account ocAccount) {
|
|
|
- mFile = file;
|
|
|
+ setFile(file);
|
|
|
if (ocAccount != null && (
|
|
|
mStorageManager == null ||
|
|
|
(mAccount != null && !mAccount.equals(ocAccount))
|
|
|
@@ -603,30 +537,31 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
if (readyToShow()) {
|
|
|
|
|
|
if (refresh && mStorageManager != null) {
|
|
|
- mFile = mStorageManager.getFileByPath(mFile.getRemotePath());
|
|
|
+ setFile(mStorageManager.getFileByPath(getFile().getRemotePath()));
|
|
|
}
|
|
|
+ OCFile file = getFile();
|
|
|
|
|
|
|
|
|
- setFilename(mFile.getFileName());
|
|
|
- setFiletype(mFile.getMimetype());
|
|
|
- setFilesize(mFile.getFileLength());
|
|
|
+ setFilename(file.getFileName());
|
|
|
+ setFiletype(file.getMimetype());
|
|
|
+ setFilesize(file.getFileLength());
|
|
|
if(ocVersionSupportsTimeCreated()){
|
|
|
- setTimeCreated(mFile.getCreationTimestamp());
|
|
|
+ setTimeCreated(file.getCreationTimestamp());
|
|
|
}
|
|
|
|
|
|
- setTimeModified(mFile.getModificationTimestamp());
|
|
|
+ setTimeModified(file.getModificationTimestamp());
|
|
|
|
|
|
CheckBox cb = (CheckBox)getView().findViewById(R.id.fdKeepInSync);
|
|
|
- cb.setChecked(mFile.keepInSync());
|
|
|
+ cb.setChecked(file.keepInSync());
|
|
|
|
|
|
|
|
|
|
|
|
FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
|
|
|
FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
|
|
|
- if (transferring || (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile)) || (uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile))) {
|
|
|
+ if (transferring || (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) || (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file))) {
|
|
|
setButtonsForTransferring();
|
|
|
|
|
|
- } else if (mFile.isDown()) {
|
|
|
+ } else if (file.isDown()) {
|
|
|
|
|
|
setButtonsForDown();
|
|
|
|
|
|
@@ -644,7 +579,7 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
* @return 'True' when the fragment is ready to show details of a file
|
|
|
*/
|
|
|
private boolean readyToShow() {
|
|
|
- return (mFile != null && mAccount != null && mLayout == R.layout.file_details_fragment);
|
|
|
+ return (getFile() != null && mAccount != null && mLayout == R.layout.file_details_fragment);
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -723,9 +658,9 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
progressText.setVisibility(View.VISIBLE);
|
|
|
FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
|
|
|
FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
|
|
|
- if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile)) {
|
|
|
+ if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, getFile())) {
|
|
|
progressText.setText(R.string.downloader_download_in_progress_ticker);
|
|
|
- } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile)) {
|
|
|
+ } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, getFile())) {
|
|
|
progressText.setText(R.string.uploader_upload_in_progress_ticker);
|
|
|
}
|
|
|
}
|
|
|
@@ -798,11 +733,11 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
if (!isEmpty() && accountName.equals(mAccount.name)) {
|
|
|
boolean uploadWasFine = intent.getBooleanExtra(FileUploader.EXTRA_UPLOAD_RESULT, false);
|
|
|
String uploadRemotePath = intent.getStringExtra(FileUploader.EXTRA_REMOTE_PATH);
|
|
|
- boolean renamedInUpload = mFile.getRemotePath().equals(intent.getStringExtra(FileUploader.EXTRA_OLD_REMOTE_PATH));
|
|
|
- if (mFile.getRemotePath().equals(uploadRemotePath) ||
|
|
|
+ boolean renamedInUpload = getFile().getRemotePath().equals(intent.getStringExtra(FileUploader.EXTRA_OLD_REMOTE_PATH));
|
|
|
+ if (getFile().getRemotePath().equals(uploadRemotePath) ||
|
|
|
renamedInUpload) {
|
|
|
if (uploadWasFine) {
|
|
|
- mFile = mStorageManager.getFileByPath(uploadRemotePath);
|
|
|
+ setFile(mStorageManager.getFileByPath(uploadRemotePath));
|
|
|
}
|
|
|
if (renamedInUpload) {
|
|
|
String newName = (new File(uploadRemotePath)).getName();
|
|
|
@@ -821,13 +756,13 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
if (dialog.getResult()) {
|
|
|
String newFilename = dialog.getNewFilename();
|
|
|
Log_OC.d(TAG, "name edit dialog dismissed with new name " + newFilename);
|
|
|
- mLastRemoteOperation = new RenameFileOperation( mFile,
|
|
|
+ mLastRemoteOperation = new RenameFileOperation( getFile(),
|
|
|
mAccount,
|
|
|
newFilename,
|
|
|
new FileDataStorageManager(mAccount, getActivity().getContentResolver()));
|
|
|
mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity());
|
|
|
boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;
|
|
|
- getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);
|
|
|
+ getActivity().showDialog(FileDisplayActivity.DIALOG_SHORT_WAIT);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -852,22 +787,13 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
|
|
|
|
|
|
private void onRemoveFileOperationFinish(RemoveFileOperation operation, RemoteOperationResult result) {
|
|
|
- boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;
|
|
|
- getActivity().dismissDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);
|
|
|
+ getActivity().dismissDialog(FileDisplayActivity.DIALOG_SHORT_WAIT);
|
|
|
|
|
|
if (result.isSuccess()) {
|
|
|
Toast msg = Toast.makeText(getActivity().getApplicationContext(), R.string.remove_success_msg, Toast.LENGTH_LONG);
|
|
|
msg.show();
|
|
|
- if (inDisplayActivity) {
|
|
|
-
|
|
|
- FragmentTransaction transaction = getActivity().getSupportFragmentManager().beginTransaction();
|
|
|
- transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null));
|
|
|
- transaction.commit();
|
|
|
- mContainerActivity.onFileStateChanged();
|
|
|
- } else {
|
|
|
- getActivity().finish();
|
|
|
- }
|
|
|
-
|
|
|
+ ((FileDisplayActivity)getActivity()).cleanSecondFragment();
|
|
|
+
|
|
|
} else {
|
|
|
Toast msg = Toast.makeText(getActivity(), R.string.remove_fail_msg, Toast.LENGTH_LONG);
|
|
|
msg.show();
|
|
|
@@ -878,8 +804,7 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
}
|
|
|
|
|
|
private void onRenameFileOperationFinish(RenameFileOperation operation, RemoteOperationResult result) {
|
|
|
- boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;
|
|
|
- getActivity().dismissDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);
|
|
|
+ getActivity().dismissDialog(FileDisplayActivity.DIALOG_SHORT_WAIT);
|
|
|
|
|
|
if (result.isSuccess()) {
|
|
|
updateFileDetails(((RenameFileOperation)operation).getFile(), mAccount);
|
|
|
@@ -901,13 +826,12 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
}
|
|
|
|
|
|
private void onSynchronizeFileOperationFinish(SynchronizeFileOperation operation, RemoteOperationResult result) {
|
|
|
- boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;
|
|
|
- getActivity().dismissDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);
|
|
|
-
|
|
|
+ getActivity().dismissDialog(FileDisplayActivity.DIALOG_SHORT_WAIT);
|
|
|
+ OCFile file = getFile();
|
|
|
if (!result.isSuccess()) {
|
|
|
if (result.getCode() == ResultCode.SYNC_CONFLICT) {
|
|
|
Intent i = new Intent(getActivity(), ConflictsResolveActivity.class);
|
|
|
- i.putExtra(ConflictsResolveActivity.EXTRA_FILE, mFile);
|
|
|
+ i.putExtra(ConflictsResolveActivity.EXTRA_FILE, file);
|
|
|
i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, mAccount);
|
|
|
startActivity(i);
|
|
|
|
|
|
@@ -916,7 +840,7 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
msg.show();
|
|
|
}
|
|
|
|
|
|
- if (mFile.isDown()) {
|
|
|
+ if (file.isDown()) {
|
|
|
setButtonsForDown();
|
|
|
|
|
|
} else {
|
|
|
@@ -931,7 +855,7 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
} else {
|
|
|
Toast msg = Toast.makeText(getActivity(), R.string.sync_file_nothing_to_do_msg, Toast.LENGTH_LONG);
|
|
|
msg.show();
|
|
|
- if (mFile.isDown()) {
|
|
|
+ if (file.isDown()) {
|
|
|
setButtonsForDown();
|
|
|
|
|
|
} else {
|
|
|
@@ -945,10 +869,10 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
public void listenForTransferProgress() {
|
|
|
if (mProgressListener != null) {
|
|
|
if (mContainerActivity.getFileDownloaderBinder() != null) {
|
|
|
- mContainerActivity.getFileDownloaderBinder().addDatatransferProgressListener(mProgressListener, mAccount, mFile);
|
|
|
+ mContainerActivity.getFileDownloaderBinder().addDatatransferProgressListener(mProgressListener, mAccount, getFile());
|
|
|
}
|
|
|
if (mContainerActivity.getFileUploaderBinder() != null) {
|
|
|
- mContainerActivity.getFileUploaderBinder().addDatatransferProgressListener(mProgressListener, mAccount, mFile);
|
|
|
+ mContainerActivity.getFileUploaderBinder().addDatatransferProgressListener(mProgressListener, mAccount, getFile());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -957,10 +881,10 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
public void leaveTransferProgress() {
|
|
|
if (mProgressListener != null) {
|
|
|
if (mContainerActivity.getFileDownloaderBinder() != null) {
|
|
|
- mContainerActivity.getFileDownloaderBinder().removeDatatransferProgressListener(mProgressListener, mAccount, mFile);
|
|
|
+ mContainerActivity.getFileDownloaderBinder().removeDatatransferProgressListener(mProgressListener, mAccount, getFile());
|
|
|
}
|
|
|
if (mContainerActivity.getFileUploaderBinder() != null) {
|
|
|
- mContainerActivity.getFileUploaderBinder().removeDatatransferProgressListener(mProgressListener, mAccount, mFile);
|
|
|
+ mContainerActivity.getFileUploaderBinder().removeDatatransferProgressListener(mProgressListener, mAccount, getFile());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1000,110 +924,4 @@ public class FileDetailFragment extends SherlockFragment implements
|
|
|
|
|
|
};
|
|
|
|
|
|
-
|
|
|
-
|
|
|
- @SuppressWarnings("unused")
|
|
|
- private class ShareRunnable implements Runnable {
|
|
|
- private String mPath;
|
|
|
-
|
|
|
- public ShareRunnable(String path) {
|
|
|
- mPath = path;
|
|
|
- }
|
|
|
-
|
|
|
- public void run() {
|
|
|
- AccountManager am = AccountManager.get(getActivity());
|
|
|
- Account account = AccountUtils.getCurrentOwnCloudAccount(getActivity());
|
|
|
- OwnCloudVersion ocv = new OwnCloudVersion(am.getUserData(account, AccountAuthenticator.KEY_OC_VERSION));
|
|
|
- String url = am.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL) + AccountUtils.getWebdavPath(ocv);
|
|
|
-
|
|
|
- Log_OC.d("share", "sharing for version " + ocv.toString());
|
|
|
-
|
|
|
- if (ocv.compareTo(new OwnCloudVersion(0x040000)) >= 0) {
|
|
|
- String APPS_PATH = "/apps/files_sharing/";
|
|
|
- String SHARE_PATH = "ajax/share.php";
|
|
|
-
|
|
|
- String SHARED_PATH = "/apps/files_sharing/get.php?token=";
|
|
|
-
|
|
|
- final String WEBDAV_SCRIPT = "webdav.php";
|
|
|
- final String WEBDAV_FILES_LOCATION = "/files/";
|
|
|
-
|
|
|
- WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(account, getActivity().getApplicationContext());
|
|
|
- HttpConnectionManagerParams params = new HttpConnectionManagerParams();
|
|
|
- params.setMaxConnectionsPerHost(wc.getHostConfiguration(), 5);
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- PostMethod post = new PostMethod(am.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL) + APPS_PATH + SHARE_PATH);
|
|
|
-
|
|
|
- post.addRequestHeader("Content-type","application/x-www-form-urlencoded; charset=UTF-8" );
|
|
|
- post.addRequestHeader("Referer", am.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL));
|
|
|
- List<NameValuePair> formparams = new ArrayList<NameValuePair>();
|
|
|
- Log_OC.d("share", mPath+"");
|
|
|
- formparams.add(new BasicNameValuePair("sources",mPath));
|
|
|
- formparams.add(new BasicNameValuePair("uid_shared_with", "public"));
|
|
|
- formparams.add(new BasicNameValuePair("permissions", "0"));
|
|
|
- post.setRequestEntity(new StringRequestEntity(URLEncodedUtils.format(formparams, HTTP.UTF_8)));
|
|
|
-
|
|
|
- int status;
|
|
|
- try {
|
|
|
- PropFindMethod find = new PropFindMethod(url+"/");
|
|
|
- find.addRequestHeader("Referer", am.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL));
|
|
|
- Log_OC.d("sharer", ""+ url+"/");
|
|
|
-
|
|
|
- for (org.apache.commons.httpclient.Header a : find.getRequestHeaders()) {
|
|
|
- Log_OC.d("sharer-h", a.getName() + ":"+a.getValue());
|
|
|
- }
|
|
|
-
|
|
|
- int status2 = wc.executeMethod(find);
|
|
|
-
|
|
|
- Log_OC.d("sharer", "propstatus "+status2);
|
|
|
-
|
|
|
- GetMethod get = new GetMethod(am.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL) + "/");
|
|
|
- get.addRequestHeader("Referer", am.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL));
|
|
|
-
|
|
|
- status2 = wc.executeMethod(get);
|
|
|
-
|
|
|
- Log_OC.d("sharer", "getstatus "+status2);
|
|
|
- Log_OC.d("sharer", "" + get.getResponseBodyAsString());
|
|
|
-
|
|
|
- for (org.apache.commons.httpclient.Header a : get.getResponseHeaders()) {
|
|
|
- Log_OC.d("sharer", a.getName() + ":"+a.getValue());
|
|
|
- }
|
|
|
-
|
|
|
- status = wc.executeMethod(post);
|
|
|
- for (org.apache.commons.httpclient.Header a : post.getRequestHeaders()) {
|
|
|
- Log_OC.d("sharer-h", a.getName() + ":"+a.getValue());
|
|
|
- }
|
|
|
- for (org.apache.commons.httpclient.Header a : post.getResponseHeaders()) {
|
|
|
- Log_OC.d("sharer", a.getName() + ":"+a.getValue());
|
|
|
- }
|
|
|
- String resp = post.getResponseBodyAsString();
|
|
|
- Log_OC.d("share", ""+post.getURI().toString());
|
|
|
- Log_OC.d("share", "returned status " + status);
|
|
|
- Log_OC.d("share", " " +resp);
|
|
|
-
|
|
|
- if(status != HttpStatus.SC_OK ||resp == null || resp.equals("") || resp.startsWith("false")) {
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- JSONObject jsonObject = new JSONObject (resp);
|
|
|
- String jsonStatus = jsonObject.getString("status");
|
|
|
- if(!jsonStatus.equals("success")) throw new Exception("Error while sharing file status != success");
|
|
|
-
|
|
|
- String token = jsonObject.getString("data");
|
|
|
- String uri = am.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL) + SHARED_PATH + token;
|
|
|
- Log_OC.d("Actions:shareFile ok", "url: " + uri);
|
|
|
-
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
-
|
|
|
- } else if (ocv.compareTo(new OwnCloudVersion(0x030000)) >= 0) {
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- */
|
|
|
-
|
|
|
}
|
masensio
