Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix opening archives in Downloads." into nyc-dev

Browse Source
This commit is contained in:
Tomasz Mikolajewski
2016-04-11 03:00:11 +00:00
committed by Android (Google) Code Review
parent ab713b9c37 8fa9970149
commit c58e5619d3
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
View File

@@ -98,7 +98,7 @@ public class FilesActivity extends BaseActivity {
assert(uri == null || uri.getAuthority() == null || assert(uri == null || uri.getAuthority() == null ||
LauncherActivity.isLaunchUri(uri)); LauncherActivity.isLaunchUri(uri));
refreshCurrentRootAndDirectory(AnimationView.ANIM_NONE); refreshCurrentRootAndDirectory(AnimationView.ANIM_NONE);
} else if (intent.getAction() == Intent.ACTION_VIEW) { } else if (Intent.ACTION_VIEW.equals(intent.getAction())) {
assert(uri != null); assert(uri != null);
new OpenUriForViewTask(this).executeOnExecutor( new OpenUriForViewTask(this).executeOnExecutor(
ProviderExecutor.forAuthority(uri.getAuthority()), uri); ProviderExecutor.forAuthority(uri.getAuthority()), uri);
@@ -276,18 +276,6 @@ public class FilesActivity extends BaseActivity {
@Override @Override
public void onDocumentPicked(DocumentInfo doc, Model model) { public void onDocumentPicked(DocumentInfo doc, Model model) {
if (doc.isContainer()) {
openContainerDocument(doc);
} else {
openDocument(doc, model);
}
}
/**
* Launches an intent to view the specified document.
*/
private void openDocument(DocumentInfo doc, Model model) {
// Anything on downloads goes through the back through downloads manager // Anything on downloads goes through the back through downloads manager
// (that's the MANAGE_DOCUMENT bit). // (that's the MANAGE_DOCUMENT bit).
// This is done for two reasons: // This is done for two reasons:
@@ -297,7 +285,13 @@ public class FilesActivity extends BaseActivity {
// like origin URL. // like origin URL.
// All other files not on downloads, event APKs, would get no benefit from this // All other files not on downloads, event APKs, would get no benefit from this
// treatment, thusly the "isDownloads" check. // treatment, thusly the "isDownloads" check.
if (getCurrentRoot().isDownloads()) {
// Launch MANAGE_DOCUMENTS only for the root level files, so it's not called for
// files in archives. Also, if the activity is already browsing a ZIP from downloads,
// then skip MANAGE_DOCUMENTS.
final boolean isViewing = Intent.ACTION_VIEW.equals(getIntent().getAction());
final boolean isInArchive = mState.stack.size() > 1;
if (getCurrentRoot().isDownloads() && !isInArchive && !isViewing) {
// First try managing the document; we expect manager to filter // First try managing the document; we expect manager to filter
// based on authority, so we don't grant. // based on authority, so we don't grant.
final Intent manage = new Intent(DocumentsContract.ACTION_MANAGE_DOCUMENT); final Intent manage = new Intent(DocumentsContract.ACTION_MANAGE_DOCUMENT);
@@ -311,6 +305,17 @@ public class FilesActivity extends BaseActivity {
} }
} }
if (doc.isContainer()) {
openContainerDocument(doc);
} else {
openDocument(doc, model);
}
}
/**
* Launches an intent to view the specified document.
*/
private void openDocument(DocumentInfo doc, Model model) {
Intent intent = new QuickViewIntentBuilder( Intent intent = new QuickViewIntentBuilder(
getPackageManager(), getResources(), doc, model).build(); getPackageManager(), getResources(), doc, model).build();