Add OPERATION_UNPACK constant (f8aa9f65) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/services/FileOperation.java

+44 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static com.android.documentsui.services.FileOperationService.OPERATION_CO
		import static com.android.documentsui.services.FileOperationService.OPERATION_COPY;
		import static com.android.documentsui.services.FileOperationService.OPERATION_DELETE;
		import static com.android.documentsui.services.FileOperationService.OPERATION_EXTRACT;
		import static com.android.documentsui.services.FileOperationService.OPERATION_UNPACK;
		import static com.android.documentsui.services.FileOperationService.OPERATION_MOVE;
		import static com.android.documentsui.services.FileOperationService.OPERATION_UNKNOWN;

		@@ -245,6 +246,47 @@ public abstract class FileOperation implements Parcelable {
		};
		}

		public static class UnpackOperation extends FileOperation {
		private UnpackOperation(UrisSupplier srcs, DocumentStack destination) {
		super(OPERATION_UNPACK, srcs, destination);
		}

		@Override
		public String toString() {
		StringBuilder builder = new StringBuilder();

		builder.append("UnpackOperation{");
		super.appendInfoTo(builder);
		builder.append("}");

		return builder.toString();
		}

		// TODO: Implement
		@Override
		Job createJob(Context service, Job.Listener listener, String id, Features features) {
		throw new UnsupportedOperationException();
		}

		private UnpackOperation(Parcel in) {
		super(in);
		}

		public static final Parcelable.Creator<UnpackOperation> CREATOR =
		new Parcelable.Creator<UnpackOperation>() {

		@Override
		public UnpackOperation createFromParcel(Parcel source) {
		return new UnpackOperation(source);
		}

		@Override
		public UnpackOperation[] newArray(int size) {
		return new UnpackOperation[size];
		}
		};
		}

		public static class MoveDeleteOperation extends FileOperation {
		private final @Nullable Uri mSrcParent;

		@@ -346,6 +388,8 @@ public abstract class FileOperation implements Parcelable {
		case OPERATION_MOVE:
		case OPERATION_DELETE:
		return new MoveDeleteOperation(mOpType, mSrcs, mDestination, mSrcParent);
		case OPERATION_UNPACK:
		return new UnpackOperation(mSrcs, mDestination);
		default:
		throw new UnsupportedOperationException("Unsupported op type: " + mOpType);
		}

src/com/android/documentsui/services/FileOperationService.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,8 @@ public class FileOperationService extends Service implements Job.Listener {
		OPERATION_COMPRESS,
		OPERATION_EXTRACT,
		OPERATION_MOVE,
		OPERATION_DELETE
		OPERATION_DELETE,
		OPERATION_UNPACK,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface OpType {}
		@@ -87,6 +88,7 @@ public class FileOperationService extends Service implements Job.Listener {
		public static final int OPERATION_COMPRESS = 3;
		public static final int OPERATION_MOVE = 4;
		public static final int OPERATION_DELETE = 5;
		public static final int OPERATION_UNPACK = 6;

		@IntDef({
		MESSAGE_PROGRESS,
		@@ -324,6 +326,7 @@ public class FileOperationService extends Service implements Job.Listener {
		case OPERATION_COMPRESS:
		case OPERATION_EXTRACT:
		case OPERATION_MOVE:
		case OPERATION_UNPACK:
		return executor;
		case OPERATION_DELETE:
		return deletionExecutor;

src/com/android/documentsui/ui/DialogController.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,7 @@ public interface DialogController {
		Snackbars.showCompress(mActivity, docCount);
		break;
		case FileOperationService.OPERATION_EXTRACT:
		case FileOperationService.OPERATION_UNPACK:
		Snackbars.showExtract(mActivity, docCount);
		break;
		case FileOperationService.OPERATION_DELETE:

src/com/android/documentsui/ui/MessageBuilder.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -15,22 +15,22 @@
		*/
		package com.android.documentsui.ui;

		import androidx.annotation.PluralsRes;
		import static com.android.documentsui.OperationDialogFragment.DIALOG_TYPE_CONVERTED;
		import static com.android.documentsui.OperationDialogFragment.DIALOG_TYPE_FAILURE;

		import android.content.Context;
		import android.text.BidiFormatter;
		import android.net.Uri;
		import android.text.BidiFormatter;
		import android.text.Html;

		import androidx.annotation.PluralsRes;

		import com.android.documentsui.OperationDialogFragment.DialogType;
		import com.android.documentsui.R;
		import com.android.documentsui.base.DocumentInfo;
		import com.android.documentsui.base.Shared;
		import com.android.documentsui.services.FileOperationService;
		import com.android.documentsui.services.FileOperationService.OpType;
		import com.android.documentsui.OperationDialogFragment.DialogType;

		import static com.android.documentsui.OperationDialogFragment.DIALOG_TYPE_FAILURE;
		import static com.android.documentsui.OperationDialogFragment.DIALOG_TYPE_CONVERTED;

		import java.util.List;

		@@ -98,6 +98,7 @@ public class MessageBuilder {
		resourceId = R.plurals.compress_failure_alert_content;
		break;
		case FileOperationService.OPERATION_EXTRACT:
		case FileOperationService.OPERATION_UNPACK:
		resourceId = R.plurals.extract_failure_alert_content;
		break;
		case FileOperationService.OPERATION_DELETE:

src/com/android/documentsui/ui/OperationProgressDialog.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import android.app.Activity;
		import android.app.ProgressDialog;
		import android.os.Handler;
		import android.os.Message;
		import android.text.format.DateUtils;

		import androidx.annotation.StringRes;

		@@ -98,6 +97,7 @@ public class OperationProgressDialog {
		prepareResId = R.string.compress_preparing;
		break;
		case FileOperationService.OPERATION_EXTRACT:
		case FileOperationService.OPERATION_UNPACK:
		titleResId = R.string.extract_notification_title;
		prepareResId = R.string.extract_preparing;
		break;