From af8194aa85f5353e2ca4e81ef3ae736ad27164af Mon Sep 17 00:00:00 2001 From: Ahmad Vazirna Date: Wed, 24 Jan 2024 00:21:48 +0200 Subject: [PATCH] Lint --- .../org/commcare/utils/KeyStoreEncryptionKeyProvider.java | 7 +++---- .../org/commcare/utils/EncryptCredentialsInMemoryTest.kt | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/org/commcare/utils/KeyStoreEncryptionKeyProvider.java b/app/src/org/commcare/utils/KeyStoreEncryptionKeyProvider.java index 9e31a19382..58cfb8ccd4 100644 --- a/app/src/org/commcare/utils/KeyStoreEncryptionKeyProvider.java +++ b/app/src/org/commcare/utils/KeyStoreEncryptionKeyProvider.java @@ -25,7 +25,6 @@ import androidx.annotation.RequiresApi; import static org.commcare.util.EncryptionKeyHelper.CC_KEY_ALGORITHM_RSA; -import static org.commcare.utils.GlobalConstants.KEYSTORE_NAME; /** * Class for providing encryption keys backed by Android Keystore @@ -49,7 +48,7 @@ public Key generateCryptographicKeyInKeyStore(String keyAlias, try { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { KeyGenerator keyGenerator = KeyGenerator - .getInstance(KeyProperties.KEY_ALGORITHM_AES, KEYSTORE_NAME); + .getInstance(KeyProperties.KEY_ALGORITHM_AES, getKeyStoreName()); KeyGenParameterSpec keyGenParameterSpec = new KeyGenParameterSpec.Builder(keyAlias, KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT) .setBlockModes(BLOCK_MODE) @@ -63,7 +62,7 @@ public Key generateCryptographicKeyInKeyStore(String keyAlias, // hence the need to switch to a correspondent algorithm as well, RSA // TODO: Add link to StackOverflow page KeyPairGenerator keyGenerator = KeyPairGenerator - .getInstance(CC_KEY_ALGORITHM_RSA, KEYSTORE_NAME); + .getInstance(CC_KEY_ALGORITHM_RSA, getKeyStoreName()); GregorianCalendar start = new GregorianCalendar(); GregorianCalendar end = new GregorianCalendar(); end.add(GregorianCalendar.YEAR, 100); @@ -106,6 +105,6 @@ public String getTransformationString() { @Override public String getKeyStoreName() { - return "AndroidKeyStore"; + return GlobalConstants.KEYSTORE_NAME; } } diff --git a/app/unit-tests/src/org/commcare/utils/EncryptCredentialsInMemoryTest.kt b/app/unit-tests/src/org/commcare/utils/EncryptCredentialsInMemoryTest.kt index ddb0a96334..bb68181acb 100644 --- a/app/unit-tests/src/org/commcare/utils/EncryptCredentialsInMemoryTest.kt +++ b/app/unit-tests/src/org/commcare/utils/EncryptCredentialsInMemoryTest.kt @@ -18,7 +18,7 @@ import org.robolectric.annotation.Config @Config(application = CommCareTestApplication::class) @RunWith(AndroidJUnit4::class) -public class EncryptCredentialsInMemoryTest { +class EncryptCredentialsInMemoryTest { @Before fun setup() { @@ -48,7 +48,7 @@ public class EncryptCredentialsInMemoryTest { TestAppInstaller.login(TEST_USER, TEST_PASS) // retrieve the logged in user, this should be using the encrypted version - var user = CommCareApplication.instance().getSession().getLoggedInUser() + var user = CommCareApplication.instance().session.loggedInUser // save the same username and store the username for future comparison user.setUsername(TEST_USER)