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 (from parent 1:
173c810
)
OC-2822: Loading progress dialog while share link is being created. Fix a problem...
author
masensio
<masensio@solidgear.es>
Wed, 5 Feb 2014 09:18:46 +0000
(10:18 +0100)
committer
masensio
<masensio@solidgear.es>
Wed, 5 Feb 2014 09:18:46 +0000
(10:18 +0100)
src/com/owncloud/android/files/FileOperationsHelper.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/files/FileOperationsHelper.java
b/src/com/owncloud/android/files/FileOperationsHelper.java
index
41e7110
..
2c42537
100644
(file)
--- a/
src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/
src/com/owncloud/android/files/FileOperationsHelper.java
@@
-33,6
+33,7
@@
import com.owncloud.android.lib.network.webdav.WebdavUtils;
import com.owncloud.android.lib.operations.common.ShareType;
import com.owncloud.android.operations.CreateShareOperation;
import com.owncloud.android.ui.activity.FileActivity;
import com.owncloud.android.lib.operations.common.ShareType;
import com.owncloud.android.operations.CreateShareOperation;
import com.owncloud.android.ui.activity.FileActivity;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
import com.owncloud.android.ui.dialog.ActivityChooserDialog;
import com.owncloud.android.utils.Log_OC;
import com.owncloud.android.ui.dialog.ActivityChooserDialog;
import com.owncloud.android.utils.Log_OC;
@@
-107,6
+108,7
@@
public class FileOperationsHelper {
public void shareFileWithLinkToApp(OCFile file, Intent sendIntent, FileActivity callerActivity) {
if (file != null) {
public void shareFileWithLinkToApp(OCFile file, Intent sendIntent, FileActivity callerActivity) {
if (file != null) {
+ ((FileDisplayActivity) callerActivity).showLoadingDialog();
CreateShareOperation createShare = new CreateShareOperation(file.getRemotePath(), ShareType.PUBLIC_LINK, "", false, "", 1, sendIntent);
createShare.execute(callerActivity.getStorageManager(),
callerActivity,
CreateShareOperation createShare = new CreateShareOperation(file.getRemotePath(), ShareType.PUBLIC_LINK, "", false, "", 1, sendIntent);
createShare.execute(callerActivity.getStorageManager(),
callerActivity,
diff --git
a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index
acc5d63
..
216ccee
100644
(file)
--- a/
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@
-337,7
+337,6
@@
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
d96739b
..
96aa2dc
100644
(file)
--- a/
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@
-285,7
+285,6
@@
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;
}