lp:~tomdroid-dev/tomdroid/two-way-sync

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~tomdroid-maintainers/tomdroid/main

Olivier Bilodeau: Pending requested 2010-10-10

Diff: 3957 lines (+2175/-640)

32 files modified

.classpath (+1/-1)
AndroidManifest.xml (+3/-4)
res/layout/main.xml (+1/-0)
res/layout/note_view.xml (+42/-32)
res/menu/main.xml (+5/-0)
res/menu/view_note.xml (+48/-0)
res/values/strings.xml (+6/-6)
res/values/styles.xml (+14/-0)
res/xml/preferences.xml (+5/-6)
src/org/tomdroid/Note.java (+170/-42)
src/org/tomdroid/NoteManager.java (+93/-77)
src/org/tomdroid/NoteProvider.java (+5/-2)
src/org/tomdroid/sync/LocalStorage.java (+156/-0)
src/org/tomdroid/sync/SyncManager.java (+24/-22)
src/org/tomdroid/sync/SyncMethod.java (+62/-102)
src/org/tomdroid/sync/sd/SdCardSyncService.java (+71/-63)
src/org/tomdroid/sync/web/OAuthConnection.java (+2/-0)
src/org/tomdroid/sync/web/SnowySyncMethod.java (+116/-91)
src/org/tomdroid/sync/web/SyncServer.java (+205/-0)
src/org/tomdroid/ui/PreferencesActivity.java (+48/-45)
src/org/tomdroid/ui/Rotate3dAnimation.java (+92/-0)
src/org/tomdroid/ui/SyncMessageHandler.java (+8/-8)
src/org/tomdroid/ui/Tomdroid.java (+32/-23)
src/org/tomdroid/ui/ViewNote.java (+234/-109)
src/org/tomdroid/ui/ViewSwitcher.java (+152/-0)
src/org/tomdroid/util/NoteListCursorAdapter.java (+7/-5)
src/org/tomdroid/util/Preferences.java (+2/-2)
tests/org/tomdroid/sync/TestLocalStorage.java (+78/-0)
tests/org/tomdroid/sync/web/MockSyncServer.java (+167/-0)
tests/org/tomdroid/sync/web/MockedSyncServerTestCase.java (+81/-0)
tests/org/tomdroid/sync/web/TestFetchingFromServer.java (+119/-0)
tests/org/tomdroid/sync/web/TestUpdatingTheServer.java (+126/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #549647: Two-way synchronization	Wishlist	Fix Released
Bug #657563: Deleting Notes	Wishlist	Fix Released
Bug #657568: Formatted Note Editing	Wishlist	Fix Released

Link a bug report

Related blueprints

280. By Rodja on 2010-10-10

merged with master (Tomdroid version 0.4)

279. By Rodja on 2010-10-10

added missing copyright informations

278. By Rodja on 2010-10-04

removed warnings and added gpl header

277. By Rodja on 2010-10-04

Non-synced Notes are displayed as 'locally modified'

276. By Rodja on 2010-10-03

merged with current sync-ui to get all the great improvements

275. By Rodja on 2010-09-26

Using doubletap to switch between view and edit mode because longpress is needed for copy/paste.

274. By Rodja on 2010-09-05

Removed obsolete member flag.

273. By Rodja on 2010-09-04

Added menu action to reset all local changes and get a clean sync from server.

272. By Rodja on 2010-09-04

Rebuilding content each time viewNote is called to show the editings.

271. By Rodja on 2010-09-04

Changing options menu according to edit mode.