Merge pull request #106 from backtrace-labs/bugfix/delete-record-db-context

Fix delete same record multiple times

Author: BartoszLitwiniuk

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Backtrace Android Release Notes
 
+## Version 3.7.9
+
+- Fixed problem when thread is trying to delete already deleted record from db context
+
 ## Version 3.7.8
 
 - Fixed missing breadcrumbs intent filter in SDK 33+.

backtrace-library/src/androidTest/java/backtraceio/library/database/BacktraceDatabaseContextTest.java

@@ -199,6 +199,21 @@ public void deleteFromDatabaseContext() {
         assertTrue(databaseContext.contains(records.get(2)));
     }
 
+    @Test
+    public void deleteSameRecordFromDatabaseContext() {
+        // GIVEN
+        List<BacktraceDatabaseRecord> records = fillDatabase();
+
+        // WHEN
+        databaseContext.delete(records.get(0));
+        databaseContext.delete(records.get(0));
+
+        // THEN
+        assertEquals(2, databaseContext.count());
+        assertTrue(databaseContext.contains(records.get(1)));
+        assertTrue(databaseContext.contains(records.get(2)));
+    }
+
     @Test
     public void tryDeleteNotExistingRecordFromDatabaseContext() {
         // GIVEN

backtrace-library/src/main/java/backtraceio/library/services/BacktraceDatabaseContext.java

@@ -75,13 +75,13 @@ private BacktraceDatabaseContext(Context context, String path, int retryNumber,
         this._path = path;//this.getAbsolutePath(path);
         this._retryNumber = retryNumber;
         this.retryOrder = retryOrder;
-        SetupBatch();
+        setupBatch();
     }
 
     /**
      * Setup cache
      */
-    private void SetupBatch() {
+    private void setupBatch() {
         if (this._retryNumber == 0) {
             throw new IllegalArgumentException("Retry number must be greater than 0!");
         }
@@ -175,15 +175,23 @@ public boolean delete(BacktraceDatabaseRecord record) {
         }
 
         for (int key : batchRetry.keySet()) {
-            for (BacktraceDatabaseRecord databaseRecord : batchRetry.get(key)) {
+            List<BacktraceDatabaseRecord> records = batchRetry.get(key);
+
+            for (BacktraceDatabaseRecord databaseRecord : records) {
                 if (databaseRecord == null || record.id != databaseRecord.id) {
                     continue;
                 }
 
                 databaseRecord.delete();
-                batchRetry.get(key).remove(databaseRecord);
-                this.totalRecords--;
-                this.totalSize -= databaseRecord.getSize();
+                try {
+                    records.remove(databaseRecord);
+                    this.totalRecords--;
+                    this.totalSize -= databaseRecord.getSize();
+                }
+                catch (Exception e) {
+                    BacktraceLogger.d(LOG_TAG, "Exception on removing record from db context: " + e.getMessage());
+                }
+                
                 return true;
             }
         }