From 7ccdd7d38ed1c7d2152b914be5d08323ebf434e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 5 Mar 2015 11:14:19 +0100
Subject: Debug options

---
 .../src/main/java/org/sufficientlysecure/keychain/Constants.java      | 2 ++
 .../org/sufficientlysecure/keychain/provider/KeychainProvider.java    | 2 +-
 .../main/java/org/sufficientlysecure/keychain/util/ContactHelper.java | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index 9f8226c05..574f16c27 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
@@ -28,6 +28,8 @@ import java.io.File;
 public final class Constants {
 
     public static final boolean DEBUG = BuildConfig.DEBUG;
+    public static final boolean DEBUG_LOG_DB_QUERIES = false;
+    public static final boolean DEBUG_SYNC_REMOVE_CONTACTS = false;
 
     public static final String TAG = "Keychain";
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index 2601c1f69..4ccfc3cd9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
@@ -650,7 +650,7 @@ public class KeychainProvider extends ContentProvider {
             cursor.setNotificationUri(getContext().getContentResolver(), uri);
         }
 
-        if (Constants.DEBUG) {
+        if (Constants.DEBUG && Constants.DEBUG_LOG_DB_QUERIES) {
             Log.d(Constants.TAG,
                     "Query: "
                             + qb.buildQuery(projection, selection, selectionArgs, null, null,
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 44bcc52a5..c66dc04d0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
@@ -296,7 +296,9 @@ public class ContactHelper {
         ContentResolver resolver = context.getContentResolver();
         Set<Long> deletedKeys = getRawContactMasterKeyIds(resolver);
 
-//        debugDeleteRawContacts(resolver);
+        if (Constants.DEBUG_SYNC_REMOVE_CONTACTS) {
+            debugDeleteRawContacts(resolver);
+        }
 
 //        ContentProviderClient client = resolver.acquireContentProviderClient(ContactsContract.AUTHORITY_URI);
 //        ContentValues values = new ContentValues();
-- 
cgit v1.2.3