/android/import-contacts

To get this branch, use:
bzr branch http://bzr.ed.am/android/import-contacts

« back to all changes in this revision

Viewing changes to src/org/waxworlds/edam/importcontacts/Intro.java

  • Committer: edam
  • Date: 2010-07-04 14:44:48 UTC
  • Revision ID: edam@waxworlds.org-20100704144448-1m30v811opup20fs
- 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

Show diffs side-by-side

added added

removed removed

src/org/waxworlds/edam/importcontacts/Intro.java
21
21
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
22
 */
23
23
 
24
 
package org.waxworlds.importcontacts;
 
24
package org.waxworlds.edam.importcontacts;
25
25
 
26
26
import java.util.regex.Matcher;
27
27
import java.util.regex.Pattern;
38
38
                setContentView( R.layout.intro );
39
39
                super.onCreate( savedInstanceState );
40
40
 
41
 
                setNextState( ImportContacts.STATE_CONFIGURE_VCF );
 
41
                setNextActivity( ConfigureVCF.class );
42
42
 
43
43
                TextView link = (TextView)findViewById( R.id.intro_link );
44
44
                Linkify.addLinks( link, Pattern.compile( "The Import Contacts homepage" ),
45
 
                                "", null, new Linkify.TransformFilter() {
46
 
                                        public String transformUrl( Matcher match, String url ) {
47
 
                                                return "http://www.waxworlds.org/edam/software/android/import-contacts";
48
 
                                        }
49
 
                                } );
 
45
                        "", null, new Linkify.TransformFilter() {
 
46
                                public String transformUrl( Matcher match, String url ) {
 
47
                                        return "http://www.waxworlds.org/edam/software/android/import-contacts";
 
48
                                }
 
49
                        }
 
50
                );
50
51
        }
51
52
 
52
53
}