projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e2af381
)
OC-2822: Add 'loading' progress dialog while the share link is being created
author
masensio
<masensio@solidgear.es>
Wed, 5 Feb 2014 08:13:31 +0000
(09:13 +0100)
committer
masensio
<masensio@solidgear.es>
Wed, 5 Feb 2014 08:13:31 +0000
(09:13 +0100)
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
patch
|
blob
|
blame
|
history
diff --git
a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index
4647d5f
..
137e529
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@
-1338,7
+1338,7
@@
OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
private void onCreateShareOperationFinish(CreateShareOperation operation, RemoteOperationResult result) {
private void onCreateShareOperationFinish(CreateShareOperation operation, RemoteOperationResult result) {
-
+ dismissLoadingDialog();
if (result.isSuccess()) {
refeshListOfFilesFragment();
if (result.isSuccess()) {
refeshListOfFilesFragment();
diff --git
a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index
216ccee
..
acc5d63
100644
(file)
--- a/
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@
-337,6
+337,7
@@
public class FileDetailFragment extends FileFragment implements
switch (item.getItemId()) {
case R.id.action_share_file: {
FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
switch (item.getItemId()) {
case R.id.action_share_file: {
FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
+ activity.showLoadingDialog();
activity.getFileOperationsHelper().shareFileWithLink(getFile(), activity);
return true;
}
activity.getFileOperationsHelper().shareFileWithLink(getFile(), activity);
return true;
}
diff --git
a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index
96aa2dc
..
d96739b
100644
(file)
--- a/
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@
-285,6
+285,7
@@
public class OCFileListFragment extends ExtendedListFragment implements EditName
switch (item.getItemId()) {
case R.id.action_share_file: {
FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
switch (item.getItemId()) {
case R.id.action_share_file: {
FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
+ activity.showLoadingDialog();
activity.getFileOperationsHelper().shareFileWithLink(mTargetFile, activity);
return true;
}
activity.getFileOperationsHelper().shareFileWithLink(mTargetFile, activity);
return true;
}