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

Merge "Grab Activity reference before leaving fragment." into klp-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2013-10-09 07:26:10 +00:00
committed by Android (Google) Code Review
parent 2845e5196a 78b1370308
commit e6d419de77
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/DocumentsUI/src/com/android/documentsui/CreateDirectoryFragment.java
View File

@@ -73,7 +73,7 @@ public class CreateDirectoryFragment extends DialogFragment {
final DocumentsActivity activity = (DocumentsActivity) getActivity();
final DocumentInfo cwd = activity.getCurrentDirectory();
new CreateDirectoryTask(displayName).executeOnExecutor(
new CreateDirectoryTask(activity, cwd, displayName).executeOnExecutor(
ProviderExecutor.forAuthority(cwd.authority));
}
});
@@ -83,25 +83,26 @@ public class CreateDirectoryFragment extends DialogFragment {
}
private class CreateDirectoryTask extends AsyncTask<Void, Void, DocumentInfo> {
private final DocumentsActivity mActivity;
private final DocumentInfo mCwd;
private final String mDisplayName;
public CreateDirectoryTask(String displayName) {
public CreateDirectoryTask(
DocumentsActivity activity, DocumentInfo cwd, String displayName) {
mActivity = activity;
mCwd = cwd;
mDisplayName = displayName;
}
@Override
protected DocumentInfo doInBackground(Void... params) {
final DocumentsActivity activity = (DocumentsActivity) getActivity();
final ContentResolver resolver = activity.getContentResolver();
final DocumentInfo cwd = activity.getCurrentDirectory();
final ContentResolver resolver = mActivity.getContentResolver();
ContentProviderClient client = null;
try {
client = DocumentsApplication.acquireUnstableProviderOrThrow(
resolver, cwd.derivedUri.getAuthority());
resolver, mCwd.derivedUri.getAuthority());
final Uri childUri = DocumentsContract.createDocument(
client, cwd.derivedUri, Document.MIME_TYPE_DIR, mDisplayName);
client, mCwd.derivedUri, Document.MIME_TYPE_DIR, mDisplayName);
return DocumentInfo.fromUri(resolver, childUri);
} catch (Exception e) {
Log.w(TAG, "Failed to create directory", e);
@@ -113,12 +114,11 @@ public class CreateDirectoryFragment extends DialogFragment {
@Override
protected void onPostExecute(DocumentInfo result) {
final DocumentsActivity activity = (DocumentsActivity) getActivity();
if (result != null) {
// Navigate into newly created child
activity.onDocumentPicked(result);
mActivity.onDocumentPicked(result);
} else {
Toast.makeText(activity, R.string.create_error, Toast.LENGTH_SHORT).show();
Toast.makeText(mActivity, R.string.create_error, Toast.LENGTH_SHORT).show();
}
}
}