mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

OC-2822: Loading progress dialog while share link is being created. Fix a problem when the app for sharing is not selected

Browse source
This commit is contained in:
masensio 2014-02-05 10:18:46 +01:00
parent 173c810cc1
commit 046a566ed4
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/owncloud/android/files/FileOperationsHelper.java
View file

@ -33,6 +33,7 @@ import com.owncloud.android.lib.network.webdav.WebdavUtils;
import com.owncloud.android.lib.operations.common.ShareType; import com.owncloud.android.lib.operations.common.ShareType;
import com.owncloud.android.operations.CreateShareOperation; import com.owncloud.android.operations.CreateShareOperation;
import com.owncloud.android.ui.activity.FileActivity; 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.ui.dialog.ActivityChooserDialog;
import com.owncloud.android.utils.Log_OC; import com.owncloud.android.utils.Log_OC;
@ -107,6 +108,7 @@ public class FileOperationsHelper {
public void shareFileWithLinkToApp(OCFile file, Intent sendIntent, FileActivity callerActivity) { public void shareFileWithLinkToApp(OCFile file, Intent sendIntent, FileActivity callerActivity) {
if (file != null) { if (file != null) {
((FileDisplayActivity) callerActivity).showLoadingDialog();
CreateShareOperation createShare = new CreateShareOperation(file.getRemotePath(), ShareType.PUBLIC_LINK, "", false, "", 1, sendIntent); CreateShareOperation createShare = new CreateShareOperation(file.getRemotePath(), ShareType.PUBLIC_LINK, "", false, "", 1, sendIntent);
createShare.execute(callerActivity.getStorageManager(), createShare.execute(callerActivity.getStorageManager(),
callerActivity, callerActivity,

1
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
View file

@ -337,7 +337,6 @@ public class FileDetailFragment extends FileFragment implements
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.action_share_file: { case R.id.action_share_file: {
FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity(); FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
activity.showLoadingDialog();
activity.getFileOperationsHelper().shareFileWithLink(getFile(), activity); activity.getFileOperationsHelper().shareFileWithLink(getFile(), activity);
return true; return true;
} }

1
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -285,7 +285,6 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.action_share_file: { case R.id.action_share_file: {
FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity(); FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
activity.showLoadingDialog();
activity.getFileOperationsHelper().shareFileWithLink(mTargetFile, activity); activity.getFileOperationsHelper().shareFileWithLink(mTargetFile, activity);
return true; return true;
} }