/android/import-contacts : changes

» Changes to src/am/ed/importcontacts/Merge.java from revision 117

To get this branch, use:

bzr branch
http://bzr.ed.am/android/import-contacts

From Revision 117

expand all

Rev	Summary	Authors	Date
93	minor style tweaks minor style tweaks	Tim Marston	12 years ago
50	updated all URLs, email addresses and package names to ed.am updated all URLs, email addresses and package names to ed.am	edam	13 years ago
41	- updated TODO - updated TODO - made varibale names consistent (camelCaseVariables now_use_underscores)	edam	14 years ago
36	- formatting: removed some double-indents on overrunning lin... - formatting: removed some double-indents on overrunning lines - updated TODO and NEWS - rewrote central logic of parser so it makes more sense, looks nicer and has a small optimisation (getting name and params from line only when necessary) - optimised unnecessary mutliple converting of lines to US-ASCII - re-wrote line extraction from vcards so that we can lookahead for v3 folded lines - added support for v3 folded lines	edam	14 years ago
14	- got rid of the pretend ImportContacts activity alltogether... - got rid of the pretend ImportContacts activity alltogether (and made the Intro activity the startup one) - massively simplified the WizzardActivity class so it works propperly - moved all code to org.waxworlds.edam - added an "aborted" message when the importion is aborted - simplified the 3 actions the worker thread can take when stopping (only 2 were actualy used) to "aborted" or "alldone" - changed intro message to match website - bugfix: don't blow up when the My Contacts group is missing	edam	15 years ago
9	- added scroll view to all layouts - added scroll view to all layouts - added intro activity (with disclaimer) - added action constants so that updates (and changed ids) won't affect saved data - updated todo	edam	16 years ago
6	- added GPL header comments to all files - added GPL header comments to all files - added GPLv3 to project as COPYING	edam	16 years ago
1	Initial import Initial import	edam	16 years ago