Merge lp://staging/~karni/ubuntuone-android-files/avoid-overwrites into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Merged at revision: | 184 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/avoid-overwrites |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
66 lines (+35/-2) 2 files modified
src/com/ubuntuone/android/files/service/UpDownServiceHelper.java (+20/-2) src/com/ubuntuone/android/files/util/FileUtilities.java (+15/-0) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/avoid-overwrites |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller | Pending | ||
|
Review via email:
|
|||
Description of the change
Never allow auto transfer overwrite existing files. Instead, rename them:
a) foo.jpg -> foo-1.jpg, foo-2.jpg, etc
b) bar -> bar-1, bar-2, etc
The check starts with original file name, and finds first available file name with counter.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
