From 6a7a04a9e8cc258249b9cad49c2d9aa18e69c938 Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 4 Sep 2020 15:42:56 +0200 Subject: [PATCH] Fixes refresh issues --- .../ui/fragment/report/ComposableTableReportFragment.kt | 7 +++++-- .../android/ui/modules/bankroll/BankrollFragment.kt | 1 - .../android/ui/modules/calendar/CalendarDetailsFragment.kt | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt index 924cffb4..e80a0560 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt @@ -8,7 +8,10 @@ import android.widget.Toast import androidx.recyclerview.widget.LinearLayoutManager import io.realm.Realm import kotlinx.android.synthetic.main.fragment_composable_table_report.* -import kotlinx.coroutines.* +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.async +import kotlinx.coroutines.launch import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.Calculator import net.pokeranalytics.android.calculus.ComputableGroup @@ -29,7 +32,6 @@ import net.pokeranalytics.android.util.NULL_TEXT import net.pokeranalytics.android.util.TextFormat import timber.log.Timber import java.util.* -import kotlin.coroutines.CoroutineContext open class ComposableTableReportFragment : RealmFragment(), StaticRowRepresentableDataSource, CoroutineScope, RowRepresentableDelegate { @@ -207,6 +209,7 @@ open class ComposableTableReportFragment : RealmFragment(), StaticRowRepresentab Timber.d(">>> start...") val realm = Realm.getDefaultInstance() + realm.refresh() val aggregationType = stat.aggregationTypes.first() report = diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt index 4009b2dd..69595c6e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt @@ -103,7 +103,6 @@ class BankrollFragment : DeletableItemFragment(), StaticRowRepresentableDataSour } - /** * Init data */ diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt index 27a4c354..37387757 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt @@ -174,7 +174,6 @@ class CalendarDetailsFragment : BaseFragment(), StaticRowRepresentableDataSource val startDate = Date() - val query = Query().merge(computedResults.group.query) query.remove(QueryCondition.IsCash) query.remove(QueryCondition.IsTournament) @@ -190,6 +189,8 @@ class CalendarDetailsFragment : BaseFragment(), StaticRowRepresentableDataSource query = query ) val realm = Realm.getDefaultInstance() + realm.refresh() + val report = Calculator.computeStats(realm, options) realm.close()