Merge lp://staging/~karni/ubuntuone-android-files/new-updown-service into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Approved by: | Chad Miller |
| Approved revision: | 208 |
| Merged at revision: | 208 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/new-updown-service |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
1964 lines (+980/-531) 13 files modified
res/values/ids.xml (+6/-2) res/values/strings.xml (+8/-1) src/com/ubuntuone/android/files/UbuntuOneFiles.java (+1/-2) src/com/ubuntuone/android/files/provider/MetaUtilities.java (+28/-15) src/com/ubuntuone/android/files/receiver/NetworkReceiver.java (+24/-21) src/com/ubuntuone/android/files/service/AwakeService.java (+90/-0) src/com/ubuntuone/android/files/service/MetaService.java (+8/-3) src/com/ubuntuone/android/files/service/SimpleCallback.java (+27/-0) src/com/ubuntuone/android/files/service/TransferExecutor.java (+332/-0) src/com/ubuntuone/android/files/service/UpDownService.java (+381/-453) src/com/ubuntuone/android/files/service/UpDownServiceHelper.java (+19/-5) src/com/ubuntuone/android/files/ui/FilesActivity.java (+55/-28) src/com/ubuntuone/android/files/ui/PreferencesActivity.java (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/new-updown-service |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch is relatively big.. and it's because of:
- brand new UpDownService that is much more reliable and flexible
- few bugfixes I could not resist to complete; I did my best to commit them in separate commits
Please refer to commit messages for details.
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
