Merge lp://staging/~tomdroid-dev/tomdroid/sync-ui into lp://staging/~tomdroid-maintainers/tomdroid/main
Proposed by
Rodja
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Olivier Bilodeau | ||||
Approved revision: | 241 | ||||
Merged at revision: | 186 | ||||
Proposed branch: | lp://staging/~tomdroid-dev/tomdroid/sync-ui | ||||
Merge into: | lp://staging/~tomdroid-maintainers/tomdroid/main | ||||
Diff against target: |
4072 lines (+3072/-290) 40 files modified
.classpath (+3/-0) AndroidManifest.xml (+24/-9) data/tomdroid-4.svg (+612/-0) default.properties (+1/-1) res/anim/pulse.xml (+10/-0) res/drawable/syncbutton_background.xml (+16/-0) res/drawable/syncbutton_background_focus.xml (+4/-0) res/drawable/syncbutton_background_pressed.xml (+4/-0) res/layout/actionbar.xml (+84/-0) res/layout/main.xml (+10/-4) res/layout/main_list_item.xml (+25/-6) res/layout/note_view.xml (+32/-14) res/menu/main.xml (+6/-8) res/values/arrays.xml (+11/-0) res/values/strings.xml (+13/-2) res/xml/preferences.xml (+18/-0) src/org/tomdroid/Note.java (+36/-6) src/org/tomdroid/NoteManager.java (+45/-9) src/org/tomdroid/NoteProvider.java (+5/-2) src/org/tomdroid/sync/ServiceAuth.java (+33/-0) src/org/tomdroid/sync/SyncManager.java (+106/-0) src/org/tomdroid/sync/SyncService.java (+196/-0) src/org/tomdroid/sync/sd/NoteHandler.java (+2/-1) src/org/tomdroid/sync/sd/SdCardSyncService.java (+68/-44) src/org/tomdroid/sync/web/AnonymousConnection.java (+62/-0) src/org/tomdroid/sync/web/OAuthConnection.java (+278/-0) src/org/tomdroid/sync/web/SnowySyncService.java (+232/-0) src/org/tomdroid/sync/web/WebConnection.java (+139/-0) src/org/tomdroid/ui/Actionbar.java (+69/-0) src/org/tomdroid/ui/PreferencesActivity.java (+217/-0) src/org/tomdroid/ui/SyncMessageHandler.java (+158/-0) src/org/tomdroid/ui/Tomdroid.java (+122/-179) src/org/tomdroid/ui/ViewNote.java (+36/-4) src/org/tomdroid/util/NoteContentBuilder.java (+2/-1) src/org/tomdroid/util/NoteListCursorAdapter.java (+113/-0) src/org/tomdroid/util/Preferences.java (+112/-0) src/org/tomdroid/util/XmlUtils.java (+58/-0) src/org/tomdroid/xml/NoteContentHandler.java (+1/-0) tests/org/tomdroid/NoteManagerTest.java (+74/-0) tests/org/tomdroid/NoteTest.java (+35/-0) |
||||
To merge this branch: | bzr merge lp://staging/~tomdroid-dev/tomdroid/sync-ui | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Olivier Bilodeau | Approve | ||
Review via email: mp+33434@code.staging.launchpad.net |
Commit message
Note synchronization support (SD Card and Tomboy Web)
Description of the change
The changes made in the sync-ui branch are of great value to the end users and do not seem to have any obvious bugs. Time to do a 0.4 release!
Not only does the new code introduce a visual progress feedback while syncing, but is also using an Actionbar as lately proposed by the Android developers from Google.
To post a comment you must log in.
First, I only glanced quickly at your work but I'm very excited to see your work!
Second, sorry if anything here was already mentionned elsewhere but I haven't replied..
Third, all of this is a matter of discussion. Given the right arguments I will change my mind.
1) order of things
I'm a bit confused with the merge hiearchy here..
Is this based on web-sync meaning we need to merge web-sync first or does this integrates web-sync so merging this will result in a web-sync + sync-ui integration?
2) commons-codec
What is commons-codec used for? Was there no built-in alternative already available? I'm trying to avoid adding a 64k jar into the tomdroid package here.
3) signpost
Not sure what you did with signpost.. haven't looked but can't you use a released jar (with a version we can track bugs against, etc.) instead of having a git checkout of their stuff? Did you need to modify their upstream code? If you can't proceed with released code, can you get rid of the git metadata (signpost/.git/) and identify in a README.tomdroid what revision/repo is this code from and what custom changes you needed done. Also, I would like the eclipse metadata removed.
4) file headers
Some new files are missing the usual project header. Be careful to assign copyright to the right person who created the work. If you are willing to give me the copyright feel free to do so. In any case you will be attributed for your work elsewhere.
Start looking at these please. Once dealt with I'll checkout the branch and play with it.
Thanks!