diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-22 09:01:37 +0200 | 
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-22 09:01:37 +0200 | 
| commit | 3d6f5e8ba1f86117a8a8d485fda30314e4a21db8 (patch) | |
| tree | 9975ad1a6a0f773639034058e57b16af637ea2f8 /OpenKeychain | |
| parent | 152cd10b70400134588321688f8187c28a9fd7d0 (diff) | |
| download | open-keychain-3d6f5e8ba1f86117a8a8d485fda30314e4a21db8.tar.gz open-keychain-3d6f5e8ba1f86117a8a8d485fda30314e4a21db8.tar.bz2 open-keychain-3d6f5e8ba1f86117a8a8d485fda30314e4a21db8.zip  | |
Fix contact sync
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java index b7c4dcb80..016d6dc14 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java @@ -343,7 +343,7 @@ public class ContactHelper {          // Delete fingerprints that are no longer present in OK          for (String fingerprint : contactFingerprints) {              resolver.delete(ContactsContract.RawContacts.CONTENT_URI, ACCOUNT_TYPE_AND_SOURCE_ID_SELECTION, -                    new String[]{Constants.PACKAGE_NAME, fingerprint}); +                    new String[]{Constants.ACCOUNT_TYPE, fingerprint});          }      } @@ -354,7 +354,7 @@ public class ContactHelper {      private static Set<String> getRawContactFingerprints(ContentResolver resolver) {          HashSet<String> result = new HashSet<String>();          Cursor fingerprints = resolver.query(ContactsContract.RawContacts.CONTENT_URI, SOURCE_ID_PROJECTION, -                ACCOUNT_TYPE_SELECTION, new String[]{Constants.PACKAGE_NAME}, null); +                ACCOUNT_TYPE_SELECTION, new String[]{Constants.ACCOUNT_TYPE}, null);          if (fingerprints != null) {              while (fingerprints.moveToNext()) {                  result.add(fingerprints.getString(0)); @@ -373,7 +373,7 @@ public class ContactHelper {      private static int findRawContactId(ContentResolver resolver, String fingerprint) {          int rawContactId = -1;          Cursor raw = resolver.query(ContactsContract.RawContacts.CONTENT_URI, ID_PROJECTION, -                ACCOUNT_TYPE_AND_SOURCE_ID_SELECTION, new String[]{Constants.PACKAGE_NAME, fingerprint}, null, null); +                ACCOUNT_TYPE_AND_SOURCE_ID_SELECTION, new String[]{Constants.ACCOUNT_TYPE, fingerprint}, null, null);          if (raw != null) {              if (raw.moveToNext()) {                  rawContactId = raw.getInt(0); @@ -388,8 +388,8 @@ public class ContactHelper {       */      private static void insertContact(ArrayList<ContentProviderOperation> ops, Context context, String fingerprint) {          ops.add(ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI) -                .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, context.getString(R.string.app_name)) -                .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, Constants.PACKAGE_NAME) +                .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, Constants.ACCOUNT_NAME) +                .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, Constants.ACCOUNT_TYPE)                  .withValue(ContactsContract.RawContacts.SOURCE_ID, fingerprint)                  .build());      }  | 
