cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused ContentResolver field from KeyRepository

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-18 17:10:01 +02:00
parent 192d87d58f
commit cdb3960fa1
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/KeyRepository.java
View File

@@ -23,7 +23,6 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.support.annotation.WorkerThread; import android.support.annotation.WorkerThread;
@@ -50,7 +49,6 @@ import timber.log.Timber;
@WorkerThread @WorkerThread
public class KeyRepository extends AbstractDao { public class KeyRepository extends AbstractDao {
final ContentResolver contentResolver;
final LocalPublicKeyStorage mLocalPublicKeyStorage; final LocalPublicKeyStorage mLocalPublicKeyStorage;
final LocalSecretKeyStorage localSecretKeyStorage; final LocalSecretKeyStorage localSecretKeyStorage;
@@ -58,29 +56,27 @@ public class KeyRepository extends AbstractDao {
int mIndent; int mIndent;
public static KeyRepository create(Context context) { public static KeyRepository create(Context context) {
ContentResolver contentResolver = context.getContentResolver();
LocalPublicKeyStorage localPublicKeyStorage = LocalPublicKeyStorage.getInstance(context); LocalPublicKeyStorage localPublicKeyStorage = LocalPublicKeyStorage.getInstance(context);
LocalSecretKeyStorage localSecretKeyStorage = LocalSecretKeyStorage.getInstance(context); LocalSecretKeyStorage localSecretKeyStorage = LocalSecretKeyStorage.getInstance(context);
KeychainDatabase database = KeychainDatabase.getInstance(context); KeychainDatabase database = KeychainDatabase.getInstance(context);
DatabaseNotifyManager databaseNotifyManager = DatabaseNotifyManager.create(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, DatabaseNotifyManager databaseNotifyManager,
LocalPublicKeyStorage localPublicKeyStorage, LocalPublicKeyStorage localPublicKeyStorage,
LocalSecretKeyStorage localSecretKeyStorage) { 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, DatabaseNotifyManager databaseNotifyManager,
LocalPublicKeyStorage localPublicKeyStorage, LocalPublicKeyStorage localPublicKeyStorage,
LocalSecretKeyStorage localSecretKeyStorage, LocalSecretKeyStorage localSecretKeyStorage,
OperationLog log, int indent) { OperationLog log, int indent) {
super(database, databaseNotifyManager); super(database, databaseNotifyManager);
this.contentResolver = contentResolver;
mLocalPublicKeyStorage = localPublicKeyStorage; mLocalPublicKeyStorage = localPublicKeyStorage;
this.localSecretKeyStorage = localSecretKeyStorage; this.localSecretKeyStorage = localSecretKeyStorage;
mIndent = indent; mIndent = indent;
@@ -281,10 +277,6 @@ public class KeyRepository extends AbstractDao {
return getKeyRingAsArmoredData(data); return getKeyRingAsArmoredData(data);
} }
public ContentResolver getContentResolver() {
return contentResolver;
}
public final byte[] loadPublicKeyRingData(long masterKeyId) throws NotFoundException { public final byte[] loadPublicKeyRingData(long masterKeyId) throws NotFoundException {
SqlDelightQuery query = KeyRingPublic.FACTORY.selectByMasterKeyId(masterKeyId); SqlDelightQuery query = KeyRingPublic.FACTORY.selectByMasterKeyId(masterKeyId);
try (Cursor cursor = getReadableDb().query(query)) { try (Cursor cursor = getReadableDb().query(query)) {

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/daos/KeyWritableRepository.java
View File

@@ -109,7 +109,7 @@ public class KeyWritableRepository extends KeyRepository {
LocalPublicKeyStorage localPublicKeyStorage, LocalPublicKeyStorage localPublicKeyStorage,
LocalSecretKeyStorage localSecretKeyStorage, DatabaseNotifyManager databaseNotifyManager, LocalSecretKeyStorage localSecretKeyStorage, DatabaseNotifyManager databaseNotifyManager,
OperationLog log, int indent, AutocryptPeerDao autocryptPeerDao) { 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.context = context;
this.databaseNotifyManager = databaseNotifyManager; this.databaseNotifyManager = databaseNotifyManager;