Ubuntu One Android Files

Merge lp://staging/~karni/ubuntuone-android-files/retry-uploads into lp://staging/ubuntuone-android-files

  1. retry-uploads
  2. Merge into trunk-2011
Proposed by Michał Karnicki
Status: Merged
Merged at revision: 88
Proposed branch: lp://staging/~karni/ubuntuone-android-files/retry-uploads
Merge into: lp://staging/ubuntuone-android-files
Diff against target: 2816 lines (+1184/-586)
22 files modified
.project (+1/-1)
AndroidManifest.xml (+7/-3)
res/values/arrays.xml (+6/-5)
res/values/strings.xml (+36/-26)
res/xml/preferences.xml (+11/-9)
src/com/ubuntuone/android/files/Alarms.java (+237/-0)
src/com/ubuntuone/android/files/Preferences.java (+13/-1)
src/com/ubuntuone/android/files/UbuntuOneFiles.java (+12/-128)
src/com/ubuntuone/android/files/provider/MetaContract.java (+10/-2)
src/com/ubuntuone/android/files/provider/MetaUtilities.java (+73/-0)
src/com/ubuntuone/android/files/receiver/NetworkReceiver.java (+53/-50)
src/com/ubuntuone/android/files/receiver/SystemReceiver.java (+46/-10)
src/com/ubuntuone/android/files/service/MediaCatcher.java (+18/-6)
src/com/ubuntuone/android/files/service/MetaService.java (+184/-90)
src/com/ubuntuone/android/files/service/MetaServiceHelper.java (+6/-1)
src/com/ubuntuone/android/files/service/UpDownService.java (+100/-30)
src/com/ubuntuone/android/files/service/UpDownServiceHelper.java (+38/-17)
src/com/ubuntuone/android/files/ui/FilesActivity.java (+104/-46)
src/com/ubuntuone/android/files/ui/PreferencesActivity.java (+184/-139)
src/com/ubuntuone/android/files/ui/ShortcutsActivity.java (+3/-2)
src/com/ubuntuone/android/files/util/ConfigUtilities.java (+15/-5)
src/com/ubuntuone/android/files/util/StorageInfo.java (+27/-15)
To merge this branch: bzr merge lp://staging/~karni/ubuntuone-android-files/retry-uploads
Reviewer Review Type Date Requested Status
Chad Miller (community) Approve
Review via email: mp+62408@code.staging.launchpad.net

Description of the change

Retry failed transfers on demand, with ~ exponential back-off and on connectivity events.

Media auto-upload timestamp fixes.

Code clean-up.

To post a comment you must log in.
lp://staging/~karni/ubuntuone-android-files/retry-uploads updated
87. By Michał Karnicki

Fix SystemReciever to properly receive MEDIA broadcasts.

88. By Michał Karnicki

Abandon deprecated onStart method.

Revision history for this message
Chad Miller (cmiller) wrote :

assert now == StorageInfo.getLastUploadedPhotoTimestamp();

This doesn't seem useful. "if () Log.wtf()", maybe.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: