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

Show waiting dialog when receiving external files

Browse source
This commit is contained in:
jabarros 2016-05-19 12:54:27 +02:00 committed by David A. Velasco
parent 1a18ca4186
commit e0ec383fe4
3 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

@ -37,14 +37,12 @@ import android.content.SharedPreferences;
import android.content.SyncRequest;
import android.content.pm.PackageManager;
import android.content.res.Resources.NotFoundException;
import android.database.Cursor;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.IBinder;
import android.os.Parcelable;
import android.preference.PreferenceManager;
import android.provider.OpenableColumns;
import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
@ -94,11 +92,9 @@ import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.ErrorMessageAdapter;
import com.owncloud.android.utils.FileStorageUtils;
import com.owncloud.android.utils.PermissionUtil;
import com.owncloud.android.utils.UriUtils;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
/**
* Displays, what files the user has available in his ownCloud. This is the main view.
@ -751,7 +747,8 @@ public class FileDisplayActivity extends HookActivity
mStreamsToUpload,
remotePath,
getAccount(),
behaviour);
behaviour,
false);
uploader.uploadUris();

5
src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
View file

@ -479,7 +479,8 @@ public class ReceiveExternalFilesActivity extends FileActivity
mStreamsToUpload,
mUploadPath,
getAccount(),
FileUploader.LOCAL_BEHAVIOUR_FORGET);
FileUploader.LOCAL_BEHAVIOUR_FORGET,
true);
UriUploader.UriUploaderResultCode resultCode = uploader.uploadUris();
@ -826,7 +827,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
*/
@Override
public void onTmpFilesCopied(ResultCode result) {
dismissWaitingCopyDialog();
dismissLoadingDialog();
finish();
}

35
src/com/owncloud/android/ui/helpers/UriUploader.java
View file

@ -27,9 +27,9 @@ import android.os.Parcelable;
import com.owncloud.android.R;
import com.owncloud.android.db.PreferenceManager;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.operations.UploadFileOperation;
import com.owncloud.android.ui.activity.FileActivity;
import com.owncloud.android.ui.activity.ReceiveExternalFilesActivity;
import com.owncloud.android.ui.asynctasks.CopyAndUploadContentUrisTask;
import com.owncloud.android.utils.DisplayUtils;
@ -39,18 +39,18 @@ import java.util.ArrayList;
import java.util.List;
public class UriUploader implements
CopyAndUploadContentUrisTask.OnCopyTmpFilesTaskListener {
public class UriUploader {
private final String TAG = UriUploader.class.getSimpleName();
private Activity mActivity;
private FileActivity mActivity;
private ArrayList<Parcelable> mUrisToUpload;
private int mBehaviour;
private String mUploadPath;
private Account mAccount;
private boolean mShowWaitingDialog;
private UriUploaderResultCode mCode = UriUploaderResultCode.OK;
@ -62,17 +62,19 @@ public class UriUploader implements
}
public UriUploader(
Activity context,
FileActivity activity,
ArrayList<Parcelable> uris,
String uploadPath,
Account account,
int behaviour
int behaviour,
boolean showWaitingDialog
) {
mActivity = context;
mActivity = activity;
mUrisToUpload = uris;
mUploadPath = uploadPath;
mAccount = account;
mBehaviour = behaviour;
mShowWaitingDialog = showWaitingDialog;
}
public void setBehaviour(int behaviour) {
@ -170,11 +172,13 @@ public class UriUploader implements
* @param remotePaths Array of absolute paths to set to the uploaded files
*/
private void copyThenUpload(Uri[] sourceUris, String[] remotePaths) {
if (mActivity instanceof ReceiveExternalFilesActivity) {
((ReceiveExternalFilesActivity) mActivity).showWaitingCopyDialog();
if (mShowWaitingDialog) {
mActivity.showLoadingDialog(mActivity.getResources().
getString(R.string.wait_for_tmp_copy_from_private_storage));
}
CopyAndUploadContentUrisTask copyTask = new CopyAndUploadContentUrisTask(this, mActivity);
CopyAndUploadContentUrisTask copyTask = new CopyAndUploadContentUrisTask
((CopyAndUploadContentUrisTask.OnCopyTmpFilesTaskListener)mActivity, mActivity);
copyTask.execute(
CopyAndUploadContentUrisTask.makeParamsToExecute(
@ -186,14 +190,5 @@ public class UriUploader implements
);
}
/**
* Process the result of CopyAndUploadContentUrisTask
*/
@Override
public void onTmpFilesCopied(RemoteOperationResult.ResultCode result) {
if (mActivity instanceof ReceiveExternalFilesActivity) {
((ReceiveExternalFilesActivity) mActivity).dismissWaitingCopyDialog();
mActivity.finish();
}
}
}