Merge lp://staging/~karni/ubuntuone-android-files/aggregated-notifications-better-retries into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Approved by: | Chad Miller |
| Approved revision: | 93 |
| Merged at revision: | 93 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/aggregated-notifications-better-retries |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
847 lines (+294/-156) 10 files modified
.project (+1/-1) AndroidManifest.xml (+1/-0) src/com/ubuntuone/android/files/UbuntuOneFiles.java (+0/-70) src/com/ubuntuone/android/files/receiver/NetworkReceiver.java (+3/-9) src/com/ubuntuone/android/files/service/MediaCatcher.java (+1/-1) src/com/ubuntuone/android/files/service/MetaService.java (+43/-29) src/com/ubuntuone/android/files/service/UpDownService.java (+90/-34) src/com/ubuntuone/android/files/service/UpDownServiceHelper.java (+60/-4) src/com/ubuntuone/android/files/ui/FilesActivity.java (+15/-8) src/com/ubuntuone/android/files/util/AwakeIntentService.java (+80/-0) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/aggregated-notifications-better-retries |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Better handling of transfer requests when no connectivity.
Improved handling of picture auto-upload (correct DATE_ADDED timestamp to save in StorageInfo).
Aggregate notifications of the same type with 60sec timeout.
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
