Sugar: defined extensions fo deleteOnCascade() methods, as they have to be called in a transaction

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt

@@ -30,11 +30,6 @@ internal open class CrossSigningInfoEntity(
 
     companion object
 
-    fun deleteOnCascade() {
-        crossSigningKeys.clearWith { it.deleteOnCascade() }
-        deleteFromRealm()
-    }
-
     fun getMasterKey() = crossSigningKeys.firstOrNull { it.usages.contains(KeyUsage.MASTER.value) }
 
     fun setMasterKey(info: KeyInfoEntity?) {
@@ -62,3 +57,8 @@ internal open class CrossSigningInfoEntity(
         info?.let { crossSigningKeys.add(it) }
     }
 }
+
+internal fun CrossSigningInfoEntity.deleteOnCascade() {
+    crossSigningKeys.clearWith { it.deleteOnCascade() }
+    deleteFromRealm()
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/DeviceInfoEntity.kt

@@ -46,9 +46,9 @@ internal open class DeviceInfoEntity(
     val users: RealmResults<UserEntity>? = null
 
     companion object
+}
 
-    fun deleteOnCascade() {
+internal fun DeviceInfoEntity.deleteOnCascade() {
     trustLevelEntity?.deleteFromRealm()
     deleteFromRealm()
 }
-}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeyInfoEntity.kt

@@ -29,10 +29,9 @@ internal open class KeyInfoEntity(
          */
         var signatures: String? = null,
         var trustLevelEntity: TrustLevelEntity? = null
-) : RealmObject() {
+) : RealmObject()
 
-    fun deleteOnCascade() {
+internal fun KeyInfoEntity.deleteOnCascade() {
     trustLevelEntity?.deleteFromRealm()
     deleteFromRealm()
 }
-}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/UserEntity.kt

@@ -29,10 +29,10 @@ internal open class UserEntity(
 ) : RealmObject() {
 
     companion object
+}
 
-    fun deleteOnCascade() {
+internal fun UserEntity.deleteOnCascade() {
     devices.clearWith { it.deleteOnCascade() }
     crossSigningInfoEntity?.deleteOnCascade()
     deleteFromRealm()
 }
-}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt

@@ -44,8 +44,9 @@ internal open class ChunkEntity(@Index var prevToken: String? = null,
     val room: RealmResults<RoomEntity>? = null
 
     companion object
+}
 
-    fun deleteOnCascade(deleteStateEvents: Boolean, canDeleteRoot: Boolean) {
+internal fun ChunkEntity.deleteOnCascade(deleteStateEvents: Boolean, canDeleteRoot: Boolean) {
     assertIsManaged()
     if (deleteStateEvents) {
         stateEvents.deleteAllFromRealm()
@@ -53,4 +54,3 @@ internal open class ChunkEntity(@Index var prevToken: String? = null,
     timelineEvents.clearWith { it.deleteOnCascade(canDeleteRoot) }
     deleteFromRealm()
 }
-}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt

@@ -30,12 +30,12 @@ internal open class EventAnnotationsSummaryEntity(
 ) : RealmObject() {
 
     companion object
+}
 
-    fun deleteOnCascade() {
+internal fun EventAnnotationsSummaryEntity.deleteOnCascade() {
     reactionsSummary.deleteAllFromRealm()
     editSummary?.deleteFromRealm()
     referencesSummaryEntity?.deleteFromRealm()
     pollResponseSummary?.deleteFromRealm()
     deleteFromRealm()
 }
-}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRuleEntity.kt

@@ -39,9 +39,9 @@ internal open class PushRuleEntity(
     val parent: RealmResults<PushRulesEntity>? = null
 
     companion object
+}
 
-    fun deleteOnCascade() {
+internal fun PushRuleEntity.deleteOnCascade() {
     conditions?.deleteAllFromRealm()
     deleteFromRealm()
 }
-}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt

@@ -35,9 +35,9 @@ internal open class PushRulesEntity(
         }
 
     companion object
+}
 
-    fun deleteOnCascade() {
+internal fun PushRulesEntity.deleteOnCascade() {
     pushRules.clearWith { it.deleteOnCascade() }
     deleteFromRealm()
 }
-}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt

@@ -53,9 +53,9 @@ internal open class PusherEntity(
         }
 
     companion object
+}
 
-    fun deleteOnCascade() {
+internal fun PusherEntity.deleteOnCascade() {
     data?.deleteFromRealm()
     deleteFromRealm()
 }
-}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptsSummaryEntity.kt

@@ -33,9 +33,9 @@ internal open class ReadReceiptsSummaryEntity(
     val timelineEvent: RealmResults<TimelineEventEntity>? = null
 
     companion object
+}
 
-    fun deleteOnCascade() {
+internal fun ReadReceiptsSummaryEntity.deleteOnCascade() {
     readReceipts.deleteAllFromRealm()
     deleteFromRealm()
 }
-}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt

@@ -39,8 +39,9 @@ internal open class TimelineEventEntity(var localId: Long = 0,
     val chunk: RealmResults<ChunkEntity>? = null
 
     companion object
+}
 
-    fun deleteOnCascade(canDeleteRoot: Boolean) {
+internal fun TimelineEventEntity.deleteOnCascade(canDeleteRoot: Boolean) {
     assertIsManaged()
     if (canDeleteRoot) {
         root?.deleteFromRealm()
@@ -49,4 +50,3 @@ internal open class TimelineEventEntity(var localId: Long = 0,
     readReceipts?.deleteOnCascade()
     deleteFromRealm()
 }
-}