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

DatabaseInteractor -> KeyRepository

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-02-24 18:24:11 +01:00
parent c7e01926e1
commit 2124a4598a
65 changed files with 419 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
View File

@@ -27,7 +27,7 @@ import org.sufficientlysecure.keychain.pgp.KeyRing;
import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
import org.sufficientlysecure.keychain.provider.DatabaseInteractor.NotFoundException;
import org.sufficientlysecure.keychain.provider.KeyRepository.NotFoundException;
import org.sufficientlysecure.keychain.util.Log;
/** This implementation of KeyRing provides a cached view of PublicKeyRing
@@ -48,21 +48,21 @@ import org.sufficientlysecure.keychain.util.Log;
*/
public class CachedPublicKeyRing extends KeyRing {
final DatabaseInteractor mDatabaseInteractor;
final KeyRepository mKeyRepository;
final Uri mUri;
public CachedPublicKeyRing(DatabaseInteractor databaseInteractor, Uri uri) {
mDatabaseInteractor = databaseInteractor;
public CachedPublicKeyRing(KeyRepository keyRepository, Uri uri) {
mKeyRepository = keyRepository;
mUri = uri;
}
@Override
public long getMasterKeyId() throws PgpKeyNotFoundException {
try {
Object data = mDatabaseInteractor.getGenericData(mUri,
KeychainContract.KeyRings.MASTER_KEY_ID, DatabaseInteractor.FIELD_TYPE_INTEGER);
Object data = mKeyRepository.getGenericData(mUri,
KeychainContract.KeyRings.MASTER_KEY_ID, KeyRepository.FIELD_TYPE_INTEGER);
return (Long) data;
} catch (DatabaseReadWriteInteractor.NotFoundException e) {
} catch (KeyWritableRepository.NotFoundException e) {
throw new PgpKeyNotFoundException(e);
}
}
@@ -85,10 +85,10 @@ public class CachedPublicKeyRing extends KeyRing {
public byte[] getFingerprint() throws PgpKeyNotFoundException {
try {
Object data = mDatabaseInteractor.getGenericData(mUri,
KeychainContract.KeyRings.FINGERPRINT, DatabaseInteractor.FIELD_TYPE_BLOB);
Object data = mKeyRepository.getGenericData(mUri,
KeychainContract.KeyRings.FINGERPRINT, KeyRepository.FIELD_TYPE_BLOB);
return (byte[]) data;
} catch (DatabaseReadWriteInteractor.NotFoundException e) {
} catch (KeyWritableRepository.NotFoundException e) {
throw new PgpKeyNotFoundException(e);
}
}
@@ -96,11 +96,11 @@ public class CachedPublicKeyRing extends KeyRing {
@Override
public String getPrimaryUserId() throws PgpKeyNotFoundException {
try {
Object data = mDatabaseInteractor.getGenericData(mUri,
Object data = mKeyRepository.getGenericData(mUri,
KeychainContract.KeyRings.USER_ID,
DatabaseInteractor.FIELD_TYPE_STRING);
KeyRepository.FIELD_TYPE_STRING);
return (String) data;
} catch(DatabaseReadWriteInteractor.NotFoundException e) {
} catch(KeyWritableRepository.NotFoundException e) {
throw new PgpKeyNotFoundException(e);
}
}
@@ -111,22 +111,22 @@ public class CachedPublicKeyRing extends KeyRing {
public String getName() throws PgpKeyNotFoundException {
try {
Object data = mDatabaseInteractor.getGenericData(mUri,
Object data = mKeyRepository.getGenericData(mUri,
KeyRings.NAME,
DatabaseInteractor.FIELD_TYPE_STRING);
KeyRepository.FIELD_TYPE_STRING);
return (String) data;
} catch(DatabaseReadWriteInteractor.NotFoundException e) {
} catch(KeyWritableRepository.NotFoundException e) {
throw new PgpKeyNotFoundException(e);
}
}
public String getEmail() throws PgpKeyNotFoundException {
try {
Object data = mDatabaseInteractor.getGenericData(mUri,
Object data = mKeyRepository.getGenericData(mUri,
KeyRings.EMAIL,
DatabaseInteractor.FIELD_TYPE_STRING);
KeyRepository.FIELD_TYPE_STRING);
return (String) data;
} catch(DatabaseReadWriteInteractor.NotFoundException e) {
} catch(KeyWritableRepository.NotFoundException e) {
throw new PgpKeyNotFoundException(e);
}
}
@@ -134,11 +134,11 @@ public class CachedPublicKeyRing extends KeyRing {
public String getComment() throws PgpKeyNotFoundException {
try {
Object data = mDatabaseInteractor.getGenericData(mUri,
Object data = mKeyRepository.getGenericData(mUri,
KeyRings.COMMENT,
DatabaseInteractor.FIELD_TYPE_STRING);
KeyRepository.FIELD_TYPE_STRING);
return (String) data;
} catch(DatabaseReadWriteInteractor.NotFoundException e) {
} catch(KeyWritableRepository.NotFoundException e) {
throw new PgpKeyNotFoundException(e);
}
}
@@ -146,11 +146,11 @@ public class CachedPublicKeyRing extends KeyRing {
@Override
public boolean isRevoked() throws PgpKeyNotFoundException {
try {
Object data = mDatabaseInteractor.getGenericData(mUri,
Object data = mKeyRepository.getGenericData(mUri,
KeychainContract.KeyRings.IS_REVOKED,
DatabaseInteractor.FIELD_TYPE_INTEGER);
KeyRepository.FIELD_TYPE_INTEGER);
return (Long) data > 0;
} catch(DatabaseReadWriteInteractor.NotFoundException e) {
} catch(KeyWritableRepository.NotFoundException e) {
throw new PgpKeyNotFoundException(e);
}
}
@@ -158,11 +158,11 @@ public class CachedPublicKeyRing extends KeyRing {
@Override
public boolean canCertify() throws PgpKeyNotFoundException {
try {
Object data = mDatabaseInteractor.getGenericData(mUri,
Object data = mKeyRepository.getGenericData(mUri,
KeychainContract.KeyRings.HAS_CERTIFY,
DatabaseInteractor.FIELD_TYPE_NULL);
KeyRepository.FIELD_TYPE_NULL);
return !((Boolean) data);
} catch(DatabaseReadWriteInteractor.NotFoundException e) {
} catch(KeyWritableRepository.NotFoundException e) {
throw new PgpKeyNotFoundException(e);
}
}
@@ -170,11 +170,11 @@ public class CachedPublicKeyRing extends KeyRing {
@Override
public long getEncryptId() throws PgpKeyNotFoundException {
try {
Object data = mDatabaseInteractor.getGenericData(mUri,
Object data = mKeyRepository.getGenericData(mUri,
KeyRings.HAS_ENCRYPT,
DatabaseInteractor.FIELD_TYPE_INTEGER);
KeyRepository.FIELD_TYPE_INTEGER);
return (Long) data;
} catch(DatabaseReadWriteInteractor.NotFoundException e) {
} catch(KeyWritableRepository.NotFoundException e) {
throw new PgpKeyNotFoundException(e);
}
}
@@ -192,11 +192,11 @@ public class CachedPublicKeyRing extends KeyRing {
*/
public long getSecretSignId() throws PgpKeyNotFoundException {
try {
Object data = mDatabaseInteractor.getGenericData(mUri,
Object data = mKeyRepository.getGenericData(mUri,
KeyRings.HAS_SIGN,
DatabaseInteractor.FIELD_TYPE_INTEGER);
KeyRepository.FIELD_TYPE_INTEGER);
return (Long) data;
} catch(DatabaseReadWriteInteractor.NotFoundException e) {
} catch(KeyWritableRepository.NotFoundException e) {
throw new PgpKeyNotFoundException(e);
}
}
@@ -204,43 +204,43 @@ public class CachedPublicKeyRing extends KeyRing {
@Override
public int getVerified() throws PgpKeyNotFoundException {
try {
Object data = mDatabaseInteractor.getGenericData(mUri,
Object data = mKeyRepository.getGenericData(mUri,
KeychainContract.KeyRings.VERIFIED,
DatabaseInteractor.FIELD_TYPE_INTEGER);
KeyRepository.FIELD_TYPE_INTEGER);
return ((Long) data).intValue();
} catch(DatabaseReadWriteInteractor.NotFoundException e) {
} catch(KeyWritableRepository.NotFoundException e) {
throw new PgpKeyNotFoundException(e);
}
}
public boolean hasAnySecret() throws PgpKeyNotFoundException {
try {
Object data = mDatabaseInteractor.getGenericData(mUri,
Object data = mKeyRepository.getGenericData(mUri,
KeychainContract.KeyRings.HAS_ANY_SECRET,
DatabaseInteractor.FIELD_TYPE_INTEGER);
KeyRepository.FIELD_TYPE_INTEGER);
return (Long) data > 0;
} catch(DatabaseReadWriteInteractor.NotFoundException e) {
} catch(KeyWritableRepository.NotFoundException e) {
throw new PgpKeyNotFoundException(e);
}
}
private Cursor getSubkeys() throws PgpKeyNotFoundException {
Uri keysUri = KeychainContract.Keys.buildKeysUri(extractOrGetMasterKeyId());
return mDatabaseInteractor.getContentResolver().query(keysUri, null, null, null, null);
return mKeyRepository.getContentResolver().query(keysUri, null, null, null, null);
}
public SecretKeyType getSecretKeyType(long keyId) throws NotFoundException {
Object data = mDatabaseInteractor.getGenericData(Keys.buildKeysUri(mUri),
Object data = mKeyRepository.getGenericData(Keys.buildKeysUri(mUri),
KeyRings.HAS_SECRET,
DatabaseInteractor.FIELD_TYPE_INTEGER,
KeyRepository.FIELD_TYPE_INTEGER,
KeyRings.KEY_ID + " = " + Long.toString(keyId));
return SecretKeyType.fromNum(((Long) data).intValue());
}
public byte[] getEncoded() throws PgpKeyNotFoundException {
try {
return mDatabaseInteractor.loadPublicKeyRingData(getMasterKeyId());
} catch(DatabaseReadWriteInteractor.NotFoundException e) {
return mKeyRepository.loadPublicKeyRingData(getMasterKeyId());
} catch(KeyWritableRepository.NotFoundException e) {
throw new PgpKeyNotFoundException(e);
}
}

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/DatabaseInteractor.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeyRepository.java
View File

@@ -26,7 +26,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets;
public class DatabaseInteractor {
public class KeyRepository {
// If we ever switch to api level 11, we can ditch this whole mess!
public static final int FIELD_TYPE_NULL = 1;
// this is called integer to stay coherent with the constants in Cursor (api level 11)
@@ -40,18 +40,18 @@ public class DatabaseInteractor {
OperationLog mLog;
int mIndent;
public static DatabaseInteractor createDatabaseInteractor(Context context) {
public static KeyRepository createDatabaseInteractor(Context context) {
ContentResolver contentResolver = context.getContentResolver();
LocalPublicKeyStorage localPublicKeyStorage = LocalPublicKeyStorage.getInstance(context);
return new DatabaseInteractor(contentResolver, localPublicKeyStorage);
return new KeyRepository(contentResolver, localPublicKeyStorage);
}
private DatabaseInteractor(ContentResolver contentResolver, LocalPublicKeyStorage localPublicKeyStorage) {
private KeyRepository(ContentResolver contentResolver, LocalPublicKeyStorage localPublicKeyStorage) {
this(contentResolver, localPublicKeyStorage, new OperationLog(), 0);
}
DatabaseInteractor(ContentResolver contentResolver, LocalPublicKeyStorage localPublicKeyStorage,
KeyRepository(ContentResolver contentResolver, LocalPublicKeyStorage localPublicKeyStorage,
OperationLog log, int indent) {
mContentResolver = contentResolver;
mLocalPublicKeyStorage = localPublicKeyStorage;

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/DatabaseReadWriteInteractor.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeyWritableRepository.java
View File

@@ -87,26 +87,26 @@ import org.sufficientlysecure.keychain.util.Utf8Util;
* the lifetime of the executing ProviderHelper object unless the resetLog()
* method is called to start a new one specifically.
*/
public class DatabaseReadWriteInteractor extends DatabaseInteractor {
public class KeyWritableRepository extends KeyRepository {
private static final int MAX_CACHED_KEY_SIZE = 1024 * 50;
private final Context mContext;
public static DatabaseReadWriteInteractor createDatabaseReadWriteInteractor(Context context) {
public static KeyWritableRepository createDatabaseReadWriteInteractor(Context context) {
LocalPublicKeyStorage localPublicKeyStorage = LocalPublicKeyStorage.getInstance(context);
return new DatabaseReadWriteInteractor(context, localPublicKeyStorage);
return new KeyWritableRepository(context, localPublicKeyStorage);
}
private DatabaseReadWriteInteractor(Context context, LocalPublicKeyStorage localPublicKeyStorage) {
private KeyWritableRepository(Context context, LocalPublicKeyStorage localPublicKeyStorage) {
this(context, localPublicKeyStorage, new OperationLog(), 0);
}
private DatabaseReadWriteInteractor(Context context, LocalPublicKeyStorage localPublicKeyStorage, OperationLog log) {
private KeyWritableRepository(Context context, LocalPublicKeyStorage localPublicKeyStorage, OperationLog log) {
this(context, localPublicKeyStorage, log, 0);
}
private DatabaseReadWriteInteractor(Context context, LocalPublicKeyStorage localPublicKeyStorage, OperationLog log, int indent) {
private KeyWritableRepository(Context context, LocalPublicKeyStorage localPublicKeyStorage, OperationLog log, int indent) {
super(context.getContentResolver(), localPublicKeyStorage, log, indent);
mContext = context;
@@ -1174,7 +1174,7 @@ public class DatabaseReadWriteInteractor extends DatabaseInteractor {
private ConsolidateResult consolidateDatabaseStep2(
OperationLog log, int indent, Progressable progress, boolean recovery) {
synchronized (DatabaseReadWriteInteractor.class) {
synchronized (KeyWritableRepository.class) {
if (mConsolidateCritical) {
log.add(LogType.MSG_CON_ERROR_CONCURRENT, indent);
return new ConsolidateResult(ConsolidateResult.RESULT_ERROR, log);