Rename key alias

dimagi · Dec 13, 2023 · 5c6f8fd · 5c6f8fd
1 parent 26f6e1f
commit 5c6f8fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/src/org/commcare/CommCareApplication.java b/app/src/org/commcare/CommCareApplication.java
@@ -140,7 +140,7 @@
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
-import static org.commcare.util.EncryptionUtils.USER_CREDENTIALS_KEY_ALIAS;
+import static org.commcare.util.EncryptionUtils.CC_IN_MEMORY_ENCRYPTION_KEY_ALIAS;
 import static org.commcare.util.EncryptionUtils.getEncryptionKeyProvider;
 
 public class CommCareApplication extends MultiDexApplication {
@@ -231,7 +231,7 @@ public void onCreate() {
         setRoots();
         prepareTemporaryStorage();
 
-        getEncryptionKeyProvider().generateCryptographicKeyInKeyStore(USER_CREDENTIALS_KEY_ALIAS);
+        getEncryptionKeyProvider().generateCryptographicKeyInKeyStore(CC_IN_MEMORY_ENCRYPTION_KEY_ALIAS);
 
         if (LegacyInstallUtils.checkForLegacyInstall(this)) {
             dbState = STATE_LEGACY_DETECTED;

diff --git a/app/unit-tests/src/org/commcare/utils/EncryptCredentialsInMemoryTest.kt b/app/unit-tests/src/org/commcare/utils/EncryptCredentialsInMemoryTest.kt
@@ -87,7 +87,7 @@ public class EncryptCredentialsInMemoryTest {
 
     private fun generateUserCredentialKey() {
         val mockKeyGenParameterSpec = mockk<KeyGenParameterSpec>()
-        every { mockKeyGenParameterSpec.keystoreAlias } returns EncryptionUtils.USER_CREDENTIALS_KEY_ALIAS
+        every { mockKeyGenParameterSpec.keystoreAlias } returns EncryptionUtils.CC_IN_MEMORY_ENCRYPTION_KEY_ALIAS
 
         // generate key using mock key generator
         val mockKeyGenerator = MockKeyGenerator()