avoiding concurrent modification
This commit is contained in:
parent
6148f04d7b
commit
fc293aaede
|
@ -383,7 +383,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
|
||||||
public int onStartCommand(Intent intent, int flags, int startId) {
|
public int onStartCommand(Intent intent, int flags, int startId) {
|
||||||
if (intent != null && intent.getAction() != null) {
|
if (intent != null && intent.getAction() != null) {
|
||||||
if (intent.getAction().equals(ACTION_MERGE_PHONE_CONTACTS)) {
|
if (intent.getAction().equals(ACTION_MERGE_PHONE_CONTACTS)) {
|
||||||
PhoneHelper.loadPhoneContacts(getApplicationContext(), this);
|
PhoneHelper.loadPhoneContacts(getApplicationContext(), new ArrayList<Bundle>(), this);
|
||||||
return START_STICKY;
|
return START_STICKY;
|
||||||
} else if (intent.getAction().equals(Intent.ACTION_SHUTDOWN)) {
|
} else if (intent.getAction().equals(Intent.ACTION_SHUTDOWN)) {
|
||||||
logoutAndSave();
|
logoutAndSave();
|
||||||
|
@ -495,7 +495,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
|
||||||
this.databaseBackend.readRoster(account.getRoster());
|
this.databaseBackend.readRoster(account.getRoster());
|
||||||
}
|
}
|
||||||
initConversations();
|
initConversations();
|
||||||
PhoneHelper.loadPhoneContacts(getApplicationContext(),this);
|
PhoneHelper.loadPhoneContacts(getApplicationContext(),new ArrayList<Bundle>(), this);
|
||||||
|
|
||||||
getContentResolver().registerContentObserver(ContactsContract.Contacts.CONTENT_URI, true, contactObserver);
|
getContentResolver().registerContentObserver(ContactsContract.Contacts.CONTENT_URI, true, contactObserver);
|
||||||
this.fileObserver.startWatching();
|
this.fileObserver.startWatching();
|
||||||
|
|
|
@ -16,10 +16,7 @@ import android.provider.ContactsContract.Profile;
|
||||||
|
|
||||||
public class PhoneHelper {
|
public class PhoneHelper {
|
||||||
|
|
||||||
public static void loadPhoneContacts(Context context,
|
public static void loadPhoneContacts(Context context,final List<Bundle> phoneContacts, final OnPhoneContactsLoadedListener listener) {
|
||||||
final OnPhoneContactsLoadedListener listener) {
|
|
||||||
final List<Bundle> phoneContacts = new ArrayList<Bundle>();
|
|
||||||
|
|
||||||
final String[] PROJECTION = new String[] { ContactsContract.Data._ID,
|
final String[] PROJECTION = new String[] { ContactsContract.Data._ID,
|
||||||
ContactsContract.Data.DISPLAY_NAME,
|
ContactsContract.Data.DISPLAY_NAME,
|
||||||
ContactsContract.Data.PHOTO_URI,
|
ContactsContract.Data.PHOTO_URI,
|
||||||
|
|
Loading…
Reference in New Issue