Merge lp://staging/~karni/ubuntuone-android-files/encoding-fix into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Approved by: | Chad Miller |
| Approved revision: | 81 |
| Merged at revision: | 81 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/encoding-fix |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
678 lines (+175/-102) 10 files modified
AndroidManifest.xml (+2/-2) res/layout/activity_list.xml (+2/-2) res/layout/list_file_row.xml (+4/-2) res/values/strings.xml (+3/-1) src/com/ubuntuone/android/files/provider/MetaUtilities.java (+11/-9) src/com/ubuntuone/android/files/service/MetaService.java (+0/-1) src/com/ubuntuone/android/files/service/UpDownService.java (+16/-6) src/com/ubuntuone/android/files/service/UpDownServiceHelper.java (+50/-24) src/com/ubuntuone/android/files/ui/FilesActivity.java (+71/-49) src/com/ubuntuone/android/files/util/FileUtilities.java (+16/-6) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/encoding-fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Fix filename and path encoding.
To post a comment you must log in.
Revision history for this message
| Chad Miller (cmiller) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I think """uri = Uri.parse("file://" + Uri.encode(data, "/."));""" should be """url = Uri.fromFile(new File(data));""". That literal "file://" bothers me. That should be the purview of Uri class.