Remove unused cipher pool

dimagi · Sep 23, 2024 · 660e80b · 660e80b
1 parent 5a0578a
commit 660e80b
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 199 deletions.
diff --git a/app/src/org/commcare/models/encryption/CipherPool.java b/app/src/org/commcare/models/encryption/CipherPool.java
diff --git a/app/src/org/commcare/models/legacy/DecryptingCursor.java b/app/src/org/commcare/models/legacy/DecryptingCursor.java
diff --git a/app/src/org/commcare/services/CommCareSessionService.java b/app/src/org/commcare/services/CommCareSessionService.java
@@ -27,7 +27,6 @@
 import org.commcare.interfaces.FormSaveCallback;
 import org.commcare.models.database.user.DatabaseUserOpenHelper;
 import org.commcare.models.database.user.UserSandboxUtils;
-import org.commcare.models.encryption.CipherPool;
 import org.commcare.preferences.HiddenPreferences;
 import org.commcare.sync.FormSubmissionHelper;
 import org.commcare.tasks.DataSubmissionListener;
@@ -83,7 +82,6 @@ public class CommCareSessionService extends Service {
     public static final ReentrantLock sessionAliveLock = new ReentrantLock();
 
     private Timer maintenanceTimer;
-    private CipherPool pool;
 
     private byte[] key = null;
 
@@ -141,7 +139,6 @@ public CommCareSessionService getService() {
     public void onCreate() {
         mNM = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
         setSessionLength();
-        createCipherPool();
     }
 
     @Override
@@ -154,27 +151,6 @@ public void onTaskRemoved(Intent rootIntent) {
         }
     }
 
-    public void createCipherPool() {
-        pool = new CipherPool() {
-            @Override
-            public Cipher generateNewCipher() {
-                synchronized (lock) {
-                    try {
-                        SecretKeySpec spec = new SecretKeySpec(key, "AES");
-                        Cipher decrypter = Cipher.getInstance("AES");
-                        decrypter.init(Cipher.DECRYPT_MODE, spec);
-
-                        return decrypter;
-                    } catch (NoSuchPaddingException | NoSuchAlgorithmException |
-                             InvalidKeyException e) {
-                        e.printStackTrace();
-                    }
-                }
-                return null;
-            }
-        };
-    }
-
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         // We want this service to continue running until it is explicitly
@@ -286,7 +262,6 @@ public void prepareStorage(byte[] symetricKey, UserKeyRecord record) {
         synchronized (lock) {
             this.userKeyRecordUUID = record.getUuid();
             this.key = symetricKey;
-            pool.init();
             if (userDatabase != null && userDatabase.isOpen()) {
                 userDatabase.close();
             }
@@ -488,8 +463,6 @@ public void closeServiceResources() {
                 maintenanceTimer.cancel();
             }
             logoutStartedAt = -1;
-
-            pool.expire();
             endHeartbeatLifecycle();
         }
     }