moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-07 18:40:19 -05:00
Code Issues Releases Wiki Activity

fix indentation in various key import methods

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-06-22 14:17:08 +02:00
parent 002a391a68
commit 37cee1322b
1 changed files with 66 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
View File

@ -498,13 +498,12 @@ public class ProviderHelper {
} }
} }
mIndent -= 1;
} catch (IOException e) { } catch (IOException e) {
log(LogLevel.ERROR, LogType.MSG_IP_FAIL_IO_EXC); log(LogLevel.ERROR, LogType.MSG_IP_FAIL_IO_EXC);
Log.e(Constants.TAG, "IOException during import", e); Log.e(Constants.TAG, "IOException during import", e);
mIndent -= 1;
return SaveKeyringResult.RESULT_ERROR; return SaveKeyringResult.RESULT_ERROR;
} finally {
mIndent -= 1;
} }
try { try {
@ -523,19 +522,16 @@ public class ProviderHelper {
mContentResolver.applyBatch(KeychainContract.CONTENT_AUTHORITY, operations); mContentResolver.applyBatch(KeychainContract.CONTENT_AUTHORITY, operations);
log(LogLevel.OK, LogType.MSG_IP_SUCCESS); log(LogLevel.OK, LogType.MSG_IP_SUCCESS);
mIndent -= 1;
progress.setProgress(LogType.MSG_IP_SUCCESS.getMsgId(), 90, 100); progress.setProgress(LogType.MSG_IP_SUCCESS.getMsgId(), 90, 100);
return result; return result;
} catch (RemoteException e) { } catch (RemoteException e) {
log(LogLevel.ERROR, LogType.MSG_IP_FAIL_REMOTE_EX); log(LogLevel.ERROR, LogType.MSG_IP_FAIL_REMOTE_EX);
Log.e(Constants.TAG, "RemoteException during import", e); Log.e(Constants.TAG, "RemoteException during import", e);
mIndent -= 1;
return SaveKeyringResult.RESULT_ERROR; return SaveKeyringResult.RESULT_ERROR;
} catch (OperationApplicationException e) { } catch (OperationApplicationException e) {
log(LogLevel.ERROR, LogType.MSG_IP_FAIL_OP_EXC); log(LogLevel.ERROR, LogType.MSG_IP_FAIL_OP_EXC);
Log.e(Constants.TAG, "OperationApplicationException during import", e); Log.e(Constants.TAG, "OperationApplicationException during import", e);
mIndent -= 1;
return SaveKeyringResult.RESULT_ERROR; return SaveKeyringResult.RESULT_ERROR;
} }
@ -581,76 +577,81 @@ public class ProviderHelper {
log(LogLevel.START, LogType.MSG_IS, log(LogLevel.START, LogType.MSG_IS,
new String[]{ PgpKeyHelper.convertKeyIdToHex(masterKeyId) }); new String[]{ PgpKeyHelper.convertKeyIdToHex(masterKeyId) });
mIndent += 1; mIndent += 1;
// Canonicalize this key, to assert a number of assumptions made about it.
keyRing = keyRing.canonicalize(mLog, mIndent);
if (keyRing == null) {
return SaveKeyringResult.RESULT_ERROR;
}
// IF this is successful, it's a secret key
int result = SaveKeyringResult.SAVED_SECRET;
// save secret keyring
try { try {
ContentValues values = new ContentValues();
values.put(KeyRingData.MASTER_KEY_ID, masterKeyId); // Canonicalize this key, to assert a number of assumptions made about it.
values.put(KeyRingData.KEY_RING_DATA, keyRing.getEncoded()); keyRing = keyRing.canonicalize(mLog, mIndent);
// insert new version of this keyRing if (keyRing == null) {
Uri uri = KeyRingData.buildSecretKeyRingUri(Long.toString(masterKeyId));
if (mContentResolver.insert(uri, values) == null) {
log(LogLevel.ERROR, LogType.MSG_IS_DB_EXCEPTION);
return SaveKeyringResult.RESULT_ERROR; return SaveKeyringResult.RESULT_ERROR;
} }
} catch (IOException e) {
Log.e(Constants.TAG, "Failed to encode key!", e);
log(LogLevel.ERROR, LogType.MSG_IS_FAIL_IO_EXC);
return SaveKeyringResult.RESULT_ERROR;
}
{ // IF this is successful, it's a secret key
Uri uri = Keys.buildKeysUri(Long.toString(masterKeyId)); int result = SaveKeyringResult.SAVED_SECRET;
// first, mark all keys as not available // save secret keyring
ContentValues values = new ContentValues(); try {
values.put(Keys.HAS_SECRET, 0); ContentValues values = new ContentValues();
mContentResolver.update(uri, values, null, null); values.put(KeyRingData.MASTER_KEY_ID, masterKeyId);
values.put(KeyRingData.KEY_RING_DATA, keyRing.getEncoded());
// insert new version of this keyRing
Uri uri = KeyRingData.buildSecretKeyRingUri(Long.toString(masterKeyId));
if (mContentResolver.insert(uri, values) == null) {
log(LogLevel.ERROR, LogType.MSG_IS_DB_EXCEPTION);
return SaveKeyringResult.RESULT_ERROR;
}
} catch (IOException e) {
Log.e(Constants.TAG, "Failed to encode key!", e);
log(LogLevel.ERROR, LogType.MSG_IS_FAIL_IO_EXC);
return SaveKeyringResult.RESULT_ERROR;
}
values.put(Keys.HAS_SECRET, 1); {
// then, mark exactly the keys we have available Uri uri = Keys.buildKeysUri(Long.toString(masterKeyId));
log(LogLevel.INFO, LogType.MSG_IS_IMPORTING_SUBKEYS);
mIndent += 1; // first, mark all keys as not available
Set<Long> available = keyRing.getAvailableSubkeys(); ContentValues values = new ContentValues();
for (UncachedPublicKey sub : values.put(Keys.HAS_SECRET, 0);
new IterableIterator<UncachedPublicKey>(keyRing.getPublicKeys())) { mContentResolver.update(uri, values, null, null);
long id = sub.getKeyId();
if(available.contains(id)) { values.put(Keys.HAS_SECRET, 1);
int upd = mContentResolver.update(uri, values, Keys.KEY_ID + " = ?", // then, mark exactly the keys we have available
new String[] { Long.toString(id) }); log(LogLevel.INFO, LogType.MSG_IS_IMPORTING_SUBKEYS);
if (upd == 1) { mIndent += 1;
log(LogLevel.DEBUG, LogType.MSG_IS_SUBKEY_OK, new String[]{ Set<Long> available = keyRing.getAvailableSubkeys();
PgpKeyHelper.convertKeyIdToHex(id) for (UncachedPublicKey sub :
}); new IterableIterator<UncachedPublicKey>(keyRing.getPublicKeys())) {
long id = sub.getKeyId();
if (available.contains(id)) {
int upd = mContentResolver.update(uri, values, Keys.KEY_ID + " = ?",
new String[]{Long.toString(id)});
if (upd == 1) {
log(LogLevel.DEBUG, LogType.MSG_IS_SUBKEY_OK, new String[]{
PgpKeyHelper.convertKeyIdToHex(id)
});
} else {
log(LogLevel.WARN, LogType.MSG_IS_SUBKEY_NONEXISTENT, new String[]{
PgpKeyHelper.convertKeyIdToHex(id)
});
}
} else { } else {
log(LogLevel.WARN, LogType.MSG_IS_SUBKEY_NONEXISTENT, new String[]{ log(LogLevel.INFO, LogType.MSG_IS_SUBKEY_STRIPPED, new String[]{
PgpKeyHelper.convertKeyIdToHex(id) PgpKeyHelper.convertKeyIdToHex(id)
}); });
} }
} else {
log(LogLevel.INFO, LogType.MSG_IS_SUBKEY_STRIPPED, new String[]{
PgpKeyHelper.convertKeyIdToHex(id)
});
} }
mIndent -= 1;
// this implicitly leaves all keys which were not in the secret key ring
// with has_secret = 0
} }
log(LogLevel.OK, LogType.MSG_IS_SUCCESS);
return result;
} finally {
mIndent -= 1; mIndent -= 1;
// this implicitly leaves all keys which were not in the secret key ring
// with has_secret = 0
} }
log(LogLevel.OK, LogType.MSG_IS_SUCCESS);
return result;
} }
@ -738,12 +739,13 @@ public class ProviderHelper {
} }
} }
mIndent -= 1;
return new SaveKeyringResult(result, mLog); return new SaveKeyringResult(result, mLog);
} catch (IOException e) { } catch (IOException e) {
log(LogLevel.ERROR, LogType.MSG_IP_FAIL_IO_EXC); log(LogLevel.ERROR, LogType.MSG_IP_FAIL_IO_EXC);
return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog); return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog);
} finally {
mIndent -= 1;
} }
} }
@ -833,6 +835,8 @@ public class ProviderHelper {
} catch (IOException e) { } catch (IOException e) {
log(LogLevel.ERROR, LogType.MSG_IS_FAIL_IO_EXC, null); log(LogLevel.ERROR, LogType.MSG_IS_FAIL_IO_EXC, null);
return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog); return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog);
} finally {
mIndent -= 1;
} }
} }