Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03ef87dd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix crashing converted files warning dialog."

parents 3ac7e556 d573c7db

src/com/android/documentsui/OperationDialogFragment.java

+5 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class OperationDialogFragment extends DialogFragment { 
            FragmentManager fm,

            @DialogType int dialogType,

            ArrayList<DocumentInfo> failedSrcList,

            ArrayList<DocumentInfo> uriList,

            ArrayList<Uri> uriList,

            DocumentStack dstStack,

            @OpType int operationType) {
@@ -127,9 +127,11 @@ public class OperationDialogFragment extends DialogFragment { 
        for (DocumentInfo documentInfo : docList) {

            list.append("&#8226; " + Html.escapeHtml(documentInfo.displayName) + "<br>");

        }

        if (uriList != null) {

            for (Uri uri : uriList) {

                list.append("&#8226; " + uri.toSafeString() + "<br>");

            }

        }

        list.append("</p>");



        builder.setMessage(Html.fromHtml(String.format(messageFormat, list.toString())));

src/com/android/documentsui/files/FilesActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public class FilesActivity extends BaseActivity implements ActionHandler.Addons 
                    FileOperationService.OPERATION_COPY);

            final ArrayList<DocumentInfo> docList =

                    intent.getParcelableArrayListExtra(FileOperationService.EXTRA_FAILED_DOCS);

            final ArrayList<DocumentInfo> uriList =

            final ArrayList<Uri> uriList =

                    intent.getParcelableArrayListExtra(FileOperationService.EXTRA_FAILED_URIS);

            OperationDialogFragment.show(

                    getFragmentManager(),

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

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static com.android.documentsui.base.DocumentInfo.getCursorString; 
import static com.android.documentsui.base.Shared.DEBUG;

import static com.android.documentsui.services.FileOperationService.EXTRA_DIALOG_TYPE;

import static com.android.documentsui.services.FileOperationService.EXTRA_OPERATION_TYPE;

import static com.android.documentsui.services.FileOperationService.EXTRA_FAILED_DOCS;

import static com.android.documentsui.services.FileOperationService.EXTRA_SRC_LIST;

import static com.android.documentsui.services.FileOperationService.OPERATION_COPY;
@@ -195,7 +196,7 @@ class CopyJob extends ResolvedResourcesJob { 
        navigateIntent.putExtra(EXTRA_DIALOG_TYPE, DIALOG_TYPE_CONVERTED);

        navigateIntent.putExtra(EXTRA_OPERATION_TYPE, operationType);



        navigateIntent.putParcelableArrayListExtra(EXTRA_SRC_LIST, convertedFiles);

        navigateIntent.putParcelableArrayListExtra(EXTRA_FAILED_DOCS, convertedFiles);



        // TODO: Consider adding a dialog on tapping the notification with a list of

        // converted files.