aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-02-06 14:17:49 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2016-02-06 14:17:49 +0100
commit2c7e5ab8df69f461758c112f0e0e8d44f479b7e8 (patch)
tree75dda98111cc15eef8fdca548bc518255f0cd705 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
parentcbf6f15d91f53f460584d959fcd16440c9309be1 (diff)
parentd2cf56f42ed0b37f9a51418c0eefdc951abe10e5 (diff)
downloadopen-keychain-2c7e5ab8df69f461758c112f0e0e8d44f479b7e8.tar.gz
open-keychain-2c7e5ab8df69f461758c112f0e0e8d44f479b7e8.tar.bz2
open-keychain-2c7e5ab8df69f461758c112f0e0e8d44f479b7e8.zip
Merge pull request #1713 from open-keychain/unlink-contact
Deletes linked OpenKeychain contacts if sync is disabled
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
index ea038aa1a..29e6f4e41 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
@@ -465,7 +465,7 @@ public class ContactHelper {
*/
public void writeKeysToContacts() {
if (Constants.DEBUG_SYNC_REMOVE_CONTACTS) {
- debugDeleteRawContacts();
+ deleteAllContacts();
}
writeKeysToMainProfileContact();
@@ -671,7 +671,7 @@ public class ContactHelper {
*
* @return number of rows deleted
*/
- private int debugDeleteRawContacts() {
+ public int deleteAllContacts() {
// CALLER_IS_SYNCADAPTER allows us to actually wipe the RawContact from the device, otherwise
// would be just flagged for deletion
Uri deleteUri = ContactsContract.RawContacts.CONTENT_URI.buildUpon().