commit 8e6eaf7ace753cd4e77cdde1b300e142e33d9c28
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Oct 27 18:02:18 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 27 18:02:18 2016 +0000
tree 53e9183b84957bc63b8eb17ab8384460e48620e7
parent a352711544911b294ea511c757320a50a2835091
parent 00ee050745f8c3558e7ee93d56abeb0a4ad82472

Merge "Address Error Prone warnings." into nyc-andromeda-dev

src/com/android/documentsui/archives/ArchivesProvider.java

diff --git a/src/com/android/documentsui/archives/ArchivesProvider.java b/src/com/android/documentsui/archives/ArchivesProvider.java
index 071d561..fb96337 100644
--- a/src/com/android/documentsui/archives/ArchivesProvider.java
+++ b/src/com/android/documentsui/archives/ArchivesProvider.java
@@ -149,14 +149,26 @@
             throws FileNotFoundException {
         final ArchiveId archiveId = ArchiveId.fromDocumentId(documentId);
         if (archiveId.mPath.equals("/")) {
-            final MatrixCursor cursor = new MatrixCursor(
-                    projection != null ? projection : Archive.DEFAULT_PROJECTION);
-            final RowBuilder row = cursor.newRow();
-            row.add(Document.COLUMN_DOCUMENT_ID, documentId);
-            row.add(Document.COLUMN_DISPLAY_NAME, "Archive");  // TODO: Translate.
-            row.add(Document.COLUMN_SIZE, 0);
-            row.add(Document.COLUMN_MIME_TYPE, Document.MIME_TYPE_DIR);
-            return cursor;
+            try (final Cursor archiveCursor = getContext().getContentResolver().query(
+                    archiveId.mArchiveUri,
+                    new String[] { Document.COLUMN_DISPLAY_NAME },
+                    null, null, null, null)) {
+                if (archiveCursor == null || !archiveCursor.moveToFirst()) {
+                    throw new FileNotFoundException(
+                            "Cannot resolve display name of the archive.");
+                }
+                final String displayName = archiveCursor.getString(
+                        archiveCursor.getColumnIndex(Document.COLUMN_DISPLAY_NAME));
+
+                final MatrixCursor cursor = new MatrixCursor(
+                        projection != null ? projection : Archive.DEFAULT_PROJECTION);
+                final RowBuilder row = cursor.newRow();
+                row.add(Document.COLUMN_DOCUMENT_ID, documentId);
+                row.add(Document.COLUMN_DISPLAY_NAME, displayName);
+                row.add(Document.COLUMN_SIZE, 0);
+                row.add(Document.COLUMN_MIME_TYPE, Document.MIME_TYPE_DIR);
+                return cursor;
+            }
         }
 
         Loader loader = null;