commit 664025e3eb9184817a1ebc21920c601466b907c1
author Tomasz Mikolajewski <mtomasz@google.com> Wed Feb 01 11:54:48 2017 +0900
committer Tomasz Mikolajewski <mtomasz@google.com> Fri Feb 03 01:30:33 2017 +0000
tree 7a3f237ddee46db036a63f3493dc3a7662a0a768
parent dc235d2796593d0275843b7a5897c72c5603f6cc

Fix crashing converted files warning dialog.

Test: Tested manually that the dialog works.
Bug: None
Change-Id: I8e708fbf889dec96ca4d9992581e92463704391a
(cherry picked from commit d573c7dbfed47170bb584f5c7245bbfe737cff75)

src/com/android/documentsui/OperationDialogFragment.java

diff --git a/src/com/android/documentsui/OperationDialogFragment.java b/src/com/android/documentsui/OperationDialogFragment.java
index 6a76312..ab67f2b 100644
--- a/src/com/android/documentsui/OperationDialogFragment.java
+++ b/src/com/android/documentsui/OperationDialogFragment.java
@@ -59,7 +59,7 @@
             FragmentManager fm,
             @DialogType int dialogType,
             ArrayList<DocumentInfo> failedSrcList,
-            ArrayList<DocumentInfo> uriList,
+            ArrayList<Uri> uriList,
             DocumentStack dstStack,
             @OpType int operationType) {
 
@@ -121,8 +121,10 @@
         for (DocumentInfo documentInfo : docList) {
             list.append("&#8226; " + Html.escapeHtml(documentInfo.displayName) + "<br>");
         }
-        for (Uri uri : uriList) {
-            list.append("&#8226; " + uri.toSafeString() + "<br>");
+        if (uriList != null) {
+            for (Uri uri : uriList) {
+                list.append("&#8226; " + uri.toSafeString() + "<br>");
+            }
         }
         list.append("</p>");
 

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

diff --git a/src/com/android/documentsui/files/FilesActivity.java b/src/com/android/documentsui/files/FilesActivity.java
index 99eb40f..9ebfbe6 100644
--- a/src/com/android/documentsui/files/FilesActivity.java
+++ b/src/com/android/documentsui/files/FilesActivity.java
@@ -156,7 +156,7 @@
                     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

diff --git a/src/com/android/documentsui/services/CopyJob.java b/src/com/android/documentsui/services/CopyJob.java
index f9218fe..e44af2d 100644
--- a/src/com/android/documentsui/services/CopyJob.java
+++ b/src/com/android/documentsui/services/CopyJob.java
@@ -27,6 +27,7 @@
 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 @@
         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.