projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[tx-robot] updated from transifex
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
ui
/
fragment
/
FileDetailFragment.java
diff --git
a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index
888261a
..
af29cff
100644
(file)
--- a/
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@
-186,6
+186,10
@@
public class FileDetailFragment extends FileFragment implements
super.onActivityCreated(savedInstanceState);
if (mAccount != null) {
mStorageManager = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());
super.onActivityCreated(savedInstanceState);
if (mAccount != null) {
mStorageManager = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());
+ OCFile file = mStorageManager.getFileByPath(getFile().getRemotePath());
+ if (file != null) {
+ setFile(file);
+ }
}
}
}
}
@@
-310,7
+314,14
@@
public class FileDetailFragment extends FileFragment implements
toHide.add(R.id.action_remove_file);
}
toHide.add(R.id.action_remove_file);
}
-
+
+ // Options shareLink
+ if (!file.isShareByLink()) {
+ toHide.add(R.id.action_unshare_file);
+ } else {
+ toShow.add(R.id.action_unshare_file);
+ }
+
MenuItem item = null;
for (int i : toHide) {
item = menu.findItem(i);
MenuItem item = null;
for (int i : toHide) {
item = menu.findItem(i);
@@
-340,6
+351,11
@@
public class FileDetailFragment extends FileFragment implements
activity.getFileOperationsHelper().shareFileWithLink(getFile(), activity);
return true;
}
activity.getFileOperationsHelper().shareFileWithLink(getFile(), activity);
return true;
}
+ case R.id.action_unshare_file: {
+ FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
+ activity.getFileOperationsHelper().unshareFileWithLink(getFile(), activity);
+ return true;
+ }
case R.id.action_open_file_with: {
FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
activity.getFileOperationsHelper().openFile(getFile(), activity);
case R.id.action_open_file_with: {
FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
activity.getFileOperationsHelper().openFile(getFile(), activity);