realm: change to executeTransaction (from beginTransaction / commitTransaction)

csv
Razmig Sarkissian 7 years ago
parent f0dfe12ed9
commit 6b452bd17e
  1. 7
      app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
  2. 10
      app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt
  3. 26
      app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt
  4. 19
      app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
  5. 12
      app/src/main/java/net/pokeranalytics/android/ui/interfaces/FilterHandler.kt

@ -308,10 +308,9 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
* Delete selected transaction * Delete selected transaction
*/ */
private fun deleteSelectedTransaction() { private fun deleteSelectedTransaction() {
val realm = getRealm() getRealm().executeTransaction {
realm.beginTransaction() selectedTransaction?.deleteFromRealm()
selectedTransaction?.deleteFromRealm() }
realm.commitTransaction()
selectedTransactionPosition = -1 selectedTransactionPosition = -1
} }

@ -243,12 +243,10 @@ open class FilterDetailsFragment : RealmFragment(), StaticRowRepresentableDataSo
Timber.d("Selected rows: $it") Timber.d("Selected rows: $it")
} }
val realm = getRealm() getRealm().executeTransaction {
realm.beginTransaction() currentFilter?.remove(filterCategoryRow)
currentFilter?.remove(filterCategoryRow) currentFilter?.createOrUpdateFilterConditions(selectedRows)
currentFilter?.createOrUpdateFilterConditions(selectedRows) }
realm.commitTransaction()
currentFilter?.filterConditions?.forEach { currentFilter?.filterConditions?.forEach {
Timber.d("Condition: $it") Timber.d("Condition: $it")
} }

@ -251,13 +251,12 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
* Validate the updates of the queryWith * Validate the updates of the queryWith
*/ */
private fun validateUpdates() { private fun validateUpdates() {
val realm = getRealm() getRealm().executeTransaction { realm ->
realm.beginTransaction() currentFilter?.let {
currentFilter?.let { it.name = it.query.getName(requireContext())
it.name = it.query.getName(requireContext()) realm.copyToRealmOrUpdate(it)
realm.copyToRealmOrUpdate(it) }
} }
realm.commitTransaction()
val filterId = currentFilter?.id ?: "" val filterId = currentFilter?.id ?: ""
finishActivityWithResult(filterId) finishActivityWithResult(filterId)
@ -268,13 +267,12 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
*/ */
private fun cancelUpdates() { private fun cancelUpdates() {
val filterId = filterCopy?.id ?: "" val filterId = filterCopy?.id ?: ""
val realm = getRealm() getRealm().executeTransaction { realm ->
realm.beginTransaction() filterCopy?.let {
filterCopy?.let { realm.copyToRealmOrUpdate(it)
realm.copyToRealmOrUpdate(it) }
} }
realm.commitTransaction() finishActivityWithResult(filterId)
finishActivityWithResult(filterId)
} }
/** /**

@ -67,20 +67,19 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate {
currentSession = sessionRealm currentSession = sessionRealm
sessionHasBeenCustomized = true sessionHasBeenCustomized = true
} else { } else {
realm.beginTransaction() realm.executeTransaction { executeRealm ->
currentSession = Session.newInstance(realm, isTournament) currentSession = Session.newInstance(executeRealm, isTournament)
FavoriteSessionFinder.copyParametersFromFavoriteSession(currentSession, null, requireContext()) FavoriteSessionFinder.copyParametersFromFavoriteSession(currentSession, null, requireContext())
realm.commitTransaction() }
// Find the nearest location around the user // Find the nearest location around the user
parentActivity?.findNearestLocation { parentActivity?.findNearestLocation {
it?.let { location -> it?.let { location ->
realm.beginTransaction() realm.executeTransaction { executeRealm ->
val realmLocation = realm.findById<Location>(location.id) val realmLocation = executeRealm.findById<Location>(location.id)
FavoriteSessionFinder.copyParametersFromFavoriteSession(currentSession, realmLocation, requireContext()) FavoriteSessionFinder.copyParametersFromFavoriteSession(currentSession, realmLocation, requireContext())
currentSession.location = realmLocation currentSession.location = realmLocation
realm.commitTransaction() }
updateSessionUI(true) updateSessionUI(true)
} }
} }

@ -47,12 +47,12 @@ interface FilterHandler {
val realm = Realm.getDefaultInstance() val realm = Realm.getDefaultInstance()
realm.beginTransaction() realm.executeTransaction { executeRealm ->
currentFilter(context, realm)?.let { currentFilter(context, executeRealm)?.let {
it.useCount++ it.useCount++
} }
realm.commitTransaction() }
realm.close() realm.close()
// Send broadcast // Send broadcast
val intent = Intent() val intent = Intent()

Loading…
Cancel
Save