Merge lp://staging/~karni/ubuntuone-android-files/failed-uploads-notification into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Approved by: | Chad Miller |
| Approved revision: | 326 |
| Merged at revision: | 327 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/failed-uploads-notification |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
260 lines (+68/-40) 4 files modified
src/com/ubuntuone/android/files/activity/FilesActivity.java (+1/-0) src/com/ubuntuone/android/files/activity/PreferencesActivity.java (+12/-7) src/com/ubuntuone/android/files/service/UpDownService.java (+49/-33) src/com/ubuntuone/android/files/util/TransferUtils.java (+6/-0) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/failed-uploads-notification |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch adds recent failed uploads notification and minor cleanup.
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
Storing the state as a word in a varchar makes me itch, but it's not too awful to approve.