From 6b452bd17e86d55da856f04ce1d1ec7ba559ee27 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Mon, 10 Jun 2019 10:45:49 +0200 Subject: [PATCH] realm: change to executeTransaction (from beginTransaction / commitTransaction) --- .../android/ui/fragment/FeedFragment.kt | 7 +++-- .../ui/fragment/FilterDetailsFragment.kt | 10 +++---- .../android/ui/fragment/FiltersFragment.kt | 26 +++++++++---------- .../android/ui/fragment/SessionFragment.kt | 19 +++++++------- .../android/ui/interfaces/FilterHandler.kt | 12 ++++----- 5 files changed, 34 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt index 35454cc4..3d026bfa 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt @@ -308,10 +308,9 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { * Delete selected transaction */ private fun deleteSelectedTransaction() { - val realm = getRealm() - realm.beginTransaction() - selectedTransaction?.deleteFromRealm() - realm.commitTransaction() + getRealm().executeTransaction { + selectedTransaction?.deleteFromRealm() + } selectedTransactionPosition = -1 } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt index 7fe858e8..481557e5 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt @@ -243,12 +243,10 @@ open class FilterDetailsFragment : RealmFragment(), StaticRowRepresentableDataSo Timber.d("Selected rows: $it") } - val realm = getRealm() - realm.beginTransaction() - currentFilter?.remove(filterCategoryRow) - currentFilter?.createOrUpdateFilterConditions(selectedRows) - realm.commitTransaction() - + getRealm().executeTransaction { + currentFilter?.remove(filterCategoryRow) + currentFilter?.createOrUpdateFilterConditions(selectedRows) + } currentFilter?.filterConditions?.forEach { Timber.d("Condition: $it") } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt index 3aeebf19..0a1b696e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt @@ -251,13 +251,12 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource, * Validate the updates of the queryWith */ private fun validateUpdates() { - val realm = getRealm() - realm.beginTransaction() - currentFilter?.let { - it.name = it.query.getName(requireContext()) - realm.copyToRealmOrUpdate(it) - } - realm.commitTransaction() + getRealm().executeTransaction { realm -> + currentFilter?.let { + it.name = it.query.getName(requireContext()) + realm.copyToRealmOrUpdate(it) + } + } val filterId = currentFilter?.id ?: "" finishActivityWithResult(filterId) @@ -268,13 +267,12 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource, */ private fun cancelUpdates() { val filterId = filterCopy?.id ?: "" - val realm = getRealm() - realm.beginTransaction() - filterCopy?.let { - realm.copyToRealmOrUpdate(it) - } - realm.commitTransaction() - finishActivityWithResult(filterId) + getRealm().executeTransaction { realm -> + filterCopy?.let { + realm.copyToRealmOrUpdate(it) + } + } + finishActivityWithResult(filterId) } /** diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt index cb13262e..aefaa32d 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt @@ -67,20 +67,19 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate { currentSession = sessionRealm sessionHasBeenCustomized = true } else { - realm.beginTransaction() - currentSession = Session.newInstance(realm, isTournament) - FavoriteSessionFinder.copyParametersFromFavoriteSession(currentSession, null, requireContext()) - realm.commitTransaction() - + realm.executeTransaction { executeRealm -> + currentSession = Session.newInstance(executeRealm, isTournament) + FavoriteSessionFinder.copyParametersFromFavoriteSession(currentSession, null, requireContext()) + } // Find the nearest location around the user parentActivity?.findNearestLocation { it?.let { location -> - realm.beginTransaction() - val realmLocation = realm.findById(location.id) - FavoriteSessionFinder.copyParametersFromFavoriteSession(currentSession, realmLocation, requireContext()) + realm.executeTransaction { executeRealm -> + val realmLocation = executeRealm.findById(location.id) + FavoriteSessionFinder.copyParametersFromFavoriteSession(currentSession, realmLocation, requireContext()) - currentSession.location = realmLocation - realm.commitTransaction() + currentSession.location = realmLocation + } updateSessionUI(true) } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/interfaces/FilterHandler.kt b/app/src/main/java/net/pokeranalytics/android/ui/interfaces/FilterHandler.kt index 15d45a77..8e8c1167 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/interfaces/FilterHandler.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/interfaces/FilterHandler.kt @@ -47,12 +47,12 @@ interface FilterHandler { val realm = Realm.getDefaultInstance() - realm.beginTransaction() - currentFilter(context, realm)?.let { - it.useCount++ - } - realm.commitTransaction() - realm.close() + realm.executeTransaction { executeRealm -> + currentFilter(context, executeRealm)?.let { + it.useCount++ + } + } + realm.close() // Send broadcast val intent = Intent()