/android/export-contacts

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

« back to all changes in this revision

Viewing changes to src/am/ed/exportcontacts/ContactsContractBackend.java

  • Committer: edam
  • Date: 2012-12-21 17:49:39 UTC
  • Revision ID: tim@ed.am-20121221174939-rih1gx3m91q8e5gs
removed check for deleted contacts (that seems to be broken); fixed conversion on types for ContactsContract backend

Show diffs side-by-side

added added

removed removed

src/am/ed/exportcontacts/ContactsContractBackend.java
4
4
 * Copyright (C) 2011 to 2012 Tim Marston <tim@ed.am>
5
5
 *
6
6
 * This file is part of the Export Contacts program (hereafter referred
7
 
 * to as "this program").  For more information, see
 
7
 * to as "this program"). For more information, see
8
8
 * http://ed.am/dev/android/export-contacts
9
9
 *
10
10
 * This program is free software: you can redistribute it and/or modify
48
48
        public int getNumContacts()
49
49
        {
50
50
                // get number of aggregate contacts
51
 
                Cursor cur = _activity.getContentResolver().query(
 
51
                Cursor cursor = _activity.managedQuery(
52
52
                        ContactsContract.Contacts.CONTENT_URI,
53
53
                        new String[] {
54
54
                                ContactsContract.Contacts._ID,
55
55
                        }, null, null, null );
56
 
                int ret = cur.getCount();
57
 
                cur.close();
58
 
                return ret;
 
56
                return cursor.getCount();
59
57
        }
60
58
 
61
59
        private int convertBackendTypeToType( Class< ? > cls, int type )
109
107
                if( _cur == null )
110
108
                {
111
109
                        // get all aggregate contacts
112
 
                        _cur = _activity.getContentResolver().query(
 
110
                        _cur = _activity.managedQuery(
113
111
                                ContactsContract.Contacts.CONTENT_URI,
114
112
                                new String[] {
115
113
                                        ContactsContract.Contacts._ID,
118
116
                }
119
117
 
120
118
                // if there are no more aggregate contacts, abort
121
 
                if( _cur == null ) return false;
122
 
                if( !_cur.moveToNext() ) {
123
 
                        _cur.close();
 
119
                if( _cur == null || !_cur.moveToNext() ) {
124
120
                        _cur = null;
125
121
                        return false;
126
122
                }