From cdb3960fa153993b12a2631e3b11a4880f7c72bb Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Wed, 18 Jul 2018 17:10:01 +0200
Subject: [PATCH] remove unused ContentResolver field from KeyRepository

---
 .../keychain/daos/KeyRepository.java             | 16 ++++------------
 .../keychain/daos/KeyWritableRepository.java     |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/KeyRepository.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/KeyRepository.java
index b5e1cc71d..7e9ca053f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/KeyRepository.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/KeyRepository.java
@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
 import android.support.annotation.WorkerThread;
@@ -50,7 +49,6 @@ import timber.log.Timber;
 
 @WorkerThread
 public class KeyRepository extends AbstractDao {
-    final ContentResolver contentResolver;
     final LocalPublicKeyStorage mLocalPublicKeyStorage;
     final LocalSecretKeyStorage localSecretKeyStorage;
 
@@ -58,29 +56,27 @@ public class KeyRepository extends AbstractDao {
     int mIndent;
 
     public static KeyRepository create(Context context) {
-        ContentResolver contentResolver = context.getContentResolver();
         LocalPublicKeyStorage localPublicKeyStorage = LocalPublicKeyStorage.getInstance(context);
         LocalSecretKeyStorage localSecretKeyStorage = LocalSecretKeyStorage.getInstance(context);
         KeychainDatabase database = KeychainDatabase.getInstance(context);
         DatabaseNotifyManager databaseNotifyManager = DatabaseNotifyManager.create(context);
 
-        return new KeyRepository(contentResolver, database, databaseNotifyManager, localPublicKeyStorage, localSecretKeyStorage);
+        return new KeyRepository(database, databaseNotifyManager, localPublicKeyStorage, localSecretKeyStorage);
     }
 
-    private KeyRepository(ContentResolver contentResolver, KeychainDatabase database,
+    private KeyRepository(KeychainDatabase database,
             DatabaseNotifyManager databaseNotifyManager,
             LocalPublicKeyStorage localPublicKeyStorage,
             LocalSecretKeyStorage localSecretKeyStorage) {
-        this(contentResolver, database, databaseNotifyManager, localPublicKeyStorage, localSecretKeyStorage, new OperationLog(), 0);
+        this(database, databaseNotifyManager, localPublicKeyStorage, localSecretKeyStorage, new OperationLog(), 0);
     }
 
-    KeyRepository(ContentResolver contentResolver, KeychainDatabase database,
+    KeyRepository(KeychainDatabase database,
             DatabaseNotifyManager databaseNotifyManager,
             LocalPublicKeyStorage localPublicKeyStorage,
             LocalSecretKeyStorage localSecretKeyStorage,
             OperationLog log, int indent) {
         super(database, databaseNotifyManager);
-        this.contentResolver = contentResolver;
         mLocalPublicKeyStorage = localPublicKeyStorage;
         this.localSecretKeyStorage = localSecretKeyStorage;
         mIndent = indent;
@@ -281,10 +277,6 @@ public class KeyRepository extends AbstractDao {
         return getKeyRingAsArmoredData(data);
     }
 
-    public ContentResolver getContentResolver() {
-        return contentResolver;
-    }
-
     public final byte[] loadPublicKeyRingData(long masterKeyId) throws NotFoundException {
         SqlDelightQuery query = KeyRingPublic.FACTORY.selectByMasterKeyId(masterKeyId);
         try (Cursor cursor = getReadableDb().query(query)) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/KeyWritableRepository.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/KeyWritableRepository.java
index 1f46bca1d..a19181113 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/KeyWritableRepository.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/KeyWritableRepository.java
@@ -109,7 +109,7 @@ public class KeyWritableRepository extends KeyRepository {
             LocalPublicKeyStorage localPublicKeyStorage,
             LocalSecretKeyStorage localSecretKeyStorage, DatabaseNotifyManager databaseNotifyManager,
             OperationLog log, int indent, AutocryptPeerDao autocryptPeerDao) {
-        super(context.getContentResolver(), database, databaseNotifyManager, localPublicKeyStorage, localSecretKeyStorage, log, indent);
+        super(database, databaseNotifyManager, localPublicKeyStorage, localSecretKeyStorage, log, indent);
 
         this.context = context;
         this.databaseNotifyManager = databaseNotifyManager;