test

CLAUDE.md

@@ -1,139 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Project Overview
-
-This is **Poker Analytics**, a comprehensive Android application for tracking and analyzing poker sessions. The app supports both cash games and tournaments, providing detailed statistics, reporting, and data visualization capabilities.
-
-### Key Features
-- Session tracking (cash games and tournaments)
-- Advanced filtering and reporting
-- Bankroll management
-- Hand history import and replay
-- Statistical analysis and charting
-- Data backup and export functionality
-- Multi-currency support
-
-## Development Commands
-
-### Building the Project
-```bash
-./gradlew assembleStandardRelease  # Build release APK
-./gradlew assembleStandardDebug    # Build debug APK
-./gradlew build                    # Build all variants
-```
-
-### Running Tests
-```bash
-./gradlew test                     # Run unit tests
-./gradlew connectedAndroidTest     # Run instrumented tests (requires device/emulator)
-./gradlew testStandardDebugUnitTest # Run specific unit tests
-```
-
-### Cleaning
-```bash
-./gradlew clean                    # Clean build artifacts
-```
-
-### Build Configuration
-- **Target SDK**: 35 (Android 15)
-- **Min SDK**: 23 (Android 6.0)
-- **Build Tools**: 30.0.3
-- **Kotlin Version**: 1.9.24
-- **Realm Schema Version**: 14
-
-## Architecture Overview
-
-### Package Structure
-The main source code is organized under `app/src/main/java/net/pokeranalytics/android/`:
-
-#### Core Components
-- **`model/`** - Data models and business logic
-  - `realm/` - Realm database models (Session, Bankroll, Result, etc.)
-  - `filter/` - Query system for filtering sessions
-  - `migrations/` - Database migration handling
-  - `handhistory/` - Hand history data structures
-
-- **`ui/`** - User interface components
-  - `activity/` - Main activities (HomeActivity, SessionActivity, etc.)
-  - `fragment/` - UI fragments organized by feature
-  - `adapter/` - RecyclerView adapters and data sources
-  - `modules/` - Feature-specific UI modules
-
-- **`calculus/`** - Statistics and calculation engine
-  - Core calculation logic for poker statistics
-  - Report generation system
-  - Performance tracking
-
-- **`util/`** - Utility classes
-  - `csv/` - CSV import/export functionality
-  - `billing/` - In-app purchase handling
-  - `extensions/` - Kotlin extension functions
-
-#### Key Classes
-- **`Session`** (`model/realm/Session.kt`): Core session data model
-- **`HomeActivity`** (`ui/activity/HomeActivity.kt`): Main app entry point with tab navigation
-- **`PokerAnalyticsApplication`**: Application class handling initialization
-
-### Database Architecture
-The app uses **Realm** database with these key entities:
-- `Session` - Individual poker sessions
-- `Bankroll` - Bankroll management
-- `Result` - Session results and statistics
-- `ComputableResult` - Pre-computed statistics for performance
-- `Filter` - Saved filter configurations
-- `HandHistory` - Hand-by-hand game data
-
-### UI Architecture
-- **MVVM pattern** with Android Architecture Components
-- **Fragment-based navigation** with bottom navigation tabs
-- **Custom RecyclerView adapters** for data presentation
-- **Material Design** components
-
-## Key Technologies
-
-### Core Dependencies
-- **Realm Database** (10.15.1) - Local data storage
-- **Kotlin Coroutines** - Asynchronous programming
-- **Firebase Crashlytics** - Crash reporting and analytics
-- **Material Design Components** - UI framework
-- **MPAndroidChart** - Data visualization
-- **CameraX** - Image capture functionality
-
-### Testing
-- **JUnit** for unit testing
-- **Android Instrumented Tests** for integration testing
-- Test files located in `app/src/androidTest/` and `app/src/test/`
-
-## Development Guidelines
-
-### Working with Sessions
-- Sessions are the core data model representing individual poker games
-- Use `Session.newInstance()` to create new sessions properly
-- Always call `computeStats()` after modifying session data
-- Sessions can be in various states: PENDING, STARTED, PAUSED, ENDED
-
-### Database Operations
-- Use Realm transactions for data modifications
-- The app uses schema version 14 - increment when making schema changes
-- Migration logic is in `PokerAnalyticsMigration.kt`
-
-### Testing Data
-- Use `FakeDataManager.createFakeSessions()` for generating test data
-- Seed data is available through the `Seed` class
-
-### Build Variants
-- **standard** - Main production flavor
-- Release builds are optimized and obfuscated with ProGuard
-
-## Performance Considerations
-- Sessions use `ComputableResult` for pre-computed statistics
-- Large datasets are handled with Realm's lazy loading
-- Chart rendering is optimized for large data sets
-- Background processing uses Kotlin Coroutines
-
-## Security & Privacy
-- Sensitive data is encrypted in Realm database
-- Crash logging excludes personal information
-- Backup functionality includes data encryption

app/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-//apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'realm-android'
 // Crashlytics
@@ -17,8 +17,8 @@ repositories {
 
 android {
 
-    compileSdkVersion 35
+    compileSdkVersion 32
-    buildToolsVersion "30.0.3"
+    buildToolsVersion "30.0.2"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -29,13 +29,16 @@ android {
         jvmTarget = JavaVersion.VERSION_1_8
     }
 
+    lintOptions {
+        disable 'MissingTranslation'
+    }
 
     defaultConfig {
         applicationId "net.pokeranalytics.android"
         minSdkVersion 23
-        targetSdkVersion 35
+        targetSdkVersion 32
-        versionCode 180
+        versionCode 147
-        versionName "6.0.38"
+        versionName "6.0.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -88,10 +91,6 @@ android {
     buildFeatures {
         viewBinding true
     }
-    namespace 'net.pokeranalytics.android'
-    lint {
-        disable 'MissingTranslation'
-    }
 
 }
 
@@ -112,16 +111,13 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.work:work-runtime-ktx:2.7.1'
-//    implementation 'com.google.android.play:core-ktx:1.8.1' // In-app Reviews
+    implementation 'com.google.android.play:core-ktx:1.8.1' // In-app Reviews
-
-    implementation 'com.google.android.play:review:2.0.1'
-    implementation 'com.google.android.play:review-ktx:2.0.1'
 
     // Places
     implementation 'com.google.android.libraries.places:places:2.3.0'
 
     // Billing / Subscriptions
-    implementation 'com.android.billingclient:billing:7.0.0'
+    implementation 'com.android.billingclient:billing:5.0.0'
 
     // Import the BoM for the Firebase platform
     implementation platform('com.google.firebase:firebase-bom:26.1.0')
@@ -143,36 +139,16 @@ dependencies {
     implementation 'org.apache.commons:commons-math3:3.6.1'
 
     // ffmpeg for encoding video (HH export)
-//    implementation 'com.arthenica:ffmpeg-kit-min-gpl:4.4.LTS'
+    implementation 'com.arthenica:ffmpeg-kit-min-gpl:4.4.LTS'
-
-    // Camera
-    def camerax_version = "1.1.0"
-    implementation "androidx.camera:camera-core:${camerax_version}"
-    implementation "androidx.camera:camera-camera2:${camerax_version}"
-    implementation "androidx.camera:camera-lifecycle:${camerax_version}"
-    implementation "androidx.camera:camera-video:${camerax_version}"
-
-    implementation "androidx.camera:camera-view:${camerax_version}"
-    implementation "androidx.camera:camera-extensions:${camerax_version}"
-
-    // Image picking and registerForActivityResult
-    implementation 'androidx.activity:activity-ktx:1.6.1'
-    implementation "androidx.fragment:fragment-ktx:1.4.1"
-
-    // Retrofit
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-
-    // Volley
-    implementation 'com.android.volley:volley:1.2.1'
 
     // Instrumented Tests
-    androidTestImplementation 'androidx.test:core:1.6.1'
+    androidTestImplementation 'androidx.test:core:1.3.0'
-    androidTestImplementation 'androidx.test:runner:1.6.2'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test:rules:1.6.1'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 
     // Test
-    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'junit:junit:4.12'
     testImplementation 'com.android.support.test:runner:1.0.2'
     testImplementation 'com.android.support.test:rules:1.0.2'
 

app/proguard-rules.pro

@@ -64,26 +64,4 @@
 -keep class com.google.j2objc.annotations.** { *; }
 
 # Enum
--optimizations !class/unboxing/enum
+-optimizations !class/unboxing/enum
-
-# Serialization
--keepattributes *Annotation*, InnerClasses
--dontnote kotlinx.serialization.AnnotationsKt # core serialization annotations
-
-# kotlinx-serialization-json specific. Add this if you have java.lang.NoClassDefFoundError kotlinx.serialization.json.JsonObjectSerializer
--keepclassmembers class kotlinx.serialization.json.** {
-    *** Companion;
-}
--keepclasseswithmembers class kotlinx.serialization.json.** {
-    kotlinx.serialization.KSerializer serializer(...);
-}
-
--keep,includedescriptorclasses class net.pokeranalytics.android.**$$serializer { *; }
--keepclassmembers class net.pokeranalytics.android.** {
-    *** Companion;
-}
--keepclasseswithmembers class net.pokeranalytics.android.** {
-    kotlinx.serialization.KSerializer serializer(...);
-}
-
-

app/src/androidTest/java/net/pokeranalytics/android/performanceTests/PerfsInstrumentedUnitTest.kt

@@ -39,8 +39,7 @@ class PerfsInstrumentedUnitTest : RealmInstrumentedUnitTest() {
 		Seed(app).execute(realm)
 		realm.commitTransaction()
 
-
+		FakeDataManager.createFakeSessions(5000) { success ->
-		FakeDataManager.createFakeSessions(5000) {success ->
 
 			if (success) {
 

app/src/debug/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="net.pokeranalytics.android">
 
 	<!-- Add WRITE_EXTERNAL_STORAGE only for debug / test -->
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

app/src/main/AndroidManifest.xml

@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
-
+    package="net.pokeranalytics.android">
-    <uses-permission android:name="android.permission.CAMERA" />
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
 
-    <uses-feature android:name="android.hardware.camera.any" android:required="false" />
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
-<!--    <uses-feature android:name="android.hardware.camera" android:required="false" />-->
 
     <application
         android:name=".PokerAnalyticsApplication"
@@ -62,186 +59,135 @@
 
         </activity>
 
-        <!-- DatabaseCopyActivity is only used in development for now -->
-
-<!--        <activity android:name=".ui.activity.DatabaseCopyActivity"-->
-<!--            android:launchMode="singleTop"-->
-<!--            android:screenOrientation="portrait"-->
-<!--            android:exported="true">-->
-
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.VIEW" />-->
-<!--                <category android:name="android.intent.category.DEFAULT" />-->
-
-<!--                <data android:scheme="content" />-->
-<!--                <data android:scheme="file" />-->
-<!--                <data android:mimeType="*/*" />-->
-<!--            </intent-filter>-->
-
-<!--        </activity>-->
-
         <activity
             android:name="net.pokeranalytics.android.ui.modules.session.SessionActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <!-- No screenOrientation="portrait" to fix Oreo crash -->
         <activity
             android:name="net.pokeranalytics.android.ui.modules.feed.NewDataMenuActivity"
             android:launchMode="singleTop"
-            android:theme="@style/PokerAnalyticsTheme.MenuDialog"
+            android:theme="@style/PokerAnalyticsTheme.MenuDialog" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.bankroll.BankrollActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateAlwaysHidden"
+            android:windowSoftInputMode="stateAlwaysHidden"/>
-            android:exported="true"/>
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.bankroll.BankrollDetailsActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.Top10Activity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.SettingsActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.GraphActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ProgressReportActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ComparisonReportActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.calendar.CalendarDetailsActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ComparisonChartActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.datalist.DataListActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.filter.FiltersListActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.data.EditableDataActivity"
             android:launchMode="standard"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.CurrenciesActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.filter.FiltersActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.GDPRActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.BillingActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ReportCreationActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.TableReportActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.settings.DealtHandsPerHourActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.calendar.GridCalendarActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.settings.TransactionFilterActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <!-- No screenOrientation="portrait" to fix Oreo crash -->
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ColorPickerActivity"
             android:theme="@style/PokerAnalyticsTheme.AlertDialog"
-            android:launchMode="singleTop"
+            android:launchMode="singleTop"/>
-            android:exported="true"/>
-
-        <activity
-            android:name="net.pokeranalytics.android.ui.activity.components.CameraActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:exported="true" />
 
-        <service
+        <service android:name="net.pokeranalytics.android.ui.modules.handhistory.replayer.ReplayExportService" android:exported="false"/>
-            android:name="net.pokeranalytics.android.ui.modules.handhistory.replayer.ReplayExportService"
-            android:exported="false"/>
 
         <meta-data
             android:name="preloaded_fonts"

app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt

@@ -15,7 +15,11 @@ import net.pokeranalytics.android.model.migrations.Patcher
 import net.pokeranalytics.android.model.migrations.PokerAnalyticsMigration
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.model.utils.Seed
-import net.pokeranalytics.android.util.*
+import net.pokeranalytics.android.model.utils.SessionSetManager
+import net.pokeranalytics.android.util.CrashLogging
+import net.pokeranalytics.android.util.FakeDataManager
+import net.pokeranalytics.android.util.PokerAnalyticsLogs
+import net.pokeranalytics.android.util.UserDefaults
 import net.pokeranalytics.android.util.billing.AppGuard
 import timber.log.Timber
 import java.util.*
@@ -24,7 +28,6 @@ import java.util.*
 class PokerAnalyticsApplication : Application() {
 
 	var reportWhistleBlower: ReportWhistleBlower? = null
-	var backupOperator: BackupOperator? = null
 
 	companion object {
 
@@ -51,8 +54,7 @@ class PokerAnalyticsApplication : Application() {
 		Realm.init(this)
 		val realmConfiguration = RealmConfiguration.Builder()
 			.name(Realm.DEFAULT_REALM_NAME)
-			.schemaVersion(14)
+			.schemaVersion(15)
-			.allowWritesOnUiThread(true)
 			.migration(PokerAnalyticsMigration())
 			.initialData(Seed(this))
 			.build()
@@ -81,19 +83,12 @@ class PokerAnalyticsApplication : Application() {
 
 		// Report
 		this.reportWhistleBlower = ReportWhistleBlower(this.applicationContext)
-
+		SessionSetManager.configure()
-		// Backups
-		this.backupOperator = BackupOperator(this.applicationContext)
 
 		// Infos
 		val locale = Locale.getDefault()
 		CrashLogging.log("Country: ${locale.country}, language: ${locale.language}")
 
-
-//		Realm.getDefaultInstance().executeTransaction {
-//			it.delete(Performance::class.java)
-//		}
-
 	}
 
 	/**
@@ -106,7 +101,7 @@ class PokerAnalyticsApplication : Application() {
 		realm.close()
 
 		if (sessionsCount < 10) {
-			CoroutineScope(context = Dispatchers.IO).launch {
+			CoroutineScope(Dispatchers.Default).launch {
 				FakeDataManager.createFakeSessions(500)
 			}
 		}

app/src/main/java/net/pokeranalytics/android/api/BackupApi.kt

@@ -1,75 +0,0 @@
-package net.pokeranalytics.android.api
-
-import android.content.Context
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import net.pokeranalytics.android.util.CrashLogging
-import net.pokeranalytics.android.util.extensions.isNetworkAvailable
-import okhttp3.MediaType
-import okhttp3.MultipartBody
-import okhttp3.RequestBody
-import retrofit2.Call
-import retrofit2.Retrofit
-import retrofit2.http.Multipart
-import retrofit2.http.POST
-import retrofit2.http.Part
-import timber.log.Timber
-
-object RetrofitClient {
-    private const val BASE_URL = "https://www.pokeranalytics.net/backup/"
-    fun getClient(): Retrofit =
-        Retrofit.Builder()
-            .baseUrl(BASE_URL)
-            .build()
-
-}
-
-class BackupService {
-    private val retrofit = RetrofitClient.getClient()
-    val backupApi: MyBackupApi = retrofit.create(MyBackupApi::class.java)
-}
-
-interface MyBackupApi {
-    @Multipart
-    @POST("send")
-    fun postFile(@Part mail: MultipartBody.Part, @Part fileBody: MultipartBody.Part): Call<Void>
-}
-
-object BackupApi {
-
-    private val service = BackupService()
-
-    // curl -F recipient=laurent@staxriver.com -F file=@test.txt https://www.pokeranalytics.net/backup/send
-    suspend fun backupFile(context: Context, mail: String, fileName: String, fileContent: String): Boolean {
-
-        val filePart = MultipartBody.Part.createFormData(
-            "file",
-            fileName,
-            RequestBody.create(MediaType.parse("text/csv"), fileContent)
-        )
-
-        val mailPart = MultipartBody.Part.createFormData("recipient", mail)
-
-        return if (context.isNetworkAvailable()) {
-            var success = false
-            val job = CoroutineScope(context = Dispatchers.IO).async {
-                success = try {
-                    val response = service.backupApi.postFile(mailPart, filePart).execute()
-                    Timber.d("response code = ${response.code()}")
-                    Timber.d("success = ${response.isSuccessful}")
-                    true
-                } catch (e: Exception) {
-                    Timber.d("!!! backup failed: ${e.message}")
-                    CrashLogging.logException(e)
-                    false
-                }
-            }
-            job.await()
-            return success
-        } else {
-            false
-        }
-    }
-
-}

app/src/main/java/net/pokeranalytics/android/api/CurrencyConverterApi.kt

@@ -1,7 +1,6 @@
 package net.pokeranalytics.android.api
 
 import android.content.Context
-import androidx.annotation.Keep
 import com.android.volley.VolleyError
 import com.android.volley.toolbox.StringRequest
 import com.android.volley.toolbox.Volley
@@ -10,11 +9,8 @@ import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import timber.log.Timber
 
-@Keep
 @Serializable
 data class RateResponse(var info: RateInfo)
-
-@Keep
 @Serializable
 data class RateInfo(var rate: Double)
 
@@ -22,13 +18,18 @@ class CurrencyConverterApi {
 
 	companion object {
 
-		val json = Json { ignoreUnknownKeys = true }
+		private val json = Json { ignoreUnknownKeys = true }
 
 		fun currencyRate(fromCurrency: String, toCurrency: String, context: Context, callback: (Double?, VolleyError?) -> (Unit)) {
 
 			val queue = Volley.newRequestQueue(context)
+//			val url = "https://free.currconv.com/api/v7/convert?q=${pair}&compact=ultra&apiKey=9b56e742a75392c8aeb7"
+
 			val url = "https://api.apilayer.com/exchangerates_data/convert?to=$toCurrency&from=$fromCurrency&amount=1"
 
+			// https://free.currconv.com/api/v7/convert?q=GBP_USD&compact=ultra&apiKey=5ba8d38995282fe8b1c8
+			// { "USD_PHP": 44.1105, "PHP_USD": 0.0227 }
+
 			Timber.d("Api call = $url")
 
 			val stringRequest = object : StringRequest(

app/src/main/java/net/pokeranalytics/android/api/MultipartRequest.kt

@@ -1,242 +0,0 @@
-package net.pokeranalytics.android.api
-
-import com.android.volley.*
-import com.android.volley.toolbox.HttpHeaderParser
-import java.io.*
-
-
-open class VolleyMultipartRequest : Request<NetworkResponse?> {
-
-    private val twoHyphens = "--"
-    private val lineEnd = "\r\n"
-    private val boundary = "apiclient-" + System.currentTimeMillis()
-    private var mListener: Response.Listener<NetworkResponse>
-    private var mErrorListener: Response.ErrorListener
-    private var mHeaders: Map<String, String>? = null
-    private var byteData: Map<String, DataPart>? = null
-
-    /**
-     * Default constructor with predefined header and post method.
-     *
-     * @param url           request destination
-     * @param headers       predefined custom header
-     * @param listener      on success achieved 200 code from request
-     * @param errorListener on error http or library timeout
-     */
-    constructor(
-        url: String?, headers: Map<String, String>?,
-        byteData: Map<String, DataPart>,
-        listener: Response.Listener<NetworkResponse>,
-        errorListener: Response.ErrorListener
-    ) : super(Method.POST, url, errorListener) {
-        mListener = listener
-        this.mErrorListener = errorListener
-        mHeaders = headers
-        this.byteData = byteData
-    }
-
-    /**
-     * Constructor with option method and default header configuration.
-     *
-     * @param method        method for now accept POST and GET only
-     * @param url           request destination
-     * @param listener      on success event handler
-     * @param errorListener on error event handler
-     */
-    constructor(
-        method: Int, url: String?,
-        listener: Response.Listener<NetworkResponse>,
-        errorListener: Response.ErrorListener
-    ) : super(method, url, errorListener) {
-        mListener = listener
-        this.mErrorListener = errorListener
-    }
-
-    @Throws(AuthFailureError::class)
-    override fun getHeaders(): Map<String, String> {
-        return if (mHeaders != null) mHeaders!! else super.getHeaders()
-    }
-
-    override fun getBodyContentType(): String {
-        return "multipart/form-data;boundary=$boundary"
-    }
-
-    @Throws(AuthFailureError::class)
-    override fun getBody(): ByteArray? {
-        val bos = ByteArrayOutputStream()
-        val dos = DataOutputStream(bos)
-        try {
-            // populate text payload
-            val params = params
-            if (params != null && params.isNotEmpty()) {
-                textParse(dos, params, paramsEncoding)
-            }
-
-            // populate data byte payload
-            val data =
-                byteData
-            if (data != null && data.isNotEmpty()) {
-                dataParse(dos, data)
-            }
-
-            // close multipart form data after text and file data
-            dos.writeBytes(twoHyphens + boundary + twoHyphens + lineEnd)
-            return bos.toByteArray()
-        } catch (e: IOException) {
-            e.printStackTrace()
-        }
-        return null
-    }
-
-    override fun parseNetworkResponse(response: NetworkResponse?): Response<NetworkResponse?> {
-        return try {
-            Response.success(
-                response,
-                HttpHeaderParser.parseCacheHeaders(response)
-            )
-        } catch (e: Exception) {
-            Response.error(ParseError(e))
-        }
-    }
-
-    override fun deliverResponse(response: NetworkResponse?) {
-        mListener.onResponse(response)
-    }
-
-    override fun deliverError(error: VolleyError?) {
-        mErrorListener.onErrorResponse(error)
-    }
-
-    /**
-     * Parse string map into data output stream by key and value.
-     *
-     * @param dataOutputStream data output stream handle string parsing
-     * @param params           string inputs collection
-     * @param encoding         encode the inputs, default UTF-8
-     * @throws IOException
-     */
-    @Throws(IOException::class)
-    private fun textParse(
-        dataOutputStream: DataOutputStream,
-        params: Map<String, String>,
-        encoding: String
-    ) {
-        try {
-            for ((key, value) in params) {
-                buildTextPart(dataOutputStream, key, value)
-            }
-        } catch (uee: UnsupportedEncodingException) {
-            throw RuntimeException("Encoding not supported: $encoding", uee)
-        }
-    }
-
-    /**
-     * Parse data into data output stream.
-     *
-     * @param dataOutputStream data output stream handle file attachment
-     * @param data             loop through data
-     * @throws IOException
-     */
-    @Throws(IOException::class)
-    private fun dataParse(dataOutputStream: DataOutputStream, data: Map<String, DataPart>) {
-        for ((key, value) in data) {
-            buildDataPart(dataOutputStream, value, key)
-        }
-    }
-
-    /**
-     * Write string data into header and data output stream.
-     *
-     * @param dataOutputStream data output stream handle string parsing
-     * @param parameterName    name of input
-     * @param parameterValue   value of input
-     * @throws IOException
-     */
-    @Throws(IOException::class)
-    private fun buildTextPart(
-        dataOutputStream: DataOutputStream,
-        parameterName: String,
-        parameterValue: String
-    ) {
-        dataOutputStream.writeBytes(twoHyphens + boundary + lineEnd)
-        dataOutputStream.writeBytes("Content-Disposition: form-data; name=\"$parameterName\"$lineEnd")
-        //dataOutputStream.writeBytes("Content-Type: text/plain; charset=UTF-8" + lineEnd);
-        dataOutputStream.writeBytes(lineEnd)
-        dataOutputStream.writeBytes(parameterValue + lineEnd)
-    }
-
-    /**
-     * Write data file into header and data output stream.
-     *
-     * @param dataOutputStream data output stream handle data parsing
-     * @param dataFile         data byte as DataPart from collection
-     * @param inputName        name of data input
-     * @throws IOException
-     */
-    @Throws(IOException::class)
-    private fun buildDataPart(
-        dataOutputStream: DataOutputStream,
-        dataFile: DataPart,
-        inputName: String
-    ) {
-        dataOutputStream.writeBytes(twoHyphens + boundary + lineEnd)
-        dataOutputStream.writeBytes(
-            "Content-Disposition: form-data; name=\"" +
-                    inputName + "\"; filename=\"" + dataFile.fileName + "\"" + lineEnd
-        )
-        if (dataFile.type != null && !dataFile.type!!.trim { it <= ' ' }.isEmpty()) {
-            dataOutputStream.writeBytes("Content-Type: " + dataFile.type + lineEnd)
-        }
-        dataOutputStream.writeBytes(lineEnd)
-        val fileInputStream = ByteArrayInputStream(dataFile.content)
-        var bytesAvailable: Int = fileInputStream.available()
-        val maxBufferSize = 1024 * 1024
-        var bufferSize = Math.min(bytesAvailable, maxBufferSize)
-        val buffer = ByteArray(bufferSize)
-        var bytesRead: Int = fileInputStream.read(buffer, 0, bufferSize)
-        while (bytesRead > 0) {
-            dataOutputStream.write(buffer, 0, bufferSize)
-            bytesAvailable = fileInputStream.available()
-            bufferSize = Math.min(bytesAvailable, maxBufferSize)
-            bytesRead = fileInputStream.read(buffer, 0, bufferSize)
-        }
-        dataOutputStream.writeBytes(lineEnd)
-    }
-
-    /**
-     * Simple data container use for passing byte file
-     */
-    class DataPart {
-
-        var fileName: String? = null
-
-        var content: ByteArray? = null
-
-        var type: String? = null
-
-        /**
-         * Constructor with data.
-         *
-         * @param name label of data
-         * @param data byte data
-         */
-        constructor(name: String?, data: ByteArray) {
-            fileName = name
-            content = data
-        }
-
-        /**
-         * Constructor with mime data type.
-         *
-         * @param name     label of data
-         * @param data     byte data
-         * @param mimeType mime data like "image/jpeg"
-         */
-        constructor(name: String?, data: ByteArray, mimeType: String?) {
-            fileName = name
-            content = data
-            type = mimeType
-        }
-    }
-
-}

app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt

@@ -382,7 +382,6 @@ class Calculator {
 					results.addEvolutionValue(tSum / index, stat = AVERAGE, data = session)
 					results.addEvolutionValue(index.toDouble(), stat = NUMBER_OF_GAMES, data = session)
 					results.addEvolutionValue(tBBSum / tBBSessionCount, stat = AVERAGE_NET_BB, data = session)
-					results.addEvolutionValue(tBBSum, stat = BB_NET_RESULT, data = session)
 					results.addEvolutionValue(
 						(tWinningSessionCount.toDouble() / index.toDouble()),
 						stat = WIN_RATIO,

app/src/main/java/net/pokeranalytics/android/calculus/ReportWhistleBlower.kt

@@ -9,14 +9,13 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import net.pokeranalytics.android.calculus.optimalduration.CashGameOptimalDurationCalculator
+import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.LiveOnline
 import net.pokeranalytics.android.model.realm.*
 import net.pokeranalytics.android.ui.view.rows.StaticReport
-import net.pokeranalytics.android.util.CrashLogging
+import net.pokeranalytics.android.util.Global
 import net.pokeranalytics.android.util.extensions.formattedHourlyDuration
 import timber.log.Timber
-import kotlin.coroutines.CoroutineContext
-
 
 interface NewPerformanceListener {
     fun newBestPerformanceHandler()
@@ -26,6 +25,7 @@ class ReportWhistleBlower(var context: Context) {
 
     private var sessions: RealmResults<Session>? = null
     private var results: RealmResults<Result>? = null
+    private var sessionSets: RealmResults<SessionSet>? = null
 
     private var currentTask: ReportTask? = null
 
@@ -33,7 +33,7 @@ class ReportWhistleBlower(var context: Context) {
 
     private val listeners: MutableList<NewPerformanceListener> = mutableListOf()
 
-    var paused: Boolean = false
+    private var paused: Boolean = true
 
     private var timer: CountDownTimer? = null
 
@@ -51,6 +51,11 @@ class ReportWhistleBlower(var context: Context) {
             requestReportLaunch()
         }
 
+        this.sessionSets = realm.where(SessionSet::class.java).findAll()
+        this.sessionSets?.addChangeListener { _ ->
+            requestReportLaunch()
+        }
+
         realm.close()
     }
 
@@ -66,7 +71,6 @@ class ReportWhistleBlower(var context: Context) {
 //        Timber.d(">>> Launch report")
 
         if (paused) {
-            CrashLogging.log("can't start reports comparisons because of paused state")
             return
         }
 
@@ -133,24 +137,20 @@ class ReportTask(private var whistleBlower: ReportWhistleBlower, var context: Co
 
     private var cancelled = false
 
-    var handler: (() -> Unit)? = null
-
-    private val coroutineContext: CoroutineContext
-        get() = Dispatchers.Default
-
     fun start() {
-        messages.add("Starting task...")
         launchReports()
     }
 
     fun cancel() {
+        Timber.d("Reportwhistleblower task CANCEL")
         this.cancelled = true
     }
 
-    var messages: MutableList<String> = mutableListOf()
-
     private fun launchReports() {
-        CoroutineScope(coroutineContext).launch {
+
+        Timber.d("====== Report whistleblower launch batch...")
+
+        CoroutineScope(Dispatchers.Default).launch {
 
             val realm = Realm.getDefaultInstance()
 
@@ -164,7 +164,8 @@ class ReportTask(private var whistleBlower: ReportWhistleBlower, var context: Co
 
             // CustomField
             val customFields = realm.where(CustomField::class.java)
-                .equalTo("type", CustomField.Type.LIST.uniqueIdentifier).findAll()
+                .equalTo("type", CustomField.Type.LIST.uniqueIdentifier)
+                .findAll()
             for (customField in customFields) {
                 if (cancelled) {
                     break
@@ -197,21 +198,17 @@ class ReportTask(private var whistleBlower: ReportWhistleBlower, var context: Co
     }
 
     private fun launchOptimalDuration(realm: Realm, report: StaticReport) {
-        LiveOnline.entries.forEach { key ->
+        LiveOnline.values().forEach { key ->
             val duration = CashGameOptimalDurationCalculator.start(key.isLive)
             analyseOptimalDuration(realm, report, key, duration)
         }
-
-        this.handler?.let { it() }
     }
 
     private fun analyseDefaultReport(realm: Realm, staticReport: StaticReport, result: Report) {
 
-        messages.add("Analyse report $staticReport...")
-
         val nameSeparator = " "
 
-        for (stat in result.options.stats) {
+        for (stat in staticReport.performanceStats) {
 
 //            Timber.d("analyse stat: $stat for report: $staticReport")
 
@@ -228,17 +225,15 @@ class ReportTask(private var whistleBlower: ReportWhistleBlower, var context: Co
             // Store if necessary, delete if necessary
             val bestComputedResults = result.max(stat)
             bestComputedResults?.let { computedResults ->
-                messages.add("found new perf...")
 
                 val performanceQuery = computedResults.group.query
                 val performanceName = performanceQuery.getName(this.context, nameSeparator)
 
-                Timber.d("Best computed = $performanceName, ${computedResults.computedStat(Stat.NET_RESULT)?.value}")
+                val count = computedResults.computedStat(Stat.NUMBER_OF_GAMES)?.value?.toInt() ?: throw PAIllegalStateException("Number of games not found")
+                val notify = !(stat.hasEarlyVariance && count < 10)
 
                 var storePerf = true
                 currentPerf?.let {
-                    messages.add("has current perf...")
-
                     currentPerf.name?.let { name ->
                         if (computedResults.group.query.getName(this.context, nameSeparator) == name) {
                             storePerf = false
@@ -256,11 +251,13 @@ class ReportTask(private var whistleBlower: ReportWhistleBlower, var context: Co
                             currentPerf.objectId = performanceQuery.objectId
                             currentPerf.customFieldId = customField?.id
                         }
-                        this.whistleBlower.notify(currentPerf)
+
+                        if (notify) {
+                            this.whistleBlower.notify(currentPerf)
+                        }
                     }
 
                 }
-                messages.add("storePerf = $storePerf...")
 
                 if (currentPerf == null && storePerf) {
                     val performance = Performance(
@@ -272,13 +269,12 @@ class ReportTask(private var whistleBlower: ReportWhistleBlower, var context: Co
                         null
                     )
                     realm.executeTransaction { it.copyToRealm(performance) }
-                    this.whistleBlower.notify(performance)
+                    if (notify) {
+                        this.whistleBlower.notify(performance)
+                    }
                 }
 
             } ?: run { // if there is no max but a now irrelevant Performance, we delete it
-
-                messages.add("deletes current perf if necessary: $currentPerf...")
-
 //                Timber.d("NO best computed value, current perf = $currentPerf ")
                 currentPerf?.let { perf ->
                     realm.executeTransaction {

app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt

@@ -208,7 +208,7 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 			HOURLY_RATE_BB, AVERAGE_NET_BB, ROI, HOURLY_RATE -> R.string.average
 			NUMBER_OF_SETS -> R.string.number_of_sessions
 			NUMBER_OF_GAMES -> R.string.number_of_records
-			NET_RESULT, BB_NET_RESULT -> R.string.total
+			NET_RESULT -> R.string.total
 			STANDARD_DEVIATION -> R.string.net_result
 			STANDARD_DEVIATION_BB -> R.string.average_net_result_bb_
 			STANDARD_DEVIATION_HOURLY -> R.string.hour_rate_without_pauses
@@ -319,6 +319,14 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 			}
 		}
 
+	val hasEarlyVariance: Boolean
+		get() {
+			return when (this) {
+				HOURLY_RATE, AVERAGE, AVERAGE_NET_BB, AVERAGE_BUYIN, AVERAGE_HOURLY_DURATION -> true
+				else -> false
+			}
+		}
+
 	private val hasProgressValues: Boolean
 		get() {
 			return when (this) {

app/src/main/java/net/pokeranalytics/android/calculus/bankroll/BankrollReportManager.kt

@@ -2,10 +2,7 @@ package net.pokeranalytics.android.calculus.bankroll
 
 import io.realm.Realm
 import io.realm.RealmResults
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.*
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
 import net.pokeranalytics.android.model.realm.Bankroll
 import net.pokeranalytics.android.model.realm.ComputableResult
 import net.pokeranalytics.android.model.realm.Transaction
@@ -15,9 +12,6 @@ import kotlin.coroutines.CoroutineContext
 
 object BankrollReportManager {
 
-	private val coroutineContext: CoroutineContext
-		get() = Dispatchers.Main
-
 	private var reports: MutableMap<String?, BankrollReport> = mutableMapOf()
 
 	private var computableResults: RealmResults<ComputableResult>
@@ -68,12 +62,12 @@ object BankrollReportManager {
 		}
 
 		// otherwise compute it
-		GlobalScope.launch(coroutineContext) {
+		CoroutineScope(Dispatchers.Main).launch {
 
 			var report: BankrollReport? = null
-			val coroutine = GlobalScope.async {
+			val coroutine = CoroutineScope(Dispatchers.Default).async {
-				val s = Date()
+//				val s = Date()
-				Timber.d(">>>>> start computing bankroll...")
+//				Timber.d(">>>>> start computing bankroll...")
 
 				val realm = Realm.getDefaultInstance()
 
@@ -82,9 +76,9 @@ object BankrollReportManager {
 
 				realm.close()
 
-				val e = Date()
+//				val e = Date()
-				val duration = (e.time - s.time) / 1000.0
+//				val duration = (e.time - s.time) / 1000.0
-				Timber.d(">>>>> ended in $duration seconds")
+//				Timber.d(">>>>> ended in $duration seconds")
 
 			}
 			coroutine.await()

app/src/main/java/net/pokeranalytics/android/calculus/optimalduration/CashGameOptimalDurationCalculator.kt

@@ -64,7 +64,7 @@ class CashGameOptimalDurationCalculator {
             var end: Double? = null
             var validBuckets = 0
 
-            val hkeys = sessionsByDuration.keys.map { it / 3600 / 1000.0 }.sorted()
+//            val hkeys = sessionsByDuration.keys.map { it / 3600 / 1000.0 }.sorted()
 //            Timber.d("Stop notif > keys: $hkeys ")
             for (key in sessionsByDuration.keys.sorted()) {
                 val sessionCount = sessionsByDuration[key]?.size ?: 0

app/src/main/java/net/pokeranalytics/android/exceptions/Exceptions.kt

@@ -11,6 +11,7 @@ class ConfigurationException(message: String) : Exception(message)
 class EnumIdentifierNotFoundException(message: String) : Exception(message)
 class MisconfiguredSavableEnumException(message: String) : Exception(message)
 class PAIllegalStateException(message: String) : Exception(message)
+class PADataModelException(message: String) : Exception(message)
 
 sealed class PokerAnalyticsException(message: String) : Exception(message) {
     object FilterElementUnknownName : PokerAnalyticsException(message = "No filterElement name was found to identify the queryCondition")

app/src/main/java/net/pokeranalytics/android/model/Criteria.kt

@@ -68,7 +68,6 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row
 	            realm.findById(CustomField::class.java, this.customFieldId)?.entries?.forEach {
 		            objects.add(QueryCondition.CustomFieldListQuery(it))
 	            }
-                objects.sort()
                 realm.close()
                 return objects.map { Query(it) }
             }

app/src/main/java/net/pokeranalytics/android/model/LiveData.kt

@@ -8,7 +8,7 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.interfaces.Deletable
 import net.pokeranalytics.android.model.realm.*
 import net.pokeranalytics.android.model.realm.handhistory.HandHistory
-import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
+import net.pokeranalytics.android.ui.modules.data.*
 import net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity
 import net.pokeranalytics.android.ui.view.Localizable
 import net.pokeranalytics.android.util.extensions.findById
@@ -30,7 +30,11 @@ enum class LiveData : Localizable {
 	PLAYER,
 	HAND_HISTORY;
 
-    var subType:Int? = null
+    var subType: Int? = null
+
+	fun instanceFromOrdinal(ordinal: Int): LiveData {
+		return values()[ordinal]
+	}
 
 	val relatedEntity: Class<out Deletable>
 		get() {
@@ -52,10 +56,10 @@ enum class LiveData : Localizable {
 
 	fun updateOrCreate(realm: Realm, primaryKey: String?): Deletable {
 		val proxyItem: Deletable? = this.getData(realm, primaryKey)
-		proxyItem?.let {
+		return proxyItem?.let {
-			return realm.copyFromRealm(it)
+			realm.copyFromRealm(it)
 		} ?: run {
-			return this.newEntity()
+			this.newEntity()
 		}
 	}
 
@@ -186,4 +190,17 @@ enum class LiveData : Localizable {
 			}
 		}
 
+	val dataFragment: EditableDataFragment
+		get() {
+			return when (this) {
+				BANKROLL -> BankrollDataFragment()
+				LOCATION -> LocationDataFragment()
+				TRANSACTION -> TransactionDataFragment()
+				CUSTOM_FIELD -> CustomFieldDataFragment()
+				TRANSACTION_TYPE -> TransactionTypeDataFragment()
+				PLAYER -> PlayerDataFragment()
+				else -> EditableDataFragment()
+			}
+		}
+
 }

app/src/main/java/net/pokeranalytics/android/model/extensions/SessionExtensions.kt

@@ -2,7 +2,6 @@ package net.pokeranalytics.android.model.extensions
 
 import android.content.Context
 import androidx.work.Data
-import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import net.pokeranalytics.android.R
@@ -120,7 +119,7 @@ fun Session.scheduleStopNotification(context: Context, optimalDuration: Long) {
 		.addTag(this.id)
 		.build()
 
-	WorkManager.getInstance(context).enqueueUniqueWork(this.id, ExistingWorkPolicy.REPLACE, work)
+	WorkManager.getInstance(context).enqueue(work)
 
 }
 

app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt

@@ -723,7 +723,7 @@ sealed class QueryCondition : RowRepresentable {
 
 		constructor(customFieldEntry: CustomFieldEntry) : this() {
 			this.setObject(customFieldEntry)
-			this.customFieldId = customFieldEntry.customField?.id
+			this.customFieldId = customFieldEntry.managedCustomField?.id
 				?: throw PokerAnalyticsException.QueryValueMapUnexpectedValue
 		}
 

app/src/main/java/net/pokeranalytics/android/model/interfaces/StakesHolder.kt

@@ -90,10 +90,7 @@ data class CodedStake(var stakes: String) : Comparable<CodedStake> {
     fun formattedStakes(): String {
         val components = arrayListOf<String>()
         this.formattedBlinds()?.let { components.add(it) }
-
+        this.formattedAnte()?.let { components.add("($it)") }
-        if ((this.ante ?: -1.0) > 0.0) {
-            this.formattedAnte()?.let { components.add("($it)") }
-        }
 
         return if (components.isNotEmpty()) {
             components.joinToString(" ")

app/src/main/java/net/pokeranalytics/android/model/migrations/Patcher.kt

@@ -68,10 +68,9 @@ class Patcher {
 		private fun patchMissingTransactionTypes(context: Context) {
 			val realm = Realm.getDefaultInstance()
 
-			val transactionTypes = TransactionType.Value.values()
+			realm.executeTransactionAsync { asyncRealm ->
-
+				val transactionTypes = TransactionType.Value.values()
-			realm.executeTransaction {
+				Seed.createDefaultTransactionTypes(transactionTypes, context, asyncRealm)
-				Seed.createDefaultTransactionTypes(transactionTypes, context, realm)
 			}
 
 			realm.close()
@@ -80,11 +79,12 @@ class Patcher {
 		private fun patchBreaks() {
 
 			val realm = Realm.getDefaultInstance()
-			val sets = realm.where(SessionSet::class.java).findAll()
+			realm.executeTransactionAsync { asyncRealm ->
-			val sessions = Filter.queryOn<Session>(realm, Query(QueryCondition.IsCash))
+
-			val results = realm.where(Result::class.java).findAll()
+				val sets = asyncRealm.where(SessionSet::class.java).findAll()
+				val sessions = Filter.queryOn<Session>(asyncRealm, Query(QueryCondition.IsCash))
+				val results = asyncRealm.where(Result::class.java).findAll()
 
-			realm.executeTransaction {
 				sets.forEach {
 					it.computeStats()
 				}
@@ -98,13 +98,12 @@ class Patcher {
 			}
 
 			realm.close()
-
 		}
 
 		private fun patchDefaultTransactionTypes(context: Context) {
 			val realm = Realm.getDefaultInstance()
-			realm.executeTransaction {
+			realm.executeTransactionAsync { asyncRealm ->
-				val tts = realm.where(TransactionType::class.java).findAll()
+				val tts = asyncRealm.where(TransactionType::class.java).findAll()
 				tts.forEach { tt ->
 					tt.kind?.let { kind ->
 						val value = TransactionType.Value.values()[kind]
@@ -117,8 +116,8 @@ class Patcher {
 
 		private fun patchStakes() {
 			val realm = Realm.getDefaultInstance()
-			realm.executeTransaction {
+			realm.executeTransactionAsync { asyncRealm ->
-				val sessions = realm.where(Session::class.java).findAll()
+				val sessions = asyncRealm.where(Session::class.java).findAll()
 				sessions.forEach { session ->
 					val blinds = arrayListOf(session.cgOldSmallBlind, session.cgOldBigBlind).filterNotNull()
 					val blindsFormatted = blinds.map { NumberFormat.getInstance().format(it) }
@@ -128,7 +127,7 @@ class Patcher {
 					}
 				}
 
-				val handHistories = realm.where(HandHistory::class.java).findAll()
+				val handHistories = asyncRealm.where(HandHistory::class.java).findAll()
 				handHistories.forEach { hh ->
 					val blinds = arrayListOf(hh.oldSmallBlind, hh.oldBigBlind).filterNotNull()
 					val blindsFormatted = blinds.map { NumberFormat.getInstance().format(it) }
@@ -143,8 +142,8 @@ class Patcher {
 
 		private fun patchNegativeLimits() {
 			val realm = Realm.getDefaultInstance()
-			realm.executeTransaction {
+			realm.executeTransactionAsync { asyncRealm ->
-				val sessions = realm.where(Session::class.java).lessThan("limit", 0).findAll()
+				val sessions = asyncRealm.where(Session::class.java).lessThan("limit", 0).findAll()
 				sessions.forEach { session ->
 					session.limit = null
 				}
@@ -154,10 +153,10 @@ class Patcher {
 
 		private fun cleanBlindsFilters() {
 			val realm = Realm.getDefaultInstance()
-			realm.executeTransaction {
+			realm.executeTransactionAsync { asyncRealm ->
-				val blindFilterConditions = realm.where(FilterCondition::class.java).equalTo("filterName", "AnyBlind").findAll()
+				val blindFilterConditions = asyncRealm.where(FilterCondition::class.java).equalTo("filterName", "AnyBlind").findAll()
 				val filterIds = blindFilterConditions.mapNotNull { it.filters?.firstOrNull() }.map { it.id }
-				val filters = realm.where(Filter::class.java).`in`("id", filterIds.toTypedArray()).findAll()
+				val filters = asyncRealm.where(Filter::class.java).`in`("id", filterIds.toTypedArray()).findAll()
 				filters.deleteAllFromRealm()
 			}
 			realm.close()
@@ -170,9 +169,9 @@ class Patcher {
 		private fun patchSessionSet() {
 			val realm = Realm.getDefaultInstance()
 
-			realm.executeTransaction {
+			realm.executeTransactionAsync { asyncRealm ->
-				realm.where(SessionSet::class.java).findAll().deleteAllFromRealm()
+				asyncRealm.where(SessionSet::class.java).findAll().deleteAllFromRealm()
-				val sessions = realm.where(Session::class.java).isNotNull("startDate").isNotNull("endDate").findAll()
+				val sessions = asyncRealm.where(Session::class.java).isNotNull("startDate").isNotNull("endDate").findAll()
 				sessions.forEach { session ->
 					SessionSetManager.updateTimeline(session)
 				}
@@ -187,8 +186,8 @@ class Patcher {
 		 */
 		private fun patchComputableResults() {
 			val realm = Realm.getDefaultInstance()
-			realm.executeTransaction {
+			realm.executeTransactionAsync { asyncRealm ->
-				val crs = realm.where(ComputableResult::class.java).findAll()
+				val crs = asyncRealm.where(ComputableResult::class.java).findAll()
 				crs.forEach { cr ->
 					cr.session?.let { cr.updateWith(it) }
 				}
@@ -210,8 +209,8 @@ class Patcher {
 		private fun patchZeroTable() {
 			val realm = Realm.getDefaultInstance()
 			val zero = 0
-			val sessions = realm.where<Session>().equalTo("numberOfTables", zero).findAll()
+			realm.executeTransactionAsync { asyncRealm ->
-			realm.executeTransaction {
+				val sessions = asyncRealm.where<Session>().equalTo("numberOfTables", zero).findAll()
 				sessions.forEach { s ->
 					s.numberOfTables = 1
 				}
@@ -221,8 +220,8 @@ class Patcher {
 
 		private fun patchRatedAmounts() {
 			val realm = Realm.getDefaultInstance()
-			val transactions = realm.where<Transaction>().findAll()
+			realm.executeTransactionAsync { asyncRealm ->
-			realm.executeTransaction {
+				val transactions = asyncRealm.where<Transaction>().findAll()
 				transactions.forEach { t ->
 					t.computeRatedAmount()
 				}

app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt

@@ -335,6 +335,15 @@ class PokerAnalyticsMigration : RealmMigration {
             currentVersion++
         }
 
+        // Migrate to version 15
+        if (currentVersion == 14) {
+            schema.get("Result")?.let { crs ->
+                crs.addField("id", String::class.java).setRequired("id", true)
+                crs.addPrimaryKey("id")
+            }
+            currentVersion++
+        }
+
     }
 
     override fun equals(other: Any?): Boolean {

app/src/main/java/net/pokeranalytics/android/model/realm/Comment.kt

@@ -42,7 +42,7 @@ open class Comment : RealmObject(), Manageable, RowRepresentable, RowUpdatable {
 	}
 
 	override fun getDisplayName(context: Context): String {
-		return if (content.isNotEmpty()) content else NULL_TEXT
+		return content.ifEmpty { NULL_TEXT }
 	}
 
 //	override fun startEditing(dataSource: Any?, parent: Fragment?) {

app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt

@@ -22,7 +22,7 @@ open class ComputableResult : RealmObject(), Filterable {
 
 	var session: Session? = null
 
-	var ratedTips: Double = 0.0
+	private var ratedTips: Double = 0.0
 
 	fun updateWith(session: Session) {
 
@@ -38,8 +38,12 @@ open class ComputableResult : RealmObject(), Filterable {
 		this.bbNet = session.bbNet
 		this.hasBigBlind = if (session.cgBiggestBet != null) 1 else 0
 		this.estimatedHands = session.estimatedHands
-		this.bbPer100Hands =
+
-			session.bbNet / (session.numberOfHandsPerHour * session.hourlyDuration) * 100
+		this.bbPer100Hands = if (this.estimatedHands > 0.0) {
+			session.bbNet / this.estimatedHands * 100
+		} else {
+			0.0
+		}
 
 	}
 

app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt

@@ -139,10 +139,6 @@ open class CustomField : RealmObject(), RowRepresentable, RowUpdatable, NameMana
 		}
 	}
 
-	override fun isValidForSave(): Boolean {
-		return super.isValidForSave()
-	}
-
 	override fun getFailedSaveMessage(status: SaveValidityStatus): Int {
 		return when (status) {
 			SaveValidityStatus.DATA_INVALID -> R.string.cf_empty_field_error
@@ -250,7 +246,7 @@ open class CustomField : RealmObject(), RowRepresentable, RowUpdatable, NameMana
 	fun cleanupEntries() { // called when saving the custom field
 
 		val realm = Realm.getDefaultInstance()
-		realm.executeTransaction {
+		realm.executeTransactionAsync {
 			this.entriesToDelete.forEach { // entries are out of realm
 				realm.where<CustomFieldEntry>().equalTo("id", it.id).findFirst()?.deleteFromRealm()
 			}
@@ -272,26 +268,6 @@ open class CustomField : RealmObject(), RowRepresentable, RowUpdatable, NameMana
 		}
 	}
 
-	/**
-	 * Clean the entries if the type is not a list & remove the deleted entries from realm
-	 */
-//	fun cleanEntries(realm: Realm) {
-//		realm.executeTransaction {
-//
-//			if (!isListType) {
-//				entriesToDelete.addAll(entries)
-//				entries.clear()
-//			}
-//
-//			// @TODO
-//			entriesToDelete.forEach {
-//				Timber.d("Delete entry: V=${it.value} N=${it.numericValue} / ID=${it.id}")
-//				realm.where<CustomFieldEntry>().equalTo("id", it.id).findFirst()?.deleteFromRealm()
-//			}
-//			entriesToDelete.clear()
-//		}
-//	}
-
 	/**
 	 * Returns a comparison criteria based on this custom field
 	 */

app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt

@@ -22,6 +22,7 @@ import net.pokeranalytics.android.ui.view.RowUpdatable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.util.NULL_TEXT
 import net.pokeranalytics.android.util.extensions.toCurrency
+import timber.log.Timber
 import java.text.NumberFormat
 import java.util.*
 import java.util.Currency
@@ -46,7 +47,7 @@ open class CustomFieldEntry : RealmObject(), NameManageable, RowRepresentable, R
 	@LinkingObjects("entries")
 	val customFields: RealmResults<CustomField>? = null
 
-	val customField: CustomField?
+	val managedCustomField: CustomField?
 		get() {
 			return this.customFields?.first()
 		}
@@ -89,7 +90,7 @@ open class CustomFieldEntry : RealmObject(), NameManageable, RowRepresentable, R
 	}
 
 	override fun getDisplayName(context: Context): String {
-		return if (value.isNotEmpty()) value else NULL_TEXT
+		return value.ifEmpty { NULL_TEXT }
 	}
 
 	override fun editingDescriptors(map: Map<String, Any?>): ArrayList<RowRepresentableEditDescriptor>? {
@@ -136,8 +137,8 @@ open class CustomFieldEntry : RealmObject(), NameManageable, RowRepresentable, R
 	/**
 	 * Return the amount
 	 */
-	fun getFormattedValue(currency: Currency? = null): String {
+	fun getFormattedValue(parentCustomField: CustomField, currency: Currency? = null): String {
-		return when (customField?.type) {
+		return when (parentCustomField.type) {
 			CustomField.Type.AMOUNT.uniqueIdentifier -> {
                 numericValue?.toCurrency(currency) ?: run { NULL_TEXT }
 			}
@@ -145,6 +146,7 @@ open class CustomFieldEntry : RealmObject(), NameManageable, RowRepresentable, R
 	            NumberFormat.getInstance().format(this.numericValue)
             }
 			else -> {
+				Timber.d("FORMATTED = $value")
 				value
 			}
 		}

app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt

@@ -77,7 +77,7 @@ open class Filter : RealmObject(), RowRepresentable, RowUpdatable, Deletable, Us
 	var filterConditions: RealmList<FilterCondition> = RealmList()
 		private set
 
-	private var filterableTypeUniqueIdentifier: Int? = null
+	var filterableTypeUniqueIdentifier: Int? = null
 
 	val filterableType: FilterableType
 		get() {
@@ -109,7 +109,7 @@ open class Filter : RealmObject(), RowRepresentable, RowUpdatable, Deletable, Us
 						val previousCondition = filterConditions.filter {
 							it.filterName == newFilterCondition.filterName && it.operator == newFilterCondition.operator
 						}
-						filterConditions.removeAll(previousCondition)
+						filterConditions.removeAll(previousCondition.toSet())
 						filterConditions.add(newFilterCondition)
 					}
 			}
@@ -118,7 +118,7 @@ open class Filter : RealmObject(), RowRepresentable, RowUpdatable, Deletable, Us
 	fun remove(filterCategoryRow: FilterCategoryRow) {
 		val sections = filterCategoryRow.filterSectionRows.map { it.name }
 		val savedSections = filterConditions.filter { sections.contains(it.sectionName) }
-		this.filterConditions.removeAll(savedSections)
+		this.filterConditions.removeAll(savedSections.toSet())
 	}
 
 	fun countBy(filterCategoryRow: FilterCategoryRow): Int {

app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt

@@ -63,16 +63,6 @@ open class FilterCondition() : RealmObject() {
         }
     }
 
-    fun <T> getv(clazz: Class<T>) : T {
-        return when (clazz) {
-            Int::class -> intValue ?: 0
-            Double::class -> doubleValue?: 0.0
-            Date::class -> dateValue ?: Date()
-            String::class -> stringValue ?: ""
-            else -> throw PokerAnalyticsException.QueryValueMapUnexpectedValue
-        } as T
-    }
-
     inline fun <reified T> getValue(): T {
         return when (T::class) {
             Int::class -> intValue ?: 0

app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt

@@ -50,13 +50,6 @@ open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSourc
 	@Ignore
 	override val ownerClass: Class<out RealmModel> = Session::class.java
 
-	fun getNotNullShortName() : String {
-		this.shortName?.let {
-			return it
-		}
-		return this.name
-	}
-
 	override fun getDisplayName(context: Context): String {
 		return this.name
 	}
@@ -71,7 +64,7 @@ open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSourc
 		tag: Int
 	): CharSequence {
 		return when (row) {
-			SimpleRow.NAME -> if (this.name.isNotEmpty()) this.name else NULL_TEXT
+			SimpleRow.NAME -> this.name.ifEmpty { NULL_TEXT }
 			GamePropertiesRow.SHORT_NAME -> this.shortName ?: NULL_TEXT
 			else -> return super.charSequenceForRow(row, context, 0)
 		}

app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt

@@ -4,20 +4,27 @@ import android.content.Context
 import io.realm.Realm
 import io.realm.RealmList
 import io.realm.RealmObject
-import io.realm.RealmResults
 import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
+import io.realm.kotlin.where
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.interfaces.*
-import net.pokeranalytics.android.model.realm.handhistory.HandHistory
+import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.view.RowRepresentable
+import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.RowUpdatable
 import net.pokeranalytics.android.ui.view.RowViewType
+import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable
 import net.pokeranalytics.android.ui.view.rows.PlayerPropertiesRow
+import net.pokeranalytics.android.ui.view.rows.SeparatorRow
+import net.pokeranalytics.android.util.NULL_TEXT
 import net.pokeranalytics.android.util.RANDOM_PLAYER
+import net.pokeranalytics.android.util.extensions.isSameDay
+import net.pokeranalytics.android.util.extensions.mediumDate
 import java.util.*
+import kotlin.collections.ArrayList
 
-open class Player : RealmObject(), NameManageable, Savable, Deletable, RowRepresentable, RowUpdatable {
+open class Player : RealmObject(), NameManageable, Savable, Deletable, StaticRowRepresentableDataSource, RowRepresentable, RowUpdatable {
 
     @PrimaryKey
     override var id = UUID.randomUUID().toString()
@@ -37,6 +44,13 @@ open class Player : RealmObject(), NameManageable, Savable, Deletable, RowRepres
     @Ignore
     override val viewType: Int = RowViewType.ROW_PLAYER.ordinal
 
+    @Ignore
+    private var rowRepresentation: List<RowRepresentable> = mutableListOf()
+
+    @Ignore
+    private var commentsToDelete: ArrayList<Comment> = ArrayList()
+
+
     override fun isValidForDelete(realm: Realm): Boolean {
         //TODO
         return true
@@ -55,16 +69,70 @@ open class Player : RealmObject(), NameManageable, Savable, Deletable, RowRepres
         return R.string.relationship_error
     }
 
+    override fun adapterRows(): List<RowRepresentable>? {
+        return rowRepresentation
+    }
+
     override fun getDisplayName(context: Context): String {
         return this.name
     }
 
+    override fun charSequenceForRow(
+	    row: RowRepresentable,
+	    context: Context,
+	    tag: Int
+    ): CharSequence {
+        return when (row) {
+            PlayerPropertiesRow.NAME -> this.name.ifEmpty { NULL_TEXT }
+            else -> return super.charSequenceForRow(row, context, 0)
+        }
+    }
+
     override fun updateValue(value: Any?, row: RowRepresentable) {
         when (row) {
             PlayerPropertiesRow.NAME -> this.name = value as String? ?: ""
             PlayerPropertiesRow.SUMMARY -> this.summary = value as String? ?: ""
-            PlayerPropertiesRow.IMAGE -> this.picture = value as? String
+            PlayerPropertiesRow.IMAGE -> this.picture = value as String? ?: ""
+        }
+    }
+
+    /**
+     * Update the row representation
+     */
+    private fun updatedRowRepresentationForCurrentState(): List<RowRepresentable> {
+        val rows = ArrayList<RowRepresentable>()
+        rows.add(PlayerPropertiesRow.IMAGE)
+        rows.add(PlayerPropertiesRow.NAME)
+        rows.add(PlayerPropertiesRow.SUMMARY)
+
+        if (comments.size > 0) {
+            // Adds Comments section
+            rows.add(CustomizableRowRepresentable(RowViewType.HEADER_TITLE, R.string.comments))
+
+            val currentCommentCalendar = Calendar.getInstance()
+            val currentDateCalendar = Calendar.getInstance()
+
+            val commentsToDisplay = ArrayList<Comment>()
+            commentsToDisplay.addAll(comments)
+            commentsToDisplay.sortByDescending { it.date }
+
+            commentsToDisplay.forEachIndexed { index, comment ->
+                currentCommentCalendar.time = comment.date
+
+                if (!currentCommentCalendar.isSameDay(currentDateCalendar) || index == 0) {
+                    currentDateCalendar.time = currentCommentCalendar.time
+                    // Adds day sub section
+                    rows.add(CustomizableRowRepresentable(RowViewType.HEADER_SUBTITLE, title = currentDateCalendar.time.mediumDate()))
+                }
+
+                // Adds comment
+                rows.add(comment)
+            }
+
+            rows.add(SeparatorRow())
         }
+
+        return rows
     }
 
     /**
@@ -74,6 +142,57 @@ open class Player : RealmObject(), NameManageable, Savable, Deletable, RowRepres
         return picture != null && picture?.isNotEmpty() == true
     }
 
+    /**
+     * Update row representation
+     */
+    fun updateRowRepresentation() {
+        this.rowRepresentation = this.updatedRowRepresentationForCurrentState()
+    }
+
+
+    /**
+     * Add an entry
+     */
+    fun addComment(): Comment {
+        val entry = Comment()
+        this.comments.add(entry)
+        updateRowRepresentation()
+        return entry
+    }
+
+    /**
+     * Delete an entry
+     */
+    fun deleteComment(comment: Comment) {
+        commentsToDelete.add(comment)
+        this.comments.remove(comment)
+        updateRowRepresentation()
+    }
+
+    /**
+     * Clean up deleted entries
+     */
+    fun cleanupComments() { // called when saving the custom field
+        val realm = Realm.getDefaultInstance()
+        realm.executeTransactionAsync {
+            this.commentsToDelete.forEach { // entries are out of realm
+                realm.where<Comment>().equalTo("id", it.id).findFirst()?.deleteFromRealm()
+            }
+        }
+        realm.close()
+        this.commentsToDelete.clear()
+    }
+
+    override fun editDescriptors(row: RowRepresentable): List<RowRepresentableEditDescriptor>? {
+
+        when (row) {
+            PlayerPropertiesRow.NAME -> return row.editingDescriptors(mapOf("defaultValue" to this.name))
+            PlayerPropertiesRow.SUMMARY -> return row.editingDescriptors(mapOf("defaultValue" to this.summary))
+        }
+
+        return null
+    }
+
     val initials: String
         get() {
             return if (this.name.isNotEmpty()) {
@@ -94,8 +213,4 @@ open class Player : RealmObject(), NameManageable, Savable, Deletable, RowRepres
             }
         }
 
-    fun hands(realm: Realm): RealmResults<HandHistory> {
-        return realm.where(HandHistory::class.java).equalTo("playerSetups.player.id", this.id).findAll()
-    }
-
 }

app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt

@@ -3,18 +3,20 @@ package net.pokeranalytics.android.model.realm
 import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.RealmResults
-import io.realm.annotations.Ignore
 import io.realm.annotations.LinkingObjects
+import io.realm.annotations.PrimaryKey
 import io.realm.annotations.RealmClass
+import net.pokeranalytics.android.exceptions.PADataModelException
 import net.pokeranalytics.android.model.filter.Filterable
 import net.pokeranalytics.android.model.filter.QueryCondition
+import java.util.*
 
 @RealmClass
 open class Result : RealmObject(), Filterable {
 
 	companion object {
 
-		fun fieldNameForQueryType(queryCondition: Class < out QueryCondition>): String? {
+		fun fieldNameForQueryType(queryCondition: Class <out QueryCondition>): String? {
 			Session.fieldNameForQueryType(queryCondition)?.let {
 				return "sessions.$it"
 			}
@@ -22,13 +24,17 @@ open class Result : RealmObject(), Filterable {
 		}
 
 	}
+
+	@PrimaryKey
+	var id = UUID.randomUUID().toString()
+
 	/**
 	 * The buyin amount
  	 */
     var buyin: Double? = null
         set(value) {
             field = value
-            this.computeNumberOfRebuy()
+//            this.computeNumberOfRebuy()
             this.computeNet(true)
         }
 
@@ -39,9 +45,6 @@ open class Result : RealmObject(), Filterable {
         set(value) {
             field = value
             this.computeNet(true)
-	        if (value != null) {
-		        this.session?.end()
-	        }
         }
 
 	/**
@@ -49,20 +52,8 @@ open class Result : RealmObject(), Filterable {
 	 */
 	var netResult: Double? = null
 		set(value) {
-
-//			this.session?.bankroll?.let { bankroll ->
-//				if (bankroll.live) {
-//					throw PAIllegalStateException("Can't set net result on a live bankroll")
-//				}
-//			} ?: run {
-//				throw PAIllegalStateException("Session doesn't have any bankroll")
-//			}
-
 			field = value
 			this.computeNet(false)
-			if (value != null) {
-				this.session?.end()
-			}
 		}
 
 	/**
@@ -75,10 +66,6 @@ open class Result : RealmObject(), Filterable {
 	 * Tips
  	 */
 	var tips: Double? = null
-		set(value) {
-			field = value
-			this.session?.computeStats()
-		}
 
 	// The transactions associated with the Result, impacting the result
     var transactions: RealmList<Transaction> = RealmList()
@@ -91,21 +78,23 @@ open class Result : RealmObject(), Filterable {
     var tournamentFinalPosition: Int? = null
 
     // Number of rebuys
-    var numberOfRebuy: Double? = null
+    private var numberOfRebuy: Double? = null
 
 	@LinkingObjects("result")
 	private val sessions: RealmResults<Session>? = null
 
-	@Ignore
+	private val managedSession: Session
-	val session: Session? = this.sessions?.firstOrNull()
+		get() {
+			return this.sessions?.firstOrNull() ?: throw PADataModelException("Unmanaged Result")
+		}
 
 	/**
 	 * Returns 1 if the session is positive
 	 */
 	val isPositive: Int
 		get() {
-			return if (session?.isTournament() == true) {
+			return if (managedSession.isTournament()) {
-				if ((this.cashout ?: -1.0) > 0.0) 1 else 0 // if cashout is null we want to count a negative session
+				if ((this.cashout ?: -1.0) >= 0.0) 1 else 0 // if cashout is null we want to count a negative session
 			} else {
 				if (this.net >= 0.0) 1 else 0
 			}
@@ -124,11 +113,9 @@ open class Result : RealmObject(), Filterable {
 		    } else if (buyin != null || cashout != null) {
 			    useBuyin = true
 		    } else {
-			    this.session?.let { session ->
+				if (this.managedSession.isCashGame() && !this.managedSession.isLive) {
-				    if (session.isCashGame() && !session.isLive) {
+					useBuyin = false
-					    useBuyin = false
+				}
-				    }
-			    }
 		    }
 	    }
 
@@ -142,31 +129,29 @@ open class Result : RealmObject(), Filterable {
 	    }
 
 	    // Precompute results
-		this.session?.computeStats()
+//		this.managedSession.computeStats()
-	    this.session?.sessionSet?.computeStats()
+//	    this.managedSession.sessionSet?.computeStats()
     }
 
     // Computes the number of rebuy
     fun computeNumberOfRebuy() {
-        this.session?.let {
+		if (this.managedSession.isCashGame()) {
-            if (it.isCashGame()) {
+			this.managedSession.cgBiggestBet?.let { bb ->
-                it.cgBiggestBet?.let { bb ->
+				if (bb > 0.0) {
-                    if (bb > 0.0) {
+					this.numberOfRebuy = (this.buyin ?: 0.0) / (bb * 100.0)
-                        this.numberOfRebuy = (this.buyin ?: 0.0) / (bb * 100.0)
+				} else {
-                    } else {
+					this.numberOfRebuy = null
-                        this.numberOfRebuy = null
+				}
-                    }
+			}
-                }
+		} else {
-            } else {
+			this.managedSession.tournamentEntryFee?.let { entryFee ->
-                it.tournamentEntryFee?.let { entryFee ->
+				if (entryFee > 0.0) {
-                    if (entryFee > 0.0) {
+					this.numberOfRebuy = (this.buyin ?: 0.0) / entryFee
-                        this.numberOfRebuy = (this.buyin ?: 0.0) / entryFee
+				} else {
-                    } else {
+					this.numberOfRebuy = null
-                        this.numberOfRebuy = null
+				}
-                    }
+			}
-                }
+		}
-            }
-        }
     }
 
 	// @todo tips?

app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt

@@ -67,24 +67,32 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 
 	companion object {
 
-		fun newInstance(realm: Realm, isTournament: Boolean, bankroll: Bankroll? = null, managed: Boolean = true): Session {
+		fun newInstance(realm: Realm, isTournament: Boolean, bankroll: Bankroll? = null): Session {
 			val session = Session()
 			session.result = Result()
+
 			if (bankroll != null) {
-				session.bankroll = bankroll
+				session.bankroll = realm.copyFromRealm(bankroll)
 			} else {
-				session.bankroll = realm.where<Bankroll>().findFirst()
+				realm.where<Bankroll>().findFirst()?.let { br ->
+					session.bankroll = realm.copyFromRealm(br)
+				}
 			}
 			session.type = if (isTournament) Type.TOURNAMENT.ordinal else Type.CASH_GAME.ordinal
 
 			session.limit = Limit.NO.ordinal
-			session.game = realm.where(Game::class.java).equalTo("shortName", "HE").findFirst()
 
-			return if (managed) {
+			realm.where(Game::class.java)
-				realm.copyToRealm(session)
+				.equalTo("shortName", "HE").findFirst()?.let {
-			} else {
+				session.game = realm.copyFromRealm(it)
-				session
 			}
+
+			return session
+//			return if (managed) {
+//				realm.copyToRealm(session)
+//			} else {
+//				session
+//			}
 		}
 
 		fun fieldNameForQueryType(queryCondition: Class < out QueryCondition >): String? {
@@ -157,6 +165,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	@Ignore
 	val computableResult: ComputableResult? = this.computableResults?.firstOrNull()
 
+
 	// Timed interface
 
 	override var dayOfWeek: Int? = null
@@ -204,12 +213,12 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 
 			this.updateTimeParameter(field)
 			this.computeNetDuration()
-			// nullifies enddate when setting the start date after the end date
+			// nullifies the endDate when setting the start date after the end date
 			if (value != null && this.endDate != null && value.after(this.endDate)) {
 				this.endDate = null
 			}
 			this.dateChanged()
-			this.computeStats()
+//			this.computeStats()
 		}
 
 	/**
@@ -230,7 +239,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 			this.computeNetDuration()
 			this.dateChanged()
 			this.defineDefaultTournamentBuyinIfNecessary()
-			this.computeStats()
+//			this.computeStats()
 		}
 
 	/**
@@ -240,7 +249,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 		set(value) {
 			field = value
 			this.computeNetDuration()
-			this.computeStats()
+//			this.computeStats()
 		}
 
 	/**
@@ -252,10 +261,6 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	 * The start date of the break
 	 */
 	override var pauseDate: Date? = null
-		set(value) {
-			field = value
-//			this.updateRowRepresentation()
-		}
 
 	// The session set containing the sessions, which can contain multiple endedSessions
 	var sessionSet: SessionSet? = null
@@ -268,7 +273,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 		set(value) {
 			field = value
             this.generateStakes()
-			this.computeStats()
+//			this.computeStats()
 //			this.updateRowRepresentation()
 		}
 
@@ -296,7 +301,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 		set(value) {
 			if (value > 0) {
 				field = value
-				this.computeStats()
+//				this.computeStats()
 			}
 		}
 
@@ -314,16 +319,13 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 
 	// The small blind value
 	var cgOldSmallBlind: Double? = null
-		set(value) {
-			field = value
-		}
 
 	// The big blind value
 	var cgOldBigBlind: Double? = null
 		set(value) {
 			field = value
 			this.computeStats()
-			this.result?.computeNumberOfRebuy()
+//			this.result?.computeNumberOfRebuy()
 		}
 
 //	var blinds: String? = null
@@ -334,8 +336,8 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 			field = value
 			this.generateStakes()
 			this.defineHighestBet()
-			this.computeStats()
+//			this.computeStats()
-			this.result?.computeNumberOfRebuy()
+//			this.result?.computeNumberOfRebuy()
 		}
 
 	var cgBlinds: String? = null
@@ -343,8 +345,8 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 			field = cleanupBlinds(value)
 			this.generateStakes()
 			this.defineHighestBet()
-			this.computeStats()
+//			this.computeStats()
-			this.result?.computeNumberOfRebuy()
+//			this.result?.computeNumberOfRebuy()
 		}
 
 	var cgBiggestBet: Double? = null
@@ -355,10 +357,6 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 
 	// The entry fee of the tournament
 	var tournamentEntryFee: Double? = null
-		set(value) {
-			field = value
-			this.result?.computeNumberOfRebuy()
-		}
 
 	// The total number of players who participated in the tournament
 	var tournamentNumberOfPlayers: Int? = null
@@ -377,28 +375,29 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 
 	// The number of hands played during the sessions
 	var handsCount: Int? = null
-		set(value) {
-			field = value
-			this.computeStats()
-		}
 
 	fun bankrollHasBeenUpdated() {
 		this.generateStakes()
 	}
 
-	/**
-	 * Manages impacts on SessionSets
-	 * Should be called when the start / end date are changed
-	 */
 	private fun dateChanged() {
-		if (this.endDate != null) {
+		SessionSetManager.sessionDateChanged(this)
-			SessionSetManager.updateTimeline(this)
-		} else if (this.sessionSet != null) {
-			SessionSetManager.removeFromTimeline(this)
-		}
-//		this.updateRowRepresentation()
 	}
 
+//	/**
+//	 * Manages impacts on SessionSets
+//	 * Should be called when the start / end date are changed
+//	 */
+//	private fun dateChanged() {
+//		SessionSetManager.updatedSession(this)
+////		if (this.endDate != null) {
+////			SessionSetManager.updateTimeline(this)
+////		} else if (this.sessionSet != null) {
+////			SessionSetManager.removeFromTimeline(this)
+////		}
+////		this.updateRowRepresentation()
+//	}
+
 	/**
 	 * Returns a non-null date for the session
 	 */
@@ -436,7 +435,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 		get() {
 			val bb = this.cgBiggestBet
 			val result = this.result
-			return if (bb != null && result != null) {
+			return if (bb != null && bb > 0.0 && result != null) {
 				result.net / bb
 			} else {
 				0.0
@@ -471,6 +470,11 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 			return this.result?.net ?: 0.0
 		}
 
+	fun preCompute() {
+		this.computeStats()
+		this.result?.computeNumberOfRebuy()
+	}
+
 	/**
 	 * Pre-compute various statIds
 	 */
@@ -493,16 +497,21 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 			}
 		}
 		this.sessionSet?.computeStats()
+
 	}
 
 	/**
 	 * Approximates the number of hands played per hour at the table
 	 */
-	val numberOfHandsPerHour: Double
+	private val numberOfHandsPerHour: Double
 		get() {
 			val tableSize = this.tableSize ?: 9 // 9 is the default table size if null
-			val config = UserConfig.getConfiguration(this.realm)
+
-			val playerHandsPerHour = if (this.isLive) config.liveDealtHandsPerHour else config.onlineDealtHandsPerHour
+			var playerHandsPerHour = 0
+			UserConfig.getConfiguration(this.realm) { config ->
+				playerHandsPerHour = if (this.isLive) config.liveDealtHandsPerHour else config.onlineDealtHandsPerHour
+			}
+
 			return this.numberOfTables * playerHandsPerHour / tableSize.toDouble()
 		}
 
@@ -557,7 +566,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	 * Start or continue a session
 	 */
 	fun startOrContinue() {
-		realm.executeTransaction {
+//		realm.executeTransaction {
 			when (val state = getState()) {
 				SessionState.PENDING, SessionState.PLANNED -> {
 					this.startDate = Date()
@@ -576,7 +585,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 					throw PAIllegalStateException("unmanaged session state: $state")
 				}
 			}
-		}
+//		}
 	}
 
 	private fun defineDefaultTournamentBuyinIfNecessary() {
@@ -589,28 +598,28 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	 * Pause a session
 	 */
 	fun pause() {
-		realm.executeTransaction {
+//		realm.executeTransaction {
 			when (val state = getState()) {
 				SessionState.STARTED -> {
 					this.pauseDate = Date()
 				}
 				else -> throw PAIllegalStateException("Pausing a session in an unmanaged state: $state")
 			}
-		}
+//		}
 	}
 
 	/**
 	 * Stop a session
 	 */
 	fun stop(context: Context) {
-		realm.executeTransaction {
+//		realm.executeTransaction {
 			when (val state = getState()) {
 				SessionState.STARTED, SessionState.PAUSED -> {
 					this.end()
 				}
 				else -> throw Exception("Stopping session in unmanaged state: $state")
 			}
-		}
+//		}
 		cancelStopNotification(context)
 	}
 
@@ -618,12 +627,12 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	 * Restart a session
 	 */
 	fun restart() {
-		realm.executeTransaction {
+//		realm.executeTransaction {
 			this.pauseDate = null
 			this.startDate = Date()
 			this.endDate = null
 			this.breakDuration = 0L
-		}
+//		}
 	}
 
 	/**
@@ -660,7 +669,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 
 	/**
 	 * Return the game titleResId
-	 * Example: NL Holdem
+	 * Example: NL Hold'em
 	 */
 	fun getFormattedGame(): String {
 		var gameTitle = ""
@@ -672,7 +681,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 		if (game != null) {
 			gameTitle += game?.name
 		}
-		return if (gameTitle.isNotBlank()) gameTitle else NULL_TEXT
+		return gameTitle.ifBlank { NULL_TEXT }
 	}
 
 	fun getFormattedStakes(): String {
@@ -686,12 +695,12 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	 */
 	fun delete() {
 
+		CrashLogging.log("Deletes session. Id = ${this.id}")
 		if (isValid) {
-//			CrashLogging.log("Deletes session. Id = ${this.id}")
+//			realm.executeTransaction {
-			realm.executeTransaction {
 				cleanup()
 				deleteFromRealm()
-			}
+//			}
 		} else {
 			CrashLogging.log("Attempt to delete an invalid session")
 		}
@@ -708,7 +717,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 		}
 		// cleanup unnecessary related objects
 		this.result?.deleteFromRealm()
-		this.computableResults?.deleteAllFromRealm()
+		this.computableResult?.deleteFromRealm()
 
 	}
 
@@ -763,10 +772,16 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 			SessionPropertiesRow.CASHED_OUT, SessionPropertiesRow.PRIZE -> {
 				val localResult = getOrCreateResult()
 				localResult.cashout = value as Double?
+				if (value != null) {
+					this.end()
+				}
 			}
 			SessionPropertiesRow.NET_RESULT -> {
 				val localResult = getOrCreateResult()
 				localResult.netResult = value as Double?
+				if (value != null) {
+					this.end()
+				}
 			}
 			SessionPropertiesRow.COMMENT -> comment = value as String? ?: ""
 			SessionPropertiesRow.END_DATE -> if (value is Date?) {
@@ -822,20 +837,23 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 			SessionPropertiesRow.TOURNAMENT_NAME -> tournamentName = value as TournamentName?
 			SessionPropertiesRow.TOURNAMENT_TYPE -> tournamentType = (value as TournamentType?)?.ordinal
 			SessionPropertiesRow.TOURNAMENT_FEATURE -> {
-
+				this.tournamentFeatures.clear()
 				value?.let {
 					tournamentFeatures = RealmList()
-					tournamentFeatures.addAll((it as ArrayList<TournamentFeature>))
+					tournamentFeatures.addAll((it as List<TournamentFeature>))
-				} ?: run {
-					tournamentFeatures.removeAll(this.tournamentFeatures)
 				}
 			}
 			SessionPropertiesRow.HANDS_COUNT -> handsCount = (value as Double?)?.toInt()
 			SessionPropertiesRow.NUMBER_OF_TABLES -> this.numberOfTables = (value as Double?)?.toInt() ?: 1
 			is CustomField -> {
-				customFieldEntries.filter { it.customField?.id == row.id }.let {
+
-					customFieldEntries.removeAll(it)
+				val entryIds = row.entries.map { it.id }
-				}
+				val entries = this.customFieldEntries.intersectBy(entryIds) { it.id }
+				this.customFieldEntries.removeAll(entries)
+
+//				customFieldEntries.filter { it.customField?.id == row.id }.let {
+//					customFieldEntries.removeAll(it.toSet())
+//				}
 				when (row.type) {
 					CustomField.Type.AMOUNT.uniqueIdentifier,
 					CustomField.Type.NUMBER.uniqueIdentifier -> {
@@ -860,10 +878,11 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	private fun getOrCreateResult(): Result {
 		return this.result
 			?: run {
-			val result = realm.createObject(Result::class.java)
+				val result = Result()
-			this.result = result
+//				result.inverseSession = WeakReference(this)
-			result
+				this.result = result
-		}
+				result
+			}
 	}
 
 	// Stat Entry
@@ -897,7 +916,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 					this.bbNet,
 					this.estimatedHands
 				)
-				Stat.AVERAGE_NET_BB, Stat.BB_NET_RESULT -> this.bbNet
+				Stat.AVERAGE_NET_BB -> this.bbNet
 				Stat.HOURLY_DURATION, Stat.AVERAGE_HOURLY_DURATION -> this.netDuration.toDouble()
 				Stat.HOURLY_RATE, Stat.STANDARD_DEVIATION_HOURLY -> this.hourlyRate
 				Stat.HANDS_PLAYED -> this.estimatedHands
@@ -974,7 +993,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 			SessionPropertiesRow.BUY_IN -> this.result?.buyin?.toCurrency(currency) ?: NULL_TEXT
 			SessionPropertiesRow.CASHED_OUT, SessionPropertiesRow.PRIZE -> this.result?.cashout?.toCurrency(currency) ?: NULL_TEXT
 			SessionPropertiesRow.NET_RESULT -> this.result?.netResult?.toCurrency(currency) ?: NULL_TEXT
-			SessionPropertiesRow.COMMENT -> if (this.comment.isNotEmpty()) this.comment else NULL_TEXT
+			SessionPropertiesRow.COMMENT -> this.comment.ifEmpty { NULL_TEXT }
 			SessionPropertiesRow.END_DATE -> this.endDate?.shortDateTime() ?: NULL_TEXT
 			SessionPropertiesRow.GAME -> getFormattedGame()
 			SessionPropertiesRow.INITIAL_BUY_IN -> tournamentEntryFee?.toCurrency(currency) ?: NULL_TEXT
@@ -1009,8 +1028,10 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 			SessionPropertiesRow.HANDS_COUNT -> this.handsCountFormatted(context)
 			SessionPropertiesRow.NUMBER_OF_TABLES -> this.numberOfTables.toString()
 			is CustomField -> {
-				customFieldEntries.find { it.customField?.id == row.id }?.let { customFieldEntry ->
+				val entryIds = this.customFieldEntries.map { it.id }
-					return customFieldEntry.getFormattedValue(currency)
+				val entries = row.entries.intersectBy(entryIds) { it.id }
+				entries.firstOrNull()?.let { customFieldEntry ->
+					return customFieldEntry.getFormattedValue(row, currency)
 				}
 				return NULL_TEXT
 			}

app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt

@@ -15,11 +15,12 @@ import net.pokeranalytics.android.model.interfaces.Identifiable
 import net.pokeranalytics.android.model.interfaces.Timed
 import net.pokeranalytics.android.util.NULL_TEXT
 import net.pokeranalytics.android.util.TextFormat
+import kotlin.math.min
 import java.text.DateFormat
 import java.util.*
+import kotlin.math.max
 
-
+open class SessionSet : RealmObject(), Timed, Filterable {
-open class SessionSet() : RealmObject(), Timed, Filterable {
 
 	@PrimaryKey
 	override var id = UUID.randomUUID().toString()
@@ -64,7 +65,7 @@ open class SessionSet() : RealmObject(), Timed, Filterable {
 		this.ratedNet = this.sessions?.sumOf { it.computableResult?.ratedNet ?: 0.0 } ?: 0.0
 		this.estimatedHands = this.sessions?.sumOf { it.estimatedHands } ?: 0.0
 		this.bbNet = this.sessions?.sumOf { it.bbNet } ?: 0.0
-		this.breakDuration =  this.sessions?.max("breakDuration")?.toLong() ?: 0L
+		updateBreakDuration()
 	}
 
     /**
@@ -75,7 +76,7 @@ open class SessionSet() : RealmObject(), Timed, Filterable {
 
     var ratedNet: Double = 0.0
 
-    val hourlyRate: Double
+    private val hourlyRate: Double
 		get() {
 			return this.ratedNet / this.hourlyDuration
 		}
@@ -84,7 +85,7 @@ open class SessionSet() : RealmObject(), Timed, Filterable {
 
     var bbNet: BB = 0.0
 
-	val bbHourlyRate: BB
+	private val bbHourlyRate: BB
 		get() {
 			return this.bbNet / this.hourlyDuration
 		}
@@ -142,5 +143,21 @@ open class SessionSet() : RealmObject(), Timed, Filterable {
 	@Ignore
 	override val realmObjectClass: Class<out Identifiable> = SessionSet::class.java
 
+	private fun updateBreakDuration() {
+
+		var longestNetDuration = 0L
+		var maxBreakDuration = 0L
+
+		this.sessions?.let { sessions ->
+			for (session in sessions) {
+				longestNetDuration = max(longestNetDuration, session.netDuration)
+				maxBreakDuration = max(session.breakDuration, maxBreakDuration)
+			}
+		}
+
+		val maxSetBreak = endDate.time - startDate.time - longestNetDuration
+		this.breakDuration = min(maxBreakDuration, maxSetBreak)
+	}
+
 }
 

app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt

@@ -1,288 +0,0 @@
-//package net.pokeranalytics.android.model.realm
-//
-//import io.realm.RealmObject
-//import io.realm.RealmQuery
-//import io.realm.RealmResults
-//import io.realm.annotations.Ignore
-//import io.realm.annotations.LinkingObjects
-//import net.pokeranalytics.android.exceptions.ModelException
-//import timber.log.Timber
-//import java.util.*
-//
-//open class TimeFrame : RealmObject() {
-//
-//    // A start date
-//    var startDate: Date = Date()
-//        private set(value) {
-//            field = value
-//            this.computeNetDuration()
-//        }
-//
-//    // An end date
-//    var endDate: Date? = null
-//        private set(value) {
-//            field = value
-//            this.computeNetDuration()
-//        }
-//
-//    // The latest pause date
-//    var pauseDate: Date? = null
-//        set(value) {
-//            field?.let {
-//                if (value == null && field != null) {
-//                    breakDuration += Date().time - it.time
-//                }
-//            }
-//            field = value
-//            this.computeNetDuration()
-//        }
-//
-//    // The break netDuration
-//    var breakDuration: Long = 0L
-//        set(value) {
-//            field = value
-//            this.computeNetDuration()
-//        }
-//
-//    // the total netDuration
-//    var netDuration: Long = 0L
-//        private set
-//
-//    var hourlyDuration: Double = 0.0
-//        get() {
-//            return this.netDuration / 3600000.0 // 3.6 millions of milliseconds
-//        }
-//
-//    // Session
-//    @LinkingObjects("timeFrame")
-//    private val endedSessions: RealmResults<Session>? = null // we should have only one session
-//
-//    @Ignore
-//    var session: Session? = null
-//        get() = if (this.endedSessions != null && this.endedSessions.isEmpty()) null else this.endedSessions?.first()
-//
-//    // Group
-//    @LinkingObjects("timeFrame")
-//    private val sets: RealmResults<SessionSet>? = null // we should have only one sessionGroup
-//
-//    @Ignore
-//    var set: SessionSet? = null
-//        get() = this.sets?.first()
-//
-//    fun setStart(startDate: Date) {
-//        this.startDate = startDate
-//        this.session?.let {
-//            this.notifySessionDateChange(it)
-//        }
-//    }
-//
-//    fun setEnd(endDate: Date?) {
-//        this.endDate = endDate
-//        this.session?.let {
-//            this.notifySessionDateChange(it)
-//        }
-//    }
-//
-//    fun setDate(startDate: Date, endDate: Date?) {
-//        this.startDate = startDate
-//        this.endDate = endDate
-//
-//        this.session?.let {
-//            this.notifySessionDateChange(it)
-//        }
-//    }
-//
-//    /**
-//     * Computes the net netDuration of the session
-//     */
-//    private fun computeNetDuration() {
-//        var endDate: Date = this.endDate ?: Date()
-//        this.netDuration = endDate.time - this.startDate.time - this.breakDuration
-//    }
-//
-//    /**
-//     * Queries all time frames that might be impacted by the date change
-//     * Makes all necessary changes to keep sequential time frames
-//     */
-//    fun notifySessionDateChange(owner: Session) {
-//
-//        var query: RealmQuery<SessionSet> = this.realm.where(SessionSet::class.java)
-//        query.isNotNull("timeFrame")
-//
-////        Timber.d("this> sd = : ${this.startDate}, ed = ${this.endDate}")
-//
-//        val sets = realm.where(SessionSet::class.java).findAll()
-////        Timber.d("set count = ${sets.size}")
-//
-//        if (this.endDate == null) {
-//            query.greaterThanOrEqualTo("timeFrame.startDate", this.startDate)
-//                .or()
-//                .greaterThanOrEqualTo("timeFrame.endDate", this.startDate)
-//                .or()
-//                .isNull("timeFrame.endDate")
-//        } else {
-//            val endDate = this.endDate!!
-//            query
-//                .lessThanOrEqualTo("timeFrame.startDate", this.startDate)
-//                .greaterThanOrEqualTo("timeFrame.endDate", this.startDate)
-//                .or()
-//                .lessThanOrEqualTo("timeFrame.startDate", endDate)
-//                .greaterThanOrEqualTo("timeFrame.endDate", endDate)
-//                .or()
-//                .greaterThanOrEqualTo("timeFrame.startDate", this.startDate)
-//                .lessThanOrEqualTo("timeFrame.endDate", endDate)
-//                .or()
-//                .isNull("timeFrame.endDate")
-//                .lessThanOrEqualTo("timeFrame.startDate", endDate)
-//        }
-//
-//        val sessionGroups = query.findAll()
-//
-//        this.updateTimeFrames(sessionGroups, owner)
-//
-//    }
-//
-//    /**
-//     * Update Time frames from sets
-//     */
-//    private fun updateTimeFrames(sessionSets: RealmResults<SessionSet>, owner: Session) {
-//
-//        when (sessionSets.size) {
-//            0 -> this.createOrUpdateSessionSet(owner)
-//            1 -> this.updateSessionGroup(owner, sessionSets.first()!!)
-//            else -> this.mergeSessionGroups(owner, sessionSets)
-//        }
-//
-//    }
-//
-//    /**
-//     * Creates the session sessionGroup when the session has none
-//     */
-//    private fun createOrUpdateSessionSet(owner: Session) {
-//
-//        val set = owner.sessionSet
-//        if (set != null) {
-//            set.timeFrame?.startDate = this.startDate
-//            set.timeFrame?.endDate = this.endDate
-//        } else {
-//            this.createSessionSet(owner)
-//        }
-//
-////        Timber.d("sd = : ${set.timeFrame?.startDate}, ed = ${set.timeFrame?.endDate}")
-//        Timber.d("netDuration 1 = : ${set?.timeFrame?.netDuration}")
-//
-//    }
-//
-//    fun createSessionSet(owner: Session) {
-//        val set: SessionSet = SessionSet.newInstanceForResult(this.realm)
-//        set.timeFrame?.let {
-//            it.startDate = this.startDate
-//            it.endDate = this.endDate
-//        } ?: run {
-//            throw ModelException("TimeFrame should never be null here")
-//        }
-//
-//        owner.sessionSet = set
-//    }
-//
-//
-//    /**
-//     * Single SessionSet update, the session might be the owner
-//     * Changes the sessionGroup timeframe using the current timeframe dates
-//     */
-//    private fun updateSessionGroup(owner: Session, sessionSet: SessionSet) {
-//
-//        var timeFrame: TimeFrame = sessionSet.timeFrame!! // tested in the query
-////        timeFrame.setDate(this.startDate, this.endDate)
-//
-//        val sisterSessions = sessionSet.endedSessions!! // shouldn't crash ever
-//
-//        // if we have only one session in the set and that it corresponds to the set
-//        if (sessionSet.endedSessions?.size == 1 && sessionSet.endedSessions?.first() == owner) {
-//            timeFrame.setDate(this.startDate, this.endDate)
-//        } else { // there are 2+ endedSessions to manage and possible splits
-//
-//            val endDate = this.endDate
-//
-//            // case where all endedSessions are over but the set is not, we might have a split, so we delete the set and save everything again
-//            if (endDate != null && sisterSessions.all { it.timeFrame?.endDate != null } && timeFrame.endDate == null) {
-//                var endedSessions = mutableListOf<Session>(owner)
-//                sessionSet.endedSessions?.forEach { endedSessions.add(it) }
-//                sessionSet.deleteFromRealm()
-//                endedSessions.forEach { it.timeFrame?.notifySessionDateChange(it) }
-//            } else {
-//
-//                if (this.startDate.before(timeFrame.startDate)) {
-//                    timeFrame.startDate = this.startDate
-//                }
-//                if (endDate != null && timeFrame.endDate != null && endDate.after(timeFrame.endDate)) {
-//                    timeFrame.endDate = endDate
-//                } else if (endDate == null) {
-//                    timeFrame.endDate = null
-//                }
-//
-//                owner.sessionSet = sessionSet
-//
-////                Timber.d("sd = : ${sessionSet.timeFrame?.startDate}, ed = ${sessionSet.timeFrame?.endDate}")
-//                Timber.d("netDuration 2 = : ${sessionSet.timeFrame?.netDuration}")
-//            }
-//
-//        }
-//
-//    }
-//
-//    /**
-//     * Multiple session sets update:
-//     * Merges all sets into one (delete all then create a new one)
-//     */
-//    private fun mergeSessionGroups(owner: Session, sessionSets: RealmResults<SessionSet>) {
-//
-//        var startDate: Date = this.startDate
-//        var endDate: Date? = this.endDate
-//
-//        // find earlier and later dates from all sets
-//        val timeFrames = sessionSets.mapNotNull { it.timeFrame }
-//        timeFrames.forEach { tf ->
-//            if (tf.startDate.before(startDate)) {
-//                startDate = tf.startDate
-//            }
-//
-//            endDate?.let { ed ->
-//                tf.endDate?.let { tfed ->
-//                    if (tfed.after(ed)) {
-//                        endDate = tfed
-//                    }
-//                }
-//            } ?: run {
-//                endDate = tf.endDate
-//            }
-//
-//        }
-//
-//        // get all endedSessions from sets
-//        var endedSessions = mutableSetOf<Session>()
-//        sessionSets.forEach { set ->
-//            set.endedSessions?.asIterable()?.let { endedSessions.addAll(it) }
-//        }
-//
-//        // delete all sets
-//        sessionSets.deleteAllFromRealm()
-//
-//        // Create a new sets
-//        val set: SessionSet = SessionSet.newInstanceForResult(this.realm)
-//        set.timeFrame?.let {
-//            it.setDate(startDate, endDate)
-//        } ?: run {
-//            throw ModelException("TimeFrame should never be null here")
-//        }
-//
-//        // Add the session linked to this timeframe to the new sessionGroup
-//        owner.sessionSet = set
-//
-//        // Add all orphan endedSessions
-//        endedSessions.forEach { it.sessionSet = set }
-//        Timber.d("netDuration 3 = : ${set.timeFrame?.netDuration}")
-//
-//    }
-//
-//}

app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt

@@ -62,7 +62,7 @@ open class TournamentFeature : RealmObject(), RowRepresentable, RowUpdatable, Na
 	    tag: Int
     ): CharSequence {
         return when (row) {
-            SimpleRow.NAME -> if (this.name.isNotEmpty()) this.name else NULL_TEXT
+            SimpleRow.NAME -> this.name.ifEmpty { NULL_TEXT }
             else -> return super.charSequenceForRow(row, context, 0)
         }
     }

app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt

@@ -61,7 +61,7 @@ open class TournamentName : RealmObject(), NameManageable, StaticRowRepresentabl
 		tag: Int
 	): CharSequence {
 		return when (row) {
-			SimpleRow.NAME -> if (this.name.isNotEmpty()) this.name else NULL_TEXT
+			SimpleRow.NAME -> this.name.ifEmpty { NULL_TEXT }
 			else -> return super.charSequenceForRow(row, context,0)
 		}
 	}

app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt

@@ -79,7 +79,7 @@ open class Transaction : RealmObject(), RowRepresentable, RowUpdatable, Manageab
 		}
 
 	// The amount of the transaction
-	var ratedAmount: Double = 0.0
+	private var ratedAmount: Double = 0.0
 
 	// The date of the transaction
 	override var date: Date = Date()

app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt

@@ -31,8 +31,7 @@ open class TransactionType : RealmObject(), RowRepresentable, RowUpdatable, Name
 		BONUS(2, true),
 		STACKING_INCOMING(3, true),
 		STACKING_OUTGOING(4, false),
-		TRANSFER(5, false),
+		TRANSFER(5, false);
-		EXPENSE(6, false); // not created by default, only used for poker base import atm
 
 		companion object : IntSearchable<Value> {
 
@@ -50,7 +49,6 @@ open class TransactionType : RealmObject(), RowRepresentable, RowUpdatable, Name
 					STACKING_INCOMING -> R.string.stacking_incoming
 					STACKING_OUTGOING -> R.string.stacking_outgoing
 					TRANSFER -> R.string.transfer
-					EXPENSE -> R.string.expense
 				}
 			}
 
@@ -72,10 +70,6 @@ open class TransactionType : RealmObject(), RowRepresentable, RowUpdatable, Name
 			throw PAIllegalStateException("Transaction type ${value.name} should exist in database!")
 		}
 
-		fun getOrCreate(realm: Realm, value: Value, context: Context): TransactionType {
-			return getOrCreate(realm, value.localizedTitle(context), value.additive)
-		}
-
 		fun getOrCreate(realm: Realm, name: String, additive: Boolean): TransactionType {
 			val type = realm.where(TransactionType::class.java).equalTo("name", name).findFirst()
 			return if (type != null) {

app/src/main/java/net/pokeranalytics/android/model/realm/UserConfig.kt

@@ -11,7 +11,19 @@ open class UserConfig : RealmObject() {
 
 	companion object {
 
-		fun getConfiguration(realm: Realm): UserConfig {
+		fun getConfiguration(realm: Realm?, handler: (UserConfig) -> (Unit)) {
+
+			if (realm != null) {
+				handler(userConfiguration(realm))
+			} else {
+				val r = Realm.getDefaultInstance()
+				handler(userConfiguration(r))
+				r.close()
+			}
+
+		}
+
+		private fun userConfiguration(realm: Realm): UserConfig {
 			realm.where(UserConfig::class.java).findFirst()?.let { config ->
 				return config
 			}

app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt

@@ -190,11 +190,9 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 	/***
 	 * Configures a hand history with a [handSetup]
 	 */
-	fun configure(handSetup: HandSetup, keepPlayers: Boolean = false) {
+	fun configure(handSetup: HandSetup) {
 
-		if (!keepPlayers) {
+		this.playerSetups.removeAll(this.playerSetups)
-			this.playerSetups.removeAll(this.playerSetups)
-		}
 
 		handSetup.tableSize?.let { this.numberOfPlayers = it }
 		handSetup.ante?.let { this.ante = it }
@@ -315,13 +313,7 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 	 * Creates and affect a PlayerSetup at the given [positionIndex]
 	 */
 	fun createPlayerSetup(positionIndex: Int): PlayerSetup {
-
+		val playerSetup = PlayerSetup()
-		val playerSetup = if (this.realm != null) {
-			this.realm.createObject(PlayerSetup::class.java) }
-		else {
-			PlayerSetup()
-		}
-
 		playerSetup.position = positionIndex
 		this.playerSetups.add(playerSetup)
 		return playerSetup
@@ -479,12 +471,7 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 	val heroWins: Boolean?
 		get() {
 			return this.heroIndex?.let { heroIndex ->
-				this.largestWonPot?.let { pot ->
+				this.winnerPots.any { it.position == heroIndex }
-					heroIndex == pot.position
-				} ?: run { null }
-
-//				heroIndex == this.largestWonPot?.position
-//				this.winnerPots.any { it.position == heroIndex }
 			} ?: run {
 				null
 			}
@@ -569,7 +556,7 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 		this.winnerPots.clear()
 		this.winnerPots.addAll(wonPots)
 
-		Timber.d("Pot won: ${this.winnerPots.size} for positions: ${this.winnerPots.map {it.position}} ")
+		Timber.d("Pot won: ${this.winnerPots.size} for positions: ${this.winnerPots.map { it.position }} ")
 	}
 
 	/***
@@ -646,22 +633,19 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 
 		pots.forEach { pot ->
 
-			if (pot.positions.size > 1) { // we only consider contested pots
+			val winningPositions = compareHands(pot.positions.toList())
-
+
-				val winningPositions = compareHands(pot.positions.toList())
+			// Distributes the pot for each winners
-
+			val share = pot.amount / winningPositions.size
-				// Distributes the pot for each winners
+			winningPositions.forEach { p ->
-				val share = pot.amount / winningPositions.size
+				val wp = wonPots[p]
-				winningPositions.forEach { p ->
+				if (wp == null) {
-					val wp = wonPots[p]
+					val wonPot = WonPot()
-					if (wp == null) {
+					wonPot.position = p
-						val wonPot = WonPot()
+					wonPot.amount = share
-						wonPot.position = p
+					wonPots[p] = wonPot
-						wonPot.amount = share
+				} else {
-						wonPots[p] = wonPot
+					wp.amount += share
-					} else {
-						wp.amount += share
-					}
 				}
 			}
 
@@ -743,7 +727,7 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 			return boardHasWildCard || playerCardHasWildCard
 		}
 
-	private val allFullCards: List<Card>
+	val allFullCards: List<Card>
 		get() {
 			val cards = mutableListOf<Card>()
 			cards.addAll(this.board)
@@ -763,13 +747,4 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 			return cards.filter { it.isSuitWildCard }
 		}
 
-	private val largestWonPot: WonPot?
-		get() {
-			return if (this.winnerPots.isNotEmpty()) { // needed, otherwise maxBy crashes
-				this.winnerPots.maxBy { it.amount }
-			} else {
-				null
-			}
-		}
-
 }

app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt

@@ -73,15 +73,21 @@ class FavoriteSessionFinder {
 		/**
 		 * Copies the favorite session parameters on the [session]
 		 */
-		fun copyParametersFromFavoriteSession(session: Session, location: Location?, context: Context) {
+		fun copyParametersFromFavoriteSession(realm: Realm, session: Session, location: Location?, context: Context) {
 
-			val favoriteSession = favoriteSession(session.type, location, session.realm, context)
+			val favoriteSession = favoriteSession(session.type, location, realm, context)
 
 			favoriteSession?.let { fav ->
 
 				session.limit = fav.limit
-				session.game = fav.game
+
-				session.bankroll = fav.bankroll
+				fav.game?.let {
+					session.game = realm.copyFromRealm(it)
+				}
+				fav.bankroll?.let {
+					session.bankroll = realm.copyFromRealm(it)
+				}
+
 				session.tableSize = fav.tableSize
 
 				when (session.type) {

app/src/main/java/net/pokeranalytics/android/model/utils/Seed.kt

@@ -17,19 +17,15 @@ class Seed(var context:Context) : Realm.Transaction {
         fun createDefaultTransactionTypes(values: Array<TransactionType.Value>, context: Context, realm: Realm) {
             values.forEach { value ->
 
-                if (value != TransactionType.Value.EXPENSE) {
+                val existing = realm.where(TransactionType::class.java).equalTo("kind", value.uniqueIdentifier).findAll()
-
+                if (existing.isEmpty()) {
-                    val existing = realm.where(TransactionType::class.java).equalTo("kind", value.uniqueIdentifier).findAll()
+                    val type = TransactionType()
-                    if (existing.isEmpty()) {
+                    type.name = value.localizedTitle(context)
-                        val type = TransactionType()
+                    type.additive = value.additive
-                        type.name = value.localizedTitle(context)
+                    type.kind = value.uniqueIdentifier
-                        type.additive = value.additive
+                    type.lock = true
-                        type.kind = value.uniqueIdentifier
+                    realm.insertOrUpdate(type)
-                        type.lock = true
-                        realm.insertOrUpdate(type)
-                    }
                 }
-
             }
         }
     }

app/src/main/java/net/pokeranalytics/android/model/utils/SessionSetManager.kt

@@ -1,209 +1,255 @@
 package net.pokeranalytics.android.model.utils
 
+import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.RealmResults
 import net.pokeranalytics.android.exceptions.ModelException
-import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.model.realm.SessionSet
-import kotlin.math.max
+import net.pokeranalytics.android.util.Global
+import net.pokeranalytics.android.util.extensions.findById
+import timber.log.Timber
 
 class CorruptSessionSetException(message: String) : Exception(message)
 
 /**
- * The manager is in charge of updating the abstract concept of timeline,
+ * The manager is in charge of updating the concept of timeline,
- * representing the sequenced time frames where the user plays.
+ * representing the time frames where the user plays.
  */
-class SessionSetManager {
+object SessionSetManager {
-
+
-	companion object {
+    var sessions: RealmResults<Session>
-
+
-		/**
+    private val sessionIdsToProcess = mutableSetOf<String>()
-		 * Updates the global timeline using the updated [session]
+
-		 */
+    fun configure() {} // launch init
-		fun updateTimeline(session: Session) {
+
-
+    fun sessionDateChanged(session: Session) {
-			if (!session.realm.isInTransaction) {
+        this.sessionIdsToProcess.add(session.id)
-				throw PAIllegalStateException("realm should be in transaction at this point")
+    }
-			}
+
-
+    init {
-			if (session.startDate == null) {
+
-				throw ModelException("Start date should never be null here")
+        val realm = Realm.getDefaultInstance()
-			}
+
-			if (session.endDate == null) {
+        this.sessions = realm.where(Session::class.java).findAllAsync()
-				throw ModelException("End date should never be null here")
+        this.sessions.addChangeListener { _, _ ->
-			}
+            if (Global.LAUNCH_ASYNC_LISTENERS) {
-
+                if (this.sessionIdsToProcess.isNotEmpty()) {
-			val sessionSets = this.matchingSets(session)
+                    realm.executeTransactionAsync { asyncRealm ->
-			cleanupSessionSets(session, sessionSets)
+                        processSessions(asyncRealm)
-
+                    }
-
+                }
-		}
+            }
-
+        }
-		private fun matchingSets(session: Session) : RealmResults<SessionSet> {
+
-			val realm = session.realm
+        realm.close()
-			val endDate = session.endDate!! // tested above
+    }
-			val startDate = session.startDate!!
+
-
+    private fun processSessions(realm: Realm) {
-			val query: RealmQuery<SessionSet> = realm.where(SessionSet::class.java)
+
-
+        Timber.d("***** processSessions, process count = ${sessionIdsToProcess.size}")
-			query
+
-				.lessThanOrEqualTo("startDate", startDate)
+        for (sessionId in this.sessionIdsToProcess) {
-				.greaterThanOrEqualTo("endDate", startDate)
+            realm.findById<Session>(sessionId)?.let { session ->
-				.or()
+                if (session.startDate != null && session.endDate != null) {
-				.lessThanOrEqualTo("startDate", endDate)
+                    updateTimeline(session)
-				.greaterThanOrEqualTo("endDate", endDate)
+                } else if (session.sessionSet != null) {
-				.or()
+                    removeFromTimeline(session)
-				.greaterThanOrEqualTo("startDate", startDate)
+                }
-				.lessThanOrEqualTo("endDate", endDate)
+            }
-
+        }
-			return query.findAll()
+
-		}
+        this.sessionIdsToProcess.clear()
-
+    }
-		/**
+
-		 * Multiple session sets update:
+    /**
-		 * Merges or splits session sets
+     * Updates the global timeline using the updated [session]
-		 * Does that by deleting then recreating
+     */
-		 */
+    fun updateTimeline(session: Session) {
-		private fun cleanupSessionSets(session: Session, sessionSets: RealmResults<SessionSet>) {
+
-
+//			if (!session.realm.isInTransaction) {
-			// get all endedSessions from sets
+//				throw PAIllegalStateException("realm should be in transaction at this point")
-			val allImpactedSessions = mutableSetOf<Session>()
+//			}
-			sessionSets.forEach { set ->
+
-				set.sessions?.asIterable()?.let { allImpactedSessions.addAll(it) }
+        if (session.startDate == null) {
-			}
+            throw ModelException("Start date should never be null here")
-			allImpactedSessions.add(session)
+        }
-
+        if (session.endDate == null) {
-			// delete all sets
+            throw ModelException("End date should never be null here")
-			sessionSets.deleteAllFromRealm()
+        }
-
+
-			allImpactedSessions.forEach { impactedSession ->
+        val sessionSets = this.matchingSets(session)
-				val sets = matchingSets(impactedSession)
+        cleanupSessionSets(session, sessionSets)
-				this.updateTimeFrames(sets, impactedSession)
+
-			}
+//        val sessionId = session.id
+//        realm.executeTransactionAsync { asyncRealm ->
+//            asyncRealm.findById<Session>(sessionId)?.let { s ->
+//                val sessionSets = this.matchingSets(session)
+//                cleanupSessionSets(session, sessionSets)
+//            }
+//        }
+
+    }
+
+    private fun matchingSets(session: Session): RealmResults<SessionSet> {
+        val realm = session.realm
+        val endDate = session.endDate!! // tested above
+        val startDate = session.startDate!!
+
+        val query: RealmQuery<SessionSet> = realm.where(SessionSet::class.java)
+
+        query
+            .lessThanOrEqualTo("startDate", startDate)
+            .greaterThanOrEqualTo("endDate", startDate)
+            .or()
+            .lessThanOrEqualTo("startDate", endDate)
+            .greaterThanOrEqualTo("endDate", endDate)
+            .or()
+            .greaterThanOrEqualTo("startDate", startDate)
+            .lessThanOrEqualTo("endDate", endDate)
+
+        return query.findAll()
+    }
+
+    /**
+     * Multiple session sets update:
+     * Merges or splits session sets
+     * Does that by deleting then recreating
+     */
+    private fun cleanupSessionSets(session: Session, sessionSets: RealmResults<SessionSet>) {
+
+        // get all endedSessions from sets
+        val allImpactedSessions = mutableSetOf<Session>()
+        sessionSets.forEach { set ->
+            set.sessions?.asIterable()?.let { allImpactedSessions.addAll(it) }
+        }
+        allImpactedSessions.add(session)
+
+        // delete all sets
+        sessionSets.deleteAllFromRealm()
+
+        allImpactedSessions.forEach { impactedSession ->
+            val sets = matchingSets(impactedSession)
+            this.updateTimeFrames(sets, impactedSession)
+        }
 
 //			Timber.d("netDuration 3 = : ${set.timeFrame?.netDuration}")
 
-		}
+    }
-
+
-
+    /**
-		/**
+     * Update the global timeline using the impacted [sessionSets] and the updated [session]
-		 * Update the global timeline using the impacted [sessionSets] and the updated [session]
+     */
-		 */
+    private fun updateTimeFrames(sessionSets: RealmResults<SessionSet>, session: Session) {
-		private fun updateTimeFrames(sessionSets: RealmResults<SessionSet>, session: Session) {
+        when (sessionSets.size) {
-
+            0 -> this.createOrUpdateSessionSet(session)
-			when (sessionSets.size) {
+            else -> this.mergeSessionGroups(session, sessionSets)
-				0 -> this.createOrUpdateSessionSet(session)
+        }
-				else -> this.mergeSessionGroups(session, sessionSets)
+    }
-			}
+
-
+    /**
-		}
+     * Creates or update the session set for the [session]
-
+     */
-		/**
+    private fun createOrUpdateSessionSet(session: Session) {
-		 * Creates or update the session set for the [session]
+
-		 */
+        val set = session.sessionSet
-		private fun createOrUpdateSessionSet(session: Session) {
+        if (set != null) {
-
+            set.startDate = session.startDate!! // tested above
-			val set = session.sessionSet
+            set.endDate = session.endDate!!
-			if (set != null) {
+        } else {
-				set.startDate = session.startDate!! // tested above
+            this.createSessionSet(session)
-				set.endDate = session.endDate!!
+        }
-			} else {
+
-				this.createSessionSet(session)
+    }
-			}
+
-
+    /**
-		}
+     * Create a set and affect it to the [session]
-
+     */
-		/**
+    private fun createSessionSet(session: Session) {
-		 * Create a set and affect it to the [session]
+        val set = SessionSet.newInstance(session.realm)
-		 */
+        set.startDate = session.startDate!!
-		private fun createSessionSet(session: Session) {
+        set.endDate = session.endDate!!
-			val set: SessionSet = SessionSet.newInstance(session.realm)
+        set.breakDuration = session.breakDuration
-			set.startDate = session.startDate!!
+        session.sessionSet = set
-			set.endDate = session.endDate!!
+        set.computeStats()
-			set.breakDuration = session.breakDuration
+    }
-			session.sessionSet = set
+
-			set.computeStats()
+    /**
-		}
+     * Multiple session sets update:
-
+     * Merges all sets into one (delete all then create a new one)
-		/**
+     */
-		 * Multiple session sets update:
+    private fun mergeSessionGroups(session: Session, sessionSets: RealmResults<SessionSet>) {
-		 * Merges all sets into one (delete all then create a new one)
+
-		 */
+        var startDate = session.startDate!!
-		private fun mergeSessionGroups(session: Session, sessionSets: RealmResults<SessionSet>) {
+        var endDate = session.endDate!!
-
+
-			var startDate = session.startDate!!
+        // get all endedSessions from sets
-			var endDate = session.endDate!!
+        val sessions = mutableSetOf<Session>()
-
+        sessionSets.forEach { set ->
-			// get all endedSessions from sets
+            set.sessions?.asIterable()?.let { sessions.addAll(it) }
-			val sessions = mutableSetOf<Session>()
+        }
-			sessionSets.forEach { set ->
+
-				set.sessions?.asIterable()?.let { sessions.addAll(it) }
+        // find earlier and later dates from all sets
-			}
+        sessions.forEach { s ->
-
+
-			// find earlier and later dates from all sets
+            if (s.startDate != null && s.endDate != null) {
-			sessions.forEach { s ->
+                val start = s.startDate!!
-
+                val end = s.endDate!!
-				if (s.startDate != null && s.endDate != null) {
+                if (start.before(startDate)) {
-					val start = s.startDate!!
+                    startDate = start
-					val end = s.endDate!!
+                }
-					if (start.before(startDate)) {
+                if (end.after(endDate)) {
-						startDate = start
+                    endDate = end
-					}
+                }
-					if (end.after(endDate)) {
+            } else {
-						endDate = end
+                throw CorruptSessionSetException("Set contains unfinished sessions!")
-					}
+            }
-				} else {
+        }
-					throw CorruptSessionSetException("Set contains unfinished sessions!")
+
-				}
+        // delete all sets
-			}
+        sessionSets.deleteAllFromRealm()
-
+
-			// delete all sets
+        // Create a new set
-			sessionSets.deleteAllFromRealm()
+        val set = SessionSet.newInstance(session.realm)
-
+        set.startDate = startDate
-			// Create a new set
+        set.endDate = endDate
-			val set: SessionSet = SessionSet.newInstance(session.realm)
+
-			set.startDate = startDate
+        // Add the session linked to this timeframe to the new sessionGroup
-			set.endDate = endDate
+        session.sessionSet = set
-
+
-			// Add the session linked to this timeframe to the new sessionGroup
+        // Add all orphan endedSessions
-			session.sessionSet = set
+        sessions.forEach { s ->
-
+            s.sessionSet = set
-			// Add all orphan endedSessions
+        }
-			sessions.forEach { s ->
+        set.computeStats()
-				s.sessionSet = set
-				set.breakDuration = max(set.breakDuration, s.breakDuration)
-			}
-			set.computeStats()
 
 //			Timber.d("netDuration 3 = : ${set.timeFrame?.netDuration}")
 
-		}
+    }
 
-		/**
+    /**
-		 * Removes the [session] from the timeline
+     * Removes the [session] from the timeline
-		 */
+     */
-		fun removeFromTimeline(session: Session) {
+    fun removeFromTimeline(session: Session) {
 
-			if (!session.realm.isInTransaction) {
+//			if (!session.realm.isInTransaction) {
-				throw PAIllegalStateException("realm should be in transaction at this point")
+//				throw PAIllegalStateException("realm should be in transaction at this point")
-			}
+//			}
 
-			val sessionSet = session.sessionSet
+        val sessionSet = session.sessionSet
-			if (sessionSet != null) {
+        if (sessionSet != null) {
 
-				val sessions = mutableSetOf<Session>()
+            val sessions = mutableSetOf<Session>()
-				sessionSet.sessions?.asIterable()?.let { sessions.addAll(it) }
+            sessionSet.sessions?.asIterable()?.let { sessions.addAll(it) }
-				sessions.remove(session)
+            sessions.remove(session)
 
-				sessionSet.deleteFromRealm()
+            sessionSet.deleteFromRealm()
 
-				sessions.forEach {
+            sessions.forEach {
-					updateTimeline(it)
+                updateTimeline(it)
-				}
+            }
-			}
+        }
-		}
+    }
-
-	}
 
 }

app/src/main/java/net/pokeranalytics/android/ui/activity/DatabaseCopyActivity.kt

@@ -1,99 +0,0 @@
-package net.pokeranalytics.android.ui.activity
-
-import android.Manifest
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import androidx.fragment.app.FragmentActivity
-import io.realm.Realm
-import net.pokeranalytics.android.R
-import net.pokeranalytics.android.exceptions.PAIllegalStateException
-import net.pokeranalytics.android.ui.activity.components.BaseActivity
-import net.pokeranalytics.android.ui.activity.components.RequestCode
-import net.pokeranalytics.android.ui.activity.components.ResultCode
-import net.pokeranalytics.android.ui.extensions.showAlertDialog
-import net.pokeranalytics.android.ui.extensions.toast
-import net.pokeranalytics.android.util.copyStreamToFile
-import timber.log.Timber
-import java.io.File
-
-class DatabaseCopyActivity : BaseActivity() {
-
-    private lateinit var fileURI: Uri
-
-    enum class IntentKey(val keyName: String) {
-        URI("uri")
-    }
-
-    companion object {
-
-        /**
-         * Create a new instance for result
-         */
-        fun newInstanceForResult(context: FragmentActivity, uri: Uri) {
-            context.startActivityForResult(getIntent(context, uri), RequestCode.IMPORT.value)
-        }
-
-        private fun getIntent(context: Context, uri: Uri): Intent {
-            Timber.d("getIntent")
-            val intent = Intent(context, DatabaseCopyActivity::class.java)
-            intent.putExtra(IntentKey.URI.keyName, uri)
-            return intent
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        Timber.d("onCreate")
-
-        intent?.data?.let {
-            this.fileURI = it
-        } ?: run {
-            this.fileURI = intent.getParcelableExtra(IntentKey.URI.keyName) ?: throw PAIllegalStateException("Uri not found")
-        }
-
-//        setContentView(R.layout.activity_import)
-        requestImportConfirmation()
-    }
-
-    private fun initUI() {
-
-        askForPermission(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), RequestCode.PERMISSION_WRITE_EXTERNAL_STORAGE.value) {
-            val path = Realm.getDefaultInstance().path
-            contentResolver.openInputStream(fileURI)?.let { inputStream ->
-                val destination = File(path)
-                inputStream.copyStreamToFile(destination)
-                toast("Please restart app")
-            }
-        }
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-
-        when (requestCode) {
-            RequestCode.IMPORT.value -> {
-                if (resultCode == ResultCode.IMPORT_UNRECOGNIZED_FORMAT.value) {
-                    showAlertDialog(context = this, messageResId = R.string.unknown_import_format_popup_message, positiveAction = {
-                        finish()
-                    })
-                }
-            }
-        }
-    }
-
-    // Import
-
-    private fun requestImportConfirmation() {
-
-        showAlertDialog(context = this, title = R.string.import_confirmation, showCancelButton = true, positiveAction = {
-            initUI()
-        }, negativeAction = {
-            finish()
-        })
-
-    }
-
-}

app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt

@@ -17,10 +17,8 @@ import net.pokeranalytics.android.model.realm.Currency
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.ui.activity.components.BaseActivity
 import net.pokeranalytics.android.ui.adapter.HomePagerAdapter
-import net.pokeranalytics.android.util.BackupTask
 import net.pokeranalytics.android.util.Preferences
 import net.pokeranalytics.android.util.billing.AppGuard
-import net.pokeranalytics.android.util.csv.DataType
 import net.pokeranalytics.android.util.extensions.findAll
 import net.pokeranalytics.android.util.extensions.isSameMonth
 import java.util.*
@@ -78,7 +76,6 @@ class HomeActivity : BaseActivity(), NewPerformanceListener {
 		AppGuard.requestPurchasesUpdate()
 		this.homePagerAdapter?.activityResumed()
 		lookForCalendarBadge()
-		checkForFailedBackups()
 	}
 
 	private lateinit var binding: ActivityHomeBinding
@@ -116,11 +113,11 @@ class HomeActivity : BaseActivity(), NewPerformanceListener {
 		val realm = getRealm()
 
 		// observe currency changes
-		this.currencies = realm.where(Currency::class.java).findAll()
+		this.currencies = realm.where(Currency::class.java).findAllAsync()
-		this.currencies.addChangeListener { currencies, _ ->
+		this.currencies.addChangeListener { _, _ ->
-			realm.executeTransaction {
+			realm.executeTransactionAsync { asyncRealm ->
-				currencies.forEach {
+				asyncRealm.where(Currency::class.java).findAll().forEach { currency ->
-					it.refreshRelatedRatedValues()
+					currency.refreshRelatedRatedValues()
 				}
 			}
 		}
@@ -208,22 +205,4 @@ class HomeActivity : BaseActivity(), NewPerformanceListener {
 
 	}
 
-	private fun checkForFailedBackups() {
-
-		if (!Preferences.sessionsBackupSuccess(this)) {
-			Preferences.getBackupEmail(this)?.let { email ->
-				val task = BackupTask(DataType.SESSION, email, this)
-				task.start()
-			}
-		}
-
-		if (!Preferences.transactionsBackupSuccess(this)) {
-			Preferences.getBackupEmail(this)?.let { email ->
-				val task = BackupTask(DataType.TRANSACTION, email, this)
-				task.start()
-			}
-		}
-
-	}
-
 }

app/src/main/java/net/pokeranalytics/android/ui/activity/ImportActivity.kt

@@ -18,6 +18,7 @@ import net.pokeranalytics.android.ui.extensions.showAlertDialog
 import net.pokeranalytics.android.ui.fragment.ImportFragment
 import net.pokeranalytics.android.util.billing.AppGuard
 import net.pokeranalytics.android.util.extensions.count
+import timber.log.Timber
 
 class ImportActivity : BaseActivity() {
 
@@ -63,13 +64,11 @@ class ImportActivity : BaseActivity() {
 			val fragmentTransaction = supportFragmentManager.beginTransaction()
 			val fragment = ImportFragment()
 
-			fragment.setData(fileURI)
+			val fis = contentResolver.openInputStream(fileURI)
-
+			Timber.d("Load fragment data with: $fis")
-//			val fis = contentResolver.openInputStream(fileURI)
+			fis?.let {
-//			Timber.d("Load fragment data with: $fis")
+				fragment.setData(it)
-//			fis?.let {
+			}
-//				fragment.setData(it)
-//			}
 
 			fragmentTransaction.add(R.id.container, fragment)
 			fragmentTransaction.commit()

app/src/main/java/net/pokeranalytics/android/ui/activity/components/BaseActivity.kt

@@ -3,7 +3,6 @@ package net.pokeranalytics.android.ui.activity.components
 import android.Manifest.permission.ACCESS_FINE_LOCATION
 import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
 import android.os.PersistableBundle
 import android.view.MenuItem
@@ -22,8 +21,6 @@ import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.util.CrashLogging
 import net.pokeranalytics.android.util.LocationManager
 import net.pokeranalytics.android.util.PermissionRequest
-import net.pokeranalytics.android.util.Preferences
-import java.util.*
 
 class RootBottomSheetViewModel: ViewModel() {
 	var rowRepresentable: RowRepresentable? = null
@@ -58,14 +55,12 @@ abstract class BaseActivity : AppCompatActivity() {
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		CrashLogging.log("$this.localClassName onCreate, savedInstanceState=$savedInstanceState")
-		setLanguage()
 	}
 
 	override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
 		super.onCreate(savedInstanceState, persistentState)
 		CrashLogging.log("$this.localClassName onCreate: bundle=$savedInstanceState, persistentState=$persistentState")
 		requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT // fixes crash
-		setLanguage()
 	}
 
 	override fun onResume() {
@@ -134,25 +129,11 @@ abstract class BaseActivity : AppCompatActivity() {
 		fragmentTransaction.commit()
 	}
 
-	private fun setLanguage() {
+	fun addFragmentWithBackStack(fragment: Fragment, containerId: Int) {
-
+		val fragmentTransaction = supportFragmentManager.beginTransaction()
-		Preferences.getLanguageCode(this)?.let { languageCode ->
+		fragmentTransaction.add(containerId, fragment)
-
+		fragmentTransaction.addToBackStack(fragment.javaClass.toString())
-			val config = resources.configuration
+		fragmentTransaction.commit()
-//			val lang = "de" // your language code
-			val locale = Locale(languageCode)
-			Locale.setDefault(locale)
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-				config.setLocale(locale)
-			} else {
-				config.locale = locale
-			}
-
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-				createConfigurationContext(config)
-			resources.updateConfiguration(config, resources.displayMetrics)
-		}
-
 	}
 
 	/**

app/src/main/java/net/pokeranalytics/android/ui/activity/components/CameraActivity.kt

@@ -1,187 +0,0 @@
-package net.pokeranalytics.android.ui.activity.components
-
-import android.Manifest
-import android.app.Activity
-import android.content.ContentValues
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Build
-import android.os.Bundle
-import android.provider.MediaStore
-import android.widget.Toast
-import androidx.camera.core.CameraSelector
-import androidx.camera.core.ImageCapture
-import androidx.camera.core.ImageCaptureException
-import androidx.camera.core.Preview
-import androidx.camera.lifecycle.ProcessCameraProvider
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
-import net.pokeranalytics.android.databinding.ActivityCameraBinding
-import timber.log.Timber
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
-
-class CameraActivity : BaseActivity() {
-
-    companion object {
-
-        const val IMAGE_URI = "image_uri"
-
-        fun newInstanceForResult(fragment: Fragment, code: RequestCode) {
-            val intent = Intent(fragment.requireContext(), CameraActivity::class.java)
-            fragment.startActivityForResult(intent, code.value)
-        }
-
-        private const val FILENAME_FORMAT = "yyyy-MM-dd-HH-mm-ss-SSS"
-        private const val REQUEST_CODE_PERMISSIONS = 10
-        private val REQUIRED_PERMISSIONS =
-            mutableListOf (
-                Manifest.permission.CAMERA
-            ).apply {
-                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
-                    add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                }
-            }.toTypedArray()
-
-    }
-
-    private lateinit var viewBinding: ActivityCameraBinding
-
-    private lateinit var cameraExecutor: ExecutorService
-    private var imageCapture: ImageCapture? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        this.viewBinding = ActivityCameraBinding.inflate(layoutInflater)
-        setContentView(viewBinding.root)
-
-        if (allPermissionsGranted()) {
-            cameraExecutor = Executors.newSingleThreadExecutor()
-            startCamera()
-        } else {
-            ActivityCompat.requestPermissions(
-                this, REQUIRED_PERMISSIONS, REQUEST_CODE_PERMISSIONS)
-        }
-
-        viewBinding.imageCaptureButton.setOnClickListener { takePhoto() }
-        cameraExecutor = Executors.newSingleThreadExecutor()
-
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        this.cameraExecutor.shutdown()
-    }
-
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-
-        if (requestCode == REQUEST_CODE_PERMISSIONS) {
-            if (allPermissionsGranted()) {
-                startCamera()
-            } else {
-                Toast.makeText(this,
-                    "Permissions not granted by the user.",
-                    Toast.LENGTH_SHORT).show()
-                finish()
-            }
-        }
-    }
-
-    private fun allPermissionsGranted() = REQUIRED_PERMISSIONS.all {
-        ContextCompat.checkSelfPermission(
-            baseContext, it) == PackageManager.PERMISSION_GRANTED
-    }
-
-    private fun startCamera() {
-        val cameraProviderFuture = ProcessCameraProvider.getInstance(this)
-
-        cameraProviderFuture.addListener({
-            // Used to bind the lifecycle of cameras to the lifecycle owner
-            val cameraProvider: ProcessCameraProvider = cameraProviderFuture.get()
-
-            // Preview
-            val preview = Preview.Builder()
-                .build()
-                .also {
-                    it.setSurfaceProvider(this.viewBinding.viewFinder.surfaceProvider)
-                }
-
-            imageCapture = ImageCapture.Builder().build()
-
-            // Select back camera as a default
-            val cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA
-
-            try {
-                // Unbind use cases before rebinding
-                cameraProvider.unbindAll()
-
-                // Bind use cases to camera
-                cameraProvider.bindToLifecycle(
-                    this, cameraSelector, preview, imageCapture)
-
-            } catch(exc: Exception) {
-                Timber.e(exc)
-            }
-
-        }, ContextCompat.getMainExecutor(this))
-    }
-
-
-    private fun takePhoto() {
-        // Get a stable reference of the modifiable image capture use case
-        val imageCapture = imageCapture ?: return
-
-        // Create time stamped name and MediaStore entry.
-        val name = SimpleDateFormat(FILENAME_FORMAT, Locale.US)
-            .format(System.currentTimeMillis())
-        val contentValues = ContentValues().apply {
-            put(MediaStore.MediaColumns.DISPLAY_NAME, name)
-            put(MediaStore.MediaColumns.MIME_TYPE, "image/jpeg")
-            if(Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
-                put(MediaStore.Images.Media.RELATIVE_PATH, "Pictures/CameraX-Image")
-            }
-        }
-
-        // Create output options object which contains file + metadata
-        val outputOptions = ImageCapture.OutputFileOptions
-            .Builder(contentResolver,
-                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
-                contentValues)
-            .build()
-
-        // Set up image capture listener, which is triggered after photo has
-        // been taken
-        imageCapture.takePicture(
-            outputOptions,
-            ContextCompat.getMainExecutor(this),
-            object : ImageCapture.OnImageSavedCallback {
-                override fun onError(e: ImageCaptureException) {
-                    Timber.e(e)
-                }
-
-                override fun onImageSaved(output: ImageCapture.OutputFileResults) {
-
-//                    val msg = "Photo capture succeeded: ${output.savedUri}"
-//                    Toast.makeText(baseContext, msg, Toast.LENGTH_SHORT).show()
-//                    Timber.d(msg)
-
-                    val intent = Intent()
-                    intent.putExtra(IMAGE_URI, output.savedUri.toString())
-                    setResult(Activity.RESULT_OK, intent)
-
-                    finish()
-                }
-            }
-        )
-    }
-
-}

app/src/main/java/net/pokeranalytics/android/ui/activity/components/Codes.kt

@@ -16,8 +16,7 @@ enum class RequestCode(var value: Int) {
 	IMPORT(900),
 	SUBSCRIPTION(901),
 	CURRENCY(902),
-	PERMISSION_WRITE_EXTERNAL_STORAGE(1000),
+	PERMISSION_WRITE_EXTERNAL_STORAGE(1000)
-	CAMERA(1001)
 }
 
 enum class ResultCode(var value: Int) {

app/src/main/java/net/pokeranalytics/android/ui/activity/components/MediaActivity.kt

@@ -9,6 +9,7 @@ import android.provider.MediaStore
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -52,11 +53,11 @@ open class MediaActivity : BaseActivity() {
 
 				val filesList = ArrayList<File>()
 
-				GlobalScope.launch {
+				CoroutineScope(Dispatchers.Default).launch {
 
 					if (tempFile != null) {
 						tempFile?.let {
-							GlobalScope.launch(Dispatchers.Main) {
+							CoroutineScope(Dispatchers.Main).launch {
 								filesList.add(it)
 								getPictures(filesList)
 							}
@@ -65,7 +66,7 @@ open class MediaActivity : BaseActivity() {
 						data.clipData?.let { clipData ->
 							try {
 
-								GlobalScope.launch(Dispatchers.Main) {
+								CoroutineScope(Dispatchers.Main).launch {
 									isLoadingNewPictures()
 								}
 
@@ -78,7 +79,7 @@ open class MediaActivity : BaseActivity() {
 									filesList.add(photoFile)
 								}
 
-								GlobalScope.launch(Dispatchers.Main) {
+								CoroutineScope(Dispatchers.Main).launch {
 									getPictures(filesList)
 								}
 
@@ -90,7 +91,7 @@ open class MediaActivity : BaseActivity() {
 						data.data?.let { uri ->
 							try {
 
-								GlobalScope.launch(Dispatchers.Main) {
+								CoroutineScope(Dispatchers.Main).launch {
 									isLoadingNewPictures()
 								}
 
@@ -98,7 +99,7 @@ open class MediaActivity : BaseActivity() {
 								val photoFile = ImageUtils.createTempImageFile(this@MediaActivity)
 								ImageUtils.copyInputStreamToFile(inputStream!!, photoFile)
 								filesList.add(photoFile)
-								GlobalScope.launch(Dispatchers.Main) {
+								CoroutineScope(Dispatchers.Main).launch {
 									getPictures(filesList)
 								}
 

app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableAdapter.kt

@@ -68,4 +68,5 @@ class RowRepresentableAdapter(
 		this.dataSource = dataSource
 	}
 
+
 }

app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt

@@ -163,26 +163,14 @@ fun showEditTextAlertDialog(
         builder.setMessage(it)
     }
 
-    val layout = LinearLayout(context)
-    layout.orientation = LinearLayout.VERTICAL
-    val params = LinearLayout.LayoutParams(
-        LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT
-    )
-    params.setMargins(20, 0, 30, 0)
-
     val editText = EditText(context)
-    editText.inputType = inputType
-
     editTextText?.let {
         editText.text = SpannableStringBuilder(it)
     }
     editText.setTextColor(ContextCompat.getColor(context, R.color.white))
+    editText.inputType = inputType
 
-    layout.addView(editText, params)
+    builder.setView(editText)
-
-    builder.setView(layout)
-
-//    builder.setView(editText)
 
     builder.setPositiveButton(net.pokeranalytics.android.R.string.ok) { _, _ ->
         positiveAction?.invoke(editText.text.toString())

app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt

@@ -45,46 +45,27 @@ class CurrenciesFragment : BaseFragment(), StaticRowRepresentableDataSource, Row
 			)
 		}
 
-		private val availableCurrencies =
+		private val availableCurrencies = this.systemCurrencies.filter {
-			Locale.getAvailableLocales()
+			!mostUsedCurrencyCodes.contains(it.currencyCode)
-				.mapNotNull {
+		}.filter {
-					try {
+			UserDefaults.availableCurrencyLocales.filter { currencyLocale ->
-						Currency.getInstance(it)
+                Currency.getInstance(currencyLocale).currencyCode == it.currencyCode
-					} catch (e: Exception) {
+			}.isNotEmpty()
-						null
+		}.sortedBy {
-					}
+			it.displayName
-				}.toSet()
+		}.map {
-				.filter { !mostUsedCurrencyCodes.contains(it.currencyCode) }
+			CurrencyRow(it)
-				.filter {
+		}
-					UserDefaults.availableCurrencyLocales.any { currencyLocale ->
-						Currency.getInstance(currencyLocale).currencyCode == it.currencyCode
-					}
-				}
-				.sortedBy { it.displayName }
-				.map {  CurrencyRow(it) }
-
-//		private val availableCurrencies = this.systemCurrencies.filter {
-//			!mostUsedCurrencyCodes.contains(it.currencyCode)
-//		}.filter {
-//			UserDefaults.availableCurrencyLocales.filter { currencyLocale ->
-//                Currency.getInstance(currencyLocale).currencyCode == it.currencyCode
-//			}.isNotEmpty()
-//		}.sortedBy {
-//			it.displayName
-//		}.map {
-//			CurrencyRow(it)
-//		}
-
 	}
 
 	private class CurrencyRow(var currency: Currency) : RowRepresentable {
 
 		override fun getDisplayName(context: Context): String {
-			return this.currency.getDisplayName(Locale.getDefault()).capitalize()
+			return currency.getDisplayName(Locale.getDefault()).capitalize()
 		}
 
-		var currencyCode: String = this.currency.currencyCode
+		var currencyCode: String = currency.currencyCode
-		var currencySymbol: String = this.currency.getSymbol(Locale.getDefault())
+		var currencySymbol: String = currency.getSymbol(Locale.getDefault())
 		var currencyCodeAndSymbol: String = "${this.currencyCode} (${this.currencySymbol})"
 
 		override val viewType: Int = RowViewType.TITLE_VALUE.ordinal
@@ -129,6 +110,9 @@ class CurrenciesFragment : BaseFragment(), StaticRowRepresentableDataSource, Row
 
 	// RowRepresentableDelegate
 	override fun onRowSelected(position: Int, row: RowRepresentable, tag: Int) {
+
+
+
 		val intent = Intent()
 		intent.putExtra(INTENT_CURRENCY_CODE, (row as CurrencyRow).currency.currencyCode)
 		this.activity?.setResult(Activity.RESULT_OK, intent)

app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt

@@ -4,8 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import com.github.mikephil.charting.charts.BarChart
 import com.github.mikephil.charting.charts.BarLineChartBase
 import com.github.mikephil.charting.charts.LineChart
@@ -72,8 +70,7 @@ class GraphFragment : RealmFragment(), OnChartValueSelectedListener {
 					val styleIndex = bundle.getInt(BundleKey.STYLE.value)
 					return Graph.Style.values()[styleIndex]
 				} else {
-					return Graph.Style.LINE
+					throw PAIllegalStateException("Style not defined for $this")
-//					throw PAIllegalStateException("Style not defined for $this")
 				}
 			} ?: throw PAIllegalStateException("Style and bundle not defined for $this")
 		}
@@ -103,7 +100,6 @@ class GraphFragment : RealmFragment(), OnChartValueSelectedListener {
 		initData()
 		initUI()
 		loadGraph()
-
 	}
 
 	private fun initData() {

app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt

@@ -1,22 +1,17 @@
 package net.pokeranalytics.android.ui.fragment
 
-import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.*
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.databinding.FragmentImportBinding
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
 import net.pokeranalytics.android.util.csv.CSVImporter
 import net.pokeranalytics.android.util.csv.ImportDelegate
-import net.pokeranalytics.android.util.csv.ImportException
 import timber.log.Timber
 import java.io.InputStream
 import java.text.NumberFormat
@@ -26,7 +21,6 @@ class ImportFragment : RealmFragment(), ImportDelegate {
 
 	private lateinit var filePath: String
 	private lateinit var inputStream: InputStream
-	private lateinit var uri: Uri
 	private lateinit var importer: CSVImporter
 
     private var _binding: FragmentImportBinding? = null
@@ -55,10 +49,6 @@ class ImportFragment : RealmFragment(), ImportDelegate {
 		this.inputStream = inputStream
 	}
 
-	fun setData(uri: Uri) {
-		this.uri = uri
-	}
-
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 
@@ -93,20 +83,16 @@ class ImportFragment : RealmFragment(), ImportDelegate {
 
 		this.parentActivity?.paApplication?.reportWhistleBlower?.pause()
 
-		this.importer = CSVImporter(uri, requireContext())
+		this.importer = CSVImporter(inputStream)
 		this.importer.delegate = this
 
-		CoroutineScope(coroutineContext).launch {
+		CoroutineScope(Dispatchers.Main).launch {
 
-			val coroutine = GlobalScope.async {
+			val coroutine = CoroutineScope(Dispatchers.Default).async {
 				val s = Date()
 				Timber.d(">>> Start Import...")
 
-				try {
+				importer.start()
-					importer.start()
-				} catch (e: ImportException) {
-					exceptions.add(e)
-				}
 
 				val e = Date()
 				val duration = (e.time - s.time) / 1000.0
@@ -127,6 +113,15 @@ class ImportFragment : RealmFragment(), ImportDelegate {
 				snackBar.show()
 			}
 
+//			if (shouldDismissActivity) {
+//
+//				activity?.let {
+//					it.setResult(ResultCode.IMPORT_UNRECOGNIZED_FORMAT.value)
+//					it.finish()
+//				}
+//
+//			} else {
+//			}
 			importDidFinish()
 
 		}

app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportCreationFragment.kt

@@ -118,11 +118,6 @@ class ReportCreationFragment : RealmFragment(), RowRepresentableDataSource, RowR
 
 				if (this.assistant.step == Assistant.Step.FINALIZE) {
 
-//					getRealm().executeTransaction {
-//						val rs = this.assistant.options.reportSetup("test")
-//						it.insert(rs)
-//					}
-
 					// launch report
 					this.finishActivityWithOptions(this.assistant.options, this.assistant.reportDisplay)
 

app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt

@@ -1,8 +1,6 @@
 package net.pokeranalytics.android.ui.fragment
 
 import android.app.Activity
-import android.content.ClipData
-import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
@@ -10,19 +8,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.realm.Realm
 import io.realm.RealmResults
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.Calculator
 import net.pokeranalytics.android.calculus.NewPerformanceListener
-import net.pokeranalytics.android.calculus.ReportTask
+import net.pokeranalytics.android.calculus.Report
-import net.pokeranalytics.android.calculus.ReportWhistleBlower
 import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.calculus.calcul.ReportDisplay
 import net.pokeranalytics.android.databinding.FragmentReportsBinding
@@ -31,7 +24,6 @@ import net.pokeranalytics.android.model.combined
 import net.pokeranalytics.android.model.interfaces.Deletable
 import net.pokeranalytics.android.model.realm.Performance
 import net.pokeranalytics.android.model.realm.ReportSetup
-import net.pokeranalytics.android.model.realm.Result
 import net.pokeranalytics.android.ui.activity.ReportCreationActivity
 import net.pokeranalytics.android.ui.activity.components.ReportActivity
 import net.pokeranalytics.android.ui.activity.components.RequestCode
@@ -47,7 +39,7 @@ import net.pokeranalytics.android.ui.view.rows.StaticReport
 import net.pokeranalytics.android.util.NULL_TEXT
 import net.pokeranalytics.android.util.Preferences
 import timber.log.Timber
-import java.util.Date
+import java.util.*
 
 
 data class ReportSection(val report: StaticReport, var performances: MutableList<PerformanceRow>) {
@@ -66,10 +58,7 @@ data class ReportSection(val report: StaticReport, var performances: MutableList
 }
 
 data class PerformanceRow(val performance: Performance, val report: StaticReport): RowRepresentable {
-
-
 	override val resId: Int? = this.performance.resId
-
 	override val viewType: Int = RowViewType.TITLE_BADGE_VALUE.identifier
 }
 
@@ -77,6 +66,7 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc
 
 	private lateinit var reportSetups: RealmResults<ReportSetup>
 	private lateinit var performances: RealmResults<Performance>
+
 	private var adapterRows = mutableListOf<RowRepresentable>()
 
 	override fun deletableItems(): List<Deletable> {
@@ -137,7 +127,7 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc
 			val itemToDeleteId = data?.getStringExtra(DataListActivity.IntentKey.ITEM_DELETED.keyName)
 			itemToDeleteId?.let { id ->
 
-				CoroutineScope(coroutineContext).launch {
+				CoroutineScope(Dispatchers.Default).launch {
 					delay(300)
 					deleteItem(dataListAdapter, reportSetups, id)
 				}
@@ -158,12 +148,12 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc
 	 * Init data
 	 */
 	private fun initData() {
-		this.reportSetups = getRealm().where(ReportSetup::class.java).findAll().sort("name")
+		this.reportSetups = getRealm().where(ReportSetup::class.java).findAllAsync().sort("name")
 		this.reportSetups.addChangeListener { _, _ ->
 			this.updateRows()
 		}
 
-		this.performances = getRealm().where(Performance::class.java).findAll()
+		this.performances = getRealm().where(Performance::class.java).findAllAsync()
 		this.performances.addChangeListener { _, _ ->
 			this.updateRows()
 		}
@@ -188,24 +178,10 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc
 			adapter = dataListAdapter
 		}
 
-		binding.addButton.setOnClickListener {
+        binding.addButton.setOnClickListener {
 			ReportCreationActivity.newInstanceForResult(this, requireContext())
 		}
 
-		val sessionCount = getRealm().where(Result::class.java).count()
-		binding.computeButton.isVisible = adapterRows.isEmpty() && sessionCount > 5
-		binding.computeButton.setOnClickListener {
-
-			try {
-				forceReportWhistleBlowerStart()
-			} catch (e: Exception) {
-				e.message?.let {
-					this.showSnackBar(it)
-				}
-			}
-
-		}
-
 		this.paApplication?.reportWhistleBlower?.addListener(this)
 
 	}
@@ -219,7 +195,7 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc
 
 	private fun updateRows() {
 		this.adapterRows.clear()
-		if (this.reportSetups.isNotEmpty()) {
+		if (this.reportSetups.size > 0) {
 			adapterRows.add(CustomizableRowRepresentable(customViewType = RowViewType.HEADER_TITLE, resId = R.string.custom))
 			adapterRows.addAll(this.reportSetups)
 		}
@@ -333,17 +309,14 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc
 
 		showLoader()
 
-		CoroutineScope(coroutineContext).launch {
+		CoroutineScope(Dispatchers.Default).launch {
 
-			val startDate = Date()
 			val realm = Realm.getDefaultInstance()
 			realm.refresh()
 
 			val report = Calculator.computeStats(realm, options = options)
 
-			Timber.d("launchComputation: ${System.currentTimeMillis() - startDate.time}ms")
+			CoroutineScope(Dispatchers.Main).launch {
-
-			launch(Dispatchers.Main) {
 				if (!isDetached) {
 					hideLoader()
 					ReportActivity.newInstanceForResult(this@ReportsFragment, report, reportDisplay, reportName)
@@ -362,32 +335,4 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc
 
 	}
 
-	private fun forceReportWhistleBlowerStart() {
-
-		val rwb = ReportWhistleBlower(requireContext())
-		val reportTask = ReportTask(rwb, requireContext())
-		reportTask.handler = {
-
-			Timber.d("test")
-
-			val paused = paApplication?.reportWhistleBlower?.paused
-			reportTask.messages.add(">>> main RWB paused = $paused")
-
-			val message = reportTask.messages.joinToString("\n")
-			CoroutineScope(coroutineContext).launch(Dispatchers.Main) {
-				Timber.d("test2")
-
-				copyToClipboard(requireContext(), message)
-			}
-		}
-
-		reportTask.start()
-
-	}
-
-	fun copyToClipboard(context: Context, text: String) {
-		val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-		val clip = ClipData.newPlainText("label", text)
-		clipboard.setPrimaryClip(clip)
-	}
 }

app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt

@@ -11,12 +11,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
 import androidx.core.content.FileProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.android.billingclient.api.Purchase
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.play.core.review.ReviewException
 import com.google.android.play.core.review.ReviewManagerFactory
 import io.realm.Realm
 import net.pokeranalytics.android.BuildConfig
@@ -45,12 +42,7 @@ import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
 import net.pokeranalytics.android.ui.modules.settings.DealtHandsPerHourActivity
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.rows.SettingsRow
-import net.pokeranalytics.android.util.FileUtils
+import net.pokeranalytics.android.util.*
-import net.pokeranalytics.android.util.Language
-import net.pokeranalytics.android.util.Preferences
-import net.pokeranalytics.android.util.StopNotificationManager
-import net.pokeranalytics.android.util.URL
-import net.pokeranalytics.android.util.UserDefaults
 import net.pokeranalytics.android.util.billing.AppGuard
 import net.pokeranalytics.android.util.billing.IAPProducts
 import net.pokeranalytics.android.util.billing.PurchaseListener
@@ -59,7 +51,7 @@ import net.pokeranalytics.android.util.extensions.dateTimeFileFormatted
 import timber.log.Timber
 import java.io.File
 import java.io.IOException
-import java.util.Date
+import java.util.*
 
 
 class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRepresentableDataSource, PurchaseListener {
@@ -76,12 +68,11 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 			return fragment
 		}
 
-//		fun rowRepresentation(context: Context): List<RowRepresentable> {
+		val rowRepresentation: List<RowRepresentable> by lazy {
-//			val rows = ArrayList<RowRepresentable>()
+			val rows = ArrayList<RowRepresentable>()
-//			val hasBackupEmail = Preferences.getBackupEmail(context)?.isNotBlank() ?: false
+			rows.addAll(SettingsRow.getRows())
-//			rows.addAll(SettingsRow.getRows(hasBackupEmail))
+			rows
-//			return rows
+		}
-//		}
 
 	}
 
@@ -165,27 +156,27 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 
 	private fun updateMainCurrency(currencyCode: String) {
 
-		val mainCurrencyCode = UserDefaults.currency.currencyCode
+		Preferences.getDefaultCurrency(requireContext())?.currencyCode?.let { mainCurrencyCode ->
 
-		if (mainCurrencyCode == currencyCode) {
+			if (mainCurrencyCode == currencyCode) {
-			return
+				return
-		}
+			}
-		showLoader(R.string.please_wait)
+			showLoader(R.string.please_wait)
 
-		CurrencyConverterApi.currencyRate(mainCurrencyCode, currencyCode, requireContext()) { apiRate, _ ->
+			CurrencyConverterApi.currencyRate(mainCurrencyCode, currencyCode, requireContext()) { apiRate, _ ->
-			hideLoader()
+				hideLoader()
 
-			val message = requireContext().getString(R.string.currency_rate_confirmation, mainCurrencyCode, currencyCode)
+				val message = requireContext().getString(R.string.currency_rate_confirmation, mainCurrencyCode, currencyCode)
 
-			context?.let { context ->
+
-				showEditTextAlertDialog(context, InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL,
+//				val message = "Please enter the $mainCurrencyCode to $currencyCode rate to apply to all your bankrolls"
+				showEditTextAlertDialog(requireContext(), InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL,
 					message = message, editTextText = apiRate?.toString()) { value ->
 					value.toDoubleOrNull()?.let { rate ->
 						updateMainCurrency(currencyCode, rate)
 					}
 				}
 			}
-
 		}
 
 	}
@@ -194,12 +185,12 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 
 		Preferences.setCurrencyCode(currencyCode, requireContext())
 		val realm = Realm.getDefaultInstance()
-		realm.executeTransaction {
+		realm.executeTransactionAsync { execRealm->
-			realm.where(Currency::class.java).findAll().forEach { currency ->
+			execRealm.where(Currency::class.java).findAll().forEach { currency ->
 				currency.rate = (currency.rate ?: 1.0) * rate
 			}
 
-			realm.where(Session::class.java).findAll().forEach { session ->
+			execRealm.where(Session::class.java).findAll().forEach { session ->
 				session.bankrollHasBeenUpdated()
 			}
 		}
@@ -208,7 +199,7 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 	}
 
 	override fun adapterRows(): List<RowRepresentable> {
-		return SettingsRow.getRows()
+		return rowRepresentation
 	}
 
 	override fun charSequenceForRow(
@@ -220,7 +211,6 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 			SettingsRow.SUBSCRIPTION -> AppGuard.subscriptionStatus(requireContext())
 			SettingsRow.VERSION -> BuildConfig.VERSION_NAME + if (BuildConfig.DEBUG) " (${BuildConfig.VERSION_CODE}) DEBUG" else ""
 			SettingsRow.CURRENCY -> UserDefaults.currency.symbol
-			SettingsRow.BACKUP_EMAIL -> Preferences.getBackupEmail(requireContext()) ?: ""
 			else -> ""
 		}
 	}
@@ -230,7 +220,6 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 			SettingsRow.STOP_NOTIFICATION -> Preferences.showStopNotifications(requireContext())
 			SettingsRow.SHOULD_SHOW_BLOG_TIPS -> Preferences.shouldShowBlogTips(requireContext())
 			SettingsRow.SHOW_INAPP_BADGES -> Preferences.showInAppBadges(requireContext())
-			SettingsRow.BACKUP_EMAIL -> !Preferences.hasBackupEmail(requireContext())
 			else -> false
 		}
 	}
@@ -247,13 +236,11 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 					this.openPlayStoreAccount()
 				}
 			}
-			SettingsRow.LANGUAGE -> this.showLanguagePopup()
 			SettingsRow.RATE_APP -> showReviewManager()
 			SettingsRow.CONTACT_US -> parentActivity?.openContactMail(R.string.contact)
 			SettingsRow.BUG_REPORT -> parentActivity?.openContactMail(R.string.bug_report_subject, Realm.getDefaultInstance().path)
 			SettingsRow.CURRENCY -> CurrenciesActivity.newInstanceForResult(this@SettingsFragment, RequestCode.CURRENCY.value)
 			SettingsRow.DEALT_HANDS_PER_HOUR -> DealtHandsPerHourActivity.newInstance(requireContext())
-			SettingsRow.BACKUP_EMAIL -> this.editBackupEmail()
 			SettingsRow.EXPORT_CSV_SESSIONS -> this.sessionsCSVExport()
 			SettingsRow.EXPORT_CSV_TRANSACTIONS -> this.transactionsCSVExport()
 			SettingsRow.FOLLOW_US -> {
@@ -277,40 +264,6 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 		}
 	}
 
-	private fun showLanguagePopup() {
-
-		context?.let { context ->
-
-			val languages = Language.values()
-			val labels = Language.values().map { it.dualNames }
-
-			val builder: AlertDialog.Builder = AlertDialog.Builder(context)
-			builder.setTitle(R.string.language_popup_message)
-			builder.setItems(labels.toTypedArray()) { _, which ->
-				// the user clicked on colors[which]
-				val locale = languages[which]
-				Preferences.setLanguageCode(locale.code, context)
-
-				this.view?.let { view ->
-					val snackBar = Snackbar.make(view, R.string.language_should_restart_app_popup_message, Snackbar.LENGTH_INDEFINITE)
-					snackBar.show()
-				}
-
-			}
-			builder.show()
-		}
-
-	}
-
-	private fun editBackupEmail() {
-		context?.let { context ->
-			showEditTextAlertDialog(context, InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS, messageResId = R.string.backup_email_title, editTextText = Preferences.getBackupEmail(context)) { value ->
-				Preferences.setBackupEmail(value, context)
-				this.settingsAdapterRow.notifyDataSetChanged()
-			}
-		}
-	}
-
 	private fun showReviewManager() {
 
 		val manager = ReviewManagerFactory.create(requireContext())
@@ -324,8 +277,6 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 					// completed
 				}
 			} else {
-				val exception = (task.exception as ReviewException)
-				Timber.d("requestReviewFlow not successful = ${exception.message}")
 				// There was some problem, continue regardless of the result.
 			}
 		}

app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt

@@ -8,8 +8,9 @@ import android.os.Bundle
 import android.view.*
 import androidx.appcompat.widget.Toolbar
 import io.realm.Realm
+import io.realm.RealmModel
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import net.pokeranalytics.android.R
@@ -30,7 +31,6 @@ import net.pokeranalytics.android.ui.modules.filter.FilterableType
 import net.pokeranalytics.android.ui.modules.filter.FiltersActivity
 import net.pokeranalytics.android.ui.modules.settings.TransactionFilterActivity
 import timber.log.Timber
-import java.util.*
 
 class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 
@@ -76,6 +76,7 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 	    addRealmChangeListener(this, UserConfig::class.java)
 	    addRealmChangeListener(this, ComputableResult::class.java)
 	    addRealmChangeListener(this, Transaction::class.java)
+	    addRealmChangeListener(this, SessionSet::class.java)
     }
 
 	private fun initUI() {
@@ -99,10 +100,11 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 
 	private fun setTransactionFilterItemColor() {
 		context?.let {
-			val userConfig = UserConfig.getConfiguration(getRealm())
+			UserConfig.getConfiguration(getRealm()) { userConfig ->
-			val color = if (userConfig.transactionTypeIds.isNotEmpty()) R.color.red else R.color.white
+				val color = if (userConfig.transactionTypeIds.isNotEmpty()) R.color.red else R.color.white
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-				this.transactionFilterMenuItem?.iconTintList = ColorStateList.valueOf(it.getColor(color))
+					this.transactionFilterMenuItem?.iconTintList = ColorStateList.valueOf(it.getColor(color))
+				}
 			}
 		}
 	}
@@ -146,11 +148,13 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 
 	// Business
 
-	override fun asyncListenedEntityChange(realm: Realm) {
+	override fun asyncListenedEntityChange(realm: Realm, clazz: Class<out RealmModel>) {
+
 		if (isAdded) { // Fixes: java.lang.IllegalStateException Fragment StatisticsFragment{9d3e5ec} not attached to a context.
 			launchStatComputation()
 			setTransactionFilterItemColor()
 		}
+
 	}
 
 	/**
@@ -158,10 +162,10 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 	 */
 	private fun launchStatComputation() {
 
-		CoroutineScope(coroutineContext).launch {
+		CoroutineScope(Dispatchers.Default).launch {
 
-			val async = GlobalScope.async {
+			val async = async {
-				val s = Date()
+//				val s = Date()
 //				Timber.d(">>> start...")
 
 				val realm = Realm.getDefaultInstance()
@@ -172,15 +176,17 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 
 				realm.close()
 
-				val e = Date()
+//				val e = Date()
-				val duration = (e.time - s.time) / 1000.0
+//				val duration = (e.time - s.time) / 1000.0
 //				Timber.d(">>> ended in $duration seconds")
 
 			}
 			async.await()
 
-			if (isAdded && !isDetached) {
+			launch(Dispatchers.Main) {
-				tableReportFragment.showResults()
+				if (isAdded && !isDetached) {
+					tableReportFragment.showResults()
+				}
 			}
 		}
 	}
@@ -190,11 +196,8 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 	 */
 	private fun createSessionGroupsAndStartCompute(realm: Realm): Report {
 
-		var filter: Filter? = null
+		val filter: Filter? = this.currentFilter(this.requireContext(), realm)?.let {
-		context?.let { context ->
+			if (it.filterableType == currentFilterable) { it } else { null }
-			this.currentFilter(context, realm)?.let { current ->
-				if (current.filterableType == currentFilterable) { filter = current }
-			}
 		}
 
 		val allStats: List<Stat> = listOf(
@@ -241,7 +244,7 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 
 		val tSessionGroup = ComputableGroup(Query(QueryCondition.IsTournament).merge(query), tStats)
 
-//		Timber.d(">>>>> Start computations...")
+		Timber.d(">>>>> Start computations...")
 
 		val options = Calculator.Options()
 		val computedStats = mutableListOf<Stat>()
@@ -250,7 +253,9 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 		computedStats.addAll(tStats)
 		options.stats = computedStats
 
-		options.includedTransactions = UserConfig.getConfiguration(realm).transactionTypes(realm)
+		UserConfig.getConfiguration(realm) { userConfig ->
+			options.includedTransactions = userConfig.transactionTypes(realm)
+		}
 
 		return Calculator.computeGroups(realm, listOf(allSessionGroup, cgSessionGroup, tSessionGroup), options)
 	}

app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt

@@ -30,7 +30,6 @@ import net.pokeranalytics.android.util.Preferences
 import net.pokeranalytics.android.util.billing.AppGuard
 import net.pokeranalytics.android.util.billing.IAPProducts
 import net.pokeranalytics.android.util.billing.PurchaseListener
-import net.pokeranalytics.android.util.extensions.isNetworkAvailable
 import timber.log.Timber
 import java.lang.ref.WeakReference
 import java.time.Period
@@ -76,7 +75,7 @@ class SubscriptionFragment : BaseFragment(), ProductDetailsResponseListener, Pur
 
 		AppGuard.registerListener(this)
 
-		if (!requireContext().isNetworkAvailable()) {
+		if (!isNetworkAvailable()) {
 			Toast.makeText(requireContext(), R.string.connection_unavailable, Toast.LENGTH_LONG).show()
 			return
 		}
@@ -159,10 +158,10 @@ class SubscriptionFragment : BaseFragment(), ProductDetailsResponseListener, Pur
 		purchase.isEnabled = true
 		purchase.setOnClickListener {
 
-			val network = requireContext().isNetworkAvailable()
+			val network = isNetworkAvailable()
 			Timber.d("isNetworkAvailable = $network ")
 
-			if (!network) {
+			if (!isNetworkAvailable()) {
 				Toast.makeText(requireContext(), R.string.connection_unavailable, Toast.LENGTH_LONG).show()
 				return@setOnClickListener
 			}

app/src/main/java/net/pokeranalytics/android/ui/fragment/Top10Fragment.kt

@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.tabs.TabLayout
 import io.realm.RealmResults
 import io.realm.kotlin.where
@@ -16,6 +15,7 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
+import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager
 
 
 class Top10Fragment : RealmFragment(), RowRepresentableDataSource, RowRepresentableDelegate {
@@ -98,10 +98,11 @@ class Top10Fragment : RealmFragment(), RowRepresentableDataSource, RowRepresenta
 			}
 		})
 
-//		val viewManager = SmoothScrollLinearLayoutManager(requireContext())
+
+		val viewManager = SmoothScrollLinearLayoutManager(requireContext())
 		recyclerView.apply {
 			setHasFixedSize(true)
-			layoutManager = LinearLayoutManager(requireContext())
+			layoutManager = viewManager
 		}
 
 	}

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BaseFragment.kt

@@ -1,10 +1,11 @@
 package net.pokeranalytics.android.ui.fragment.components
 
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
 import com.google.android.material.snackbar.Snackbar
 import net.pokeranalytics.android.PokerAnalyticsApplication
@@ -41,12 +42,6 @@ abstract class BaseFragment : Fragment() {
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 		initUI()
-
-		ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
-			val statusBarHeight = insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
-			v.setPadding(0, statusBarHeight, 0, 0)
-			insets
-		}
 	}
 
 	override fun onResume() {
@@ -114,6 +109,11 @@ abstract class BaseFragment : Fragment() {
 		view?.findViewById<Toolbar>(R.id.toolbar)?.let { toolbar ->
 			parentActivity?.setSupportActionBar(toolbar)
 		}
+
+		context?.getColor(R.color.kaki_darkest)?.let { color ->
+			view?.setBackgroundColor(color)
+		}
+
 	}
 
 	/**
@@ -181,6 +181,15 @@ abstract class BaseFragment : Fragment() {
 			alternativeLabels)
 	}
 
+	/***
+	 * Returns whether the network is available or not
+	 */
+	fun isNetworkAvailable(): Boolean {
+		val cm = requireContext().getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+		val capability = cm.getNetworkCapabilities(cm.activeNetwork)
+		return capability?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) ?: false
+	}
+
 	fun showSnackBar(message: String) {
 		this.view?.let { view ->
 			val snackBar = Snackbar.make(view, message, Snackbar.LENGTH_INDEFINITE)

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt

@@ -8,15 +8,13 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import com.google.android.material.snackbar.Snackbar
 import io.realm.RealmObject
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.*
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.interfaces.Deletable
 import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
+import net.pokeranalytics.android.util.extensions.findById
 
 /**
  * Deletable Item Fragment
@@ -56,7 +54,7 @@ abstract class DeletableItemFragment : RealmFragment() {
 
 			val itemToDeleteId = data?.getStringExtra(DataListActivity.IntentKey.ITEM_DELETED.keyName)
 			itemToDeleteId?.let { id ->
-				GlobalScope.launch(Dispatchers.Main) {
+				CoroutineScope(Dispatchers.Main).launch {
 					delay(300)
 					deleteItem(dataListAdapter, deletableItems(), id)
 				}
@@ -84,14 +82,21 @@ abstract class DeletableItemFragment : RealmFragment() {
 
 		if (itemToDelete is RealmObject && itemPosition != -1) {
 
+			val itemClass = itemToDelete.realmObjectClass
+
 			// Check if the object is valid for the deletion
 			if (itemToDelete.isValidForDelete(this.getRealm())) {
 				deletedItem = getRealm().copyFromRealm(itemToDelete)
 				lastDeletedItemPosition = itemPosition
-				getRealm().executeTransaction {
+
-					itemToDelete.deleteDependencies(it)
+				getRealm().executeTransactionAsync { asyncRealm ->
-					itemToDelete.deleteFromRealm()
+					val item = asyncRealm.findById(itemClass, itemId) as? Deletable
+					item?.let {
+						item.deleteDependencies(asyncRealm)
+						(item as RealmObject).deleteFromRealm()
+					}
 				}
+
 				itemHasBeenReInserted = false
 				updateUIAfterDeletion(itemId, itemPosition)
 				showUndoSnackBar()
@@ -117,7 +122,8 @@ abstract class DeletableItemFragment : RealmFragment() {
 			snackBar?.setAction(R.string.cancel) {
 				if (!itemHasBeenReInserted) {
 					itemHasBeenReInserted = true
-					getRealm().executeTransaction { realm ->
+
+					getRealm().executeTransactionAsync { realm ->
 						deletedItem?.let {
 							val item = realm.copyToRealmOrUpdate(it)
 							updateUIAfterUndoDeletion(item)

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt

@@ -4,7 +4,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.os.Build
 import android.os.Bundle
 import android.view.*
 import android.widget.ImageView
@@ -58,12 +57,11 @@ open class FilterableFragment : RealmFragment(), FilterHandler {
 
 	override fun onActivityCreated(savedInstanceState: Bundle?) {
 		super.onActivityCreated(savedInstanceState)
-
+		parentActivity?.registerReceiver(
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            updateFilterUIBroadcast, IntentFilter(
-			parentActivity?.registerReceiver(updateFilterUIBroadcast, IntentFilter(INTENT_FILTER_UPDATE_FILTER_UI), Context.RECEIVER_EXPORTED)
+                INTENT_FILTER_UPDATE_FILTER_UI
-		} else {
+            )
-			parentActivity?.registerReceiver(updateFilterUIBroadcast, IntentFilter(INTENT_FILTER_UPDATE_FILTER_UI))
+        )
-		}
 	}
 
 	override fun onDestroy() {

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/RealmFragment.kt

@@ -4,25 +4,18 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import io.realm.Realm
 import io.realm.RealmModel
 import io.realm.RealmResults
-import kotlinx.coroutines.Dispatchers
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
-import timber.log.Timber
+import net.pokeranalytics.android.util.Global
-import kotlin.coroutines.CoroutineContext
 
 interface RealmAsyncListener {
-	fun asyncListenedEntityChange(realm: Realm)
+	fun asyncListenedEntityChange(realm: Realm, clazz: Class<out RealmModel>)
 }
 
 open class RealmFragment : BaseFragment() {
 
-	val coroutineContext: CoroutineContext
-		get() = Dispatchers.Main
-
 	/**
 	 * A realm instance
 	 */
@@ -43,15 +36,14 @@ open class RealmFragment : BaseFragment() {
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		realm = Realm.getDefaultInstance()
 
-		this.observedEntities.forEach {
+//		this.observedEntities.forEach {
-			val realmResults = realm.where(it).findAll()
+//			val realmResults = realm.where(it).findAllAsync()
-
+//			realmResults.addChangeListener { t, _ ->
-			realmResults.addChangeListener { t, _ ->
+//				this.entitiesChanged(it, t)
-				this.entitiesChanged(it, t)
+//			}
-			}
+//
-
+//			this.observedRealmResults.add(realmResults)
-			this.observedRealmResults.add(realmResults)
+//		}
-		}
 
 		return super.onCreateView(inflater, container, savedInstanceState)
 	}
@@ -72,8 +64,10 @@ open class RealmFragment : BaseFragment() {
 		this.changeListener = listener
 		val results = this.realm.where(clazz).findAllAsync()
 		results.addChangeListener { t, _ ->
-			Timber.d("Realm changes: ${realmResults?.size}, $this")
+//			Timber.d("Realm changes: ${realmResults?.size}, $this")
-			this.changeListener?.asyncListenedEntityChange(t.realm)
+			if (Global.LAUNCH_ASYNC_LISTENERS) {
+				this.changeListener?.asyncListenedEntityChange(t.realm, clazz)
+			}
 		}
 		this.observedRealmResults.add(results)
 	}
@@ -92,11 +86,11 @@ open class RealmFragment : BaseFragment() {
 	/**
 	 * A list of RealmModel classes to observe
 	 */
-	open val observedEntities: List<Class<out RealmModel>> = listOf()
+//	open val observedEntities: List<Class<out RealmModel>> = listOf()
 
 	/**
 	 * The method called when a change happened in any RealmResults
 	 */
-	open fun entitiesChanged(clazz: Class<out RealmModel>, results: RealmResults<out RealmModel>) {}
+//	open fun entitiesChanged(clazz: Class<out RealmModel>, results: RealmResults<out RealmModel>) {}
 
 }

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDataListFragment.kt

@@ -13,7 +13,7 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 
-open class BottomSheetListFragment : BottomSheetFragment(), LiveRowRepresentableDataSource, RowRepresentableDelegate {
+open class BottomSheetDataListFragment : BottomSheetFragment(), LiveRowRepresentableDataSource, RowRepresentableDelegate {
 
     private var _binding: BottomSheetListBinding? = null
     private val binding get() = _binding!!
@@ -62,18 +62,8 @@ open class BottomSheetListFragment : BottomSheetFragment(), LiveRowRepresentable
 	}
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, tag: Int) {
-
 		this.onRowSelected(position)
 		dismiss()
-//		this.viewModel.realmData?.let {
-//			val selectedData = it[position]
-//			selectedData?.let {data ->
-//				this.viewModel.onRowValueChanged(data)
-////				this.delegate.onRowValueChanged(data, this.row)
-//				dismiss()
-//			}
-//		}
-//		super.onRowSelected(position, row, tag)
 	}
 
 	/**

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDataMultiSelectionFragment.kt

@@ -2,22 +2,16 @@ package net.pokeranalytics.android.ui.fragment.components.bottomsheet
 
 import android.app.Activity
 import android.content.Intent
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import io.realm.RealmModel
-import net.pokeranalytics.android.databinding.BottomSheetDoubleEditTextBinding
-import net.pokeranalytics.android.databinding.BottomSheetListBinding
 import net.pokeranalytics.android.model.LiveData
-import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.activity.components.BaseActivity
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 
 /**
  * Manage multiple items selection in a bottom sheet list
  */
-open class BottomSheetMultiSelectionFragment : BottomSheetListFragment() {
+open class BottomSheetDataMultiSelectionFragment : BottomSheetDataListFragment() {
 
 	override fun viewTypeForPosition(position: Int): Int {
 		return RowViewType.TITLE_CHECK.ordinal
@@ -27,11 +21,14 @@ open class BottomSheetMultiSelectionFragment : BottomSheetListFragment() {
 		if (requestCode == REQUEST_CODE_ADD_NEW_OBJECT && resultCode == Activity.RESULT_OK && data != null) {
 			val dataType = data.getIntExtra(EditableDataActivity.IntentKey.DATA_TYPE.keyName, 0)
 			val primaryKey = data.getStringExtra(EditableDataActivity.IntentKey.PRIMARY_KEY.keyName)
-			val pokerAnalyticsActivity = activity as BaseActivity
+
 			val liveDataType = LiveData.values()[dataType]
-			val proxyItem: RealmModel? = liveDataType.getData(pokerAnalyticsActivity.getRealm(), primaryKey)
+			val realm = (activity as BaseActivity).getRealm()
-			this.model.selectedRows.add(proxyItem as RowRepresentable)
+			liveDataType.getData(realm, primaryKey)?.let { proxyItem ->
-			this.refreshRow(proxyItem as RowRepresentable)
+				val copy = realm.copyFromRealm(proxyItem)
+				this.model.selectedRows.add(copy as RowRepresentable)
+				this.refreshRow(copy as RowRepresentable)
+			}
 //			dataAdapter.refreshRow(proxyItem as RowRepresentable)
 		}
 	}

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt

@@ -18,13 +18,16 @@ import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.ui.activity.components.BaseActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
+import net.pokeranalytics.android.ui.fragment.components.BaseFragment
 import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.rows.SessionPropertiesRow
 import net.pokeranalytics.android.ui.view.rows.TransactionPropertiesRow
+import net.pokeranalytics.android.ui.viewmodel.AddedDataViewModel
 import net.pokeranalytics.android.ui.viewmodel.BottomSheetViewModel
 import net.pokeranalytics.android.ui.viewmodel.BottomSheetViewModelFactory
+import timber.log.Timber
 import java.util.*
 
 class BottomSheetConfig(var row: RowRepresentable,
@@ -48,6 +51,10 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
     private var _binding: FragmentBottomSheetBinding? = null
     private val binding get() = _binding!!
 
+	protected open val addedDataViewModel: AddedDataViewModel by lazy {
+		ViewModelProvider(requireActivity()).get(AddedDataViewModel::class.java)
+	}
+
 	companion object {
 
 		private var config: BottomSheetConfig? = null
@@ -75,11 +82,11 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 		private fun newInstance(bottomSheetType: BottomSheetType): BottomSheetFragment {
 			return when (bottomSheetType) {
 				BottomSheetType.NONE -> BottomSheetFragment()
-				BottomSheetType.LIST -> BottomSheetListFragment()
+				BottomSheetType.LIST -> BottomSheetDataListFragment()
 				BottomSheetType.LIST_STATIC -> BottomSheetStaticListFragment()
 				BottomSheetType.LIST_GAME -> BottomSheetListGameFragment()
 				BottomSheetType.DOUBLE_LIST -> BottomSheetListGameFragment()
-				BottomSheetType.MULTI_SELECTION -> BottomSheetMultiSelectionFragment()
+				BottomSheetType.MULTI_SELECTION -> BottomSheetDataMultiSelectionFragment()
 				BottomSheetType.GRID -> BottomSheetTableSizeGridFragment()
 				BottomSheetType.EDIT_TEXT -> BottomSheetEditTextFragment()
 				BottomSheetType.EDIT_TEXT_MULTI_LINES -> BottomSheetEditTextMultiLinesFragment()
@@ -95,6 +102,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		//TODO: When dependency 'com.google.android.material:material:1.1.0' will be available in stable version, upgrade and remove that
         activity?.setTheme(R.style.PokerAnalyticsTheme)
+
         _binding = FragmentBottomSheetBinding.inflate(inflater, container, false)
         inflateContentView(inflater, binding.root)
         return binding.root
@@ -112,10 +120,10 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
     private fun initModel() {
 
 		val row = config?.row
-			?: (activity as? BaseActivity)?.bottomSheetViewModel?.rowRepresentable
+			?: (requireActivity() as? BaseActivity)?.bottomSheetViewModel?.rowRepresentable
 			?: throw PAIllegalStateException("row not found")
 		val delegate = config?.delegate
-			?: (activity as? BaseActivity)?.bottomSheetViewModel?.delegate
+			?: (requireActivity() as? BaseActivity)?.bottomSheetViewModel?.delegate
 			?: throw PAIllegalStateException("delegate not found")
 
 		val factory = BottomSheetViewModelFactory(row, delegate)
@@ -169,10 +177,18 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 			val primaryKey = data.getStringExtra(EditableDataActivity.IntentKey.PRIMARY_KEY.keyName)
 			val pokerAnalyticsActivity = activity as BaseActivity
 			val liveDataType = LiveData.values()[dataType]
-			this.model.addedData = liveDataType.getData(pokerAnalyticsActivity.getRealm(), primaryKey)
+
-			this.onRowValueChanged()
+			val realm = pokerAnalyticsActivity.getRealm()
+			liveDataType.getData(realm, primaryKey)?.let {
+				this.model.addedData = realm.copyFromRealm(it)
+				this.onRowValueChanged()
+				dismiss()
+			} ?: run {
+				Timber.w("Data not found with primary key = $primaryKey")
+			}
+
+//			this.model.addedData = liveDataType.getData(pokerAnalyticsActivity.getRealm(), primaryKey)
 //			this.delegate.onRowValueChanged(proxyItem, this.row)
-			dismiss()
 		}
 	}
 
@@ -224,11 +240,22 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 				else -> throw PAIllegalStateException("row $it does not have an associated LiveData value")
 			}
 
-			EditableDataActivity.newInstanceForResult(
+			val fragment = liveData.dataFragment
-				this,
+//
-				liveData,
+			this.addedDataViewModel.dataForAdd = true
-				requestCode = REQUEST_CODE_ADD_NEW_OBJECT
+
-			)
+			val bundle = Bundle()
+			bundle.putInt(BaseFragment.BundleKey.DATA_TYPE.value, liveData.ordinal)
+			fragment.arguments = bundle
+			(this.activity as BaseActivity).addFragmentWithBackStack(fragment, R.id.container)
+
+			dismiss()
+
+//			EditableDataActivity.newInstanceForResult(
+//				this,
+//				liveData,
+//				requestCode = REQUEST_CODE_ADD_NEW_OBJECT
+//			)
 
 			true
 		}
@@ -251,9 +278,9 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 		return this.model.rowRepresentableEditDescriptors
 	}
 
-	private fun getValue(): Any? {
+//	private fun getValue(): Any? {
-		return this.model.getValue()
+//		return this.model.getValue()
-	}
+//	}
 
 	private fun onClear() {
 		this.delegate?.onRowValueChanged(null, this.model.row)

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt

@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import androidx.core.view.get
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.chip.Chip
+import io.realm.RealmModel
 import net.pokeranalytics.android.databinding.BottomSheetGameListBinding
 import net.pokeranalytics.android.model.Limit
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
@@ -17,7 +18,7 @@ import net.pokeranalytics.android.ui.view.RowRepresentable
  * Bottom Sheet List Game Fragment
  * Display a list of game + chips to choose the game limit
  */
-class BottomSheetListGameFragment : BottomSheetListFragment() {
+class BottomSheetListGameFragment : BottomSheetDataListFragment() {
 
     private var _binding: BottomSheetGameListBinding? = null
     private val binding get() = _binding!!
@@ -38,10 +39,10 @@ class BottomSheetListGameFragment : BottomSheetListFragment() {
 	}
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, tag: Int) {
-		this.model.realmData?.let {
+		this.model.realmData?.let { realmResults ->
-			val selectedData = it[position]
+			val selectedData = realmResults[position]
 			selectedData?.let { data ->
-				this.model.someValues[1] = data
+				this.model.someValues[1] = realmResults.realm.copyFromRealm(data as RealmModel)
 				this.onRowValueChanged()
 //				this.delegate.onRowValueChanged(values, this.row)
 				dismiss()

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStakesFragment.kt

@@ -10,6 +10,7 @@ import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import androidx.core.widget.addTextChangedListener
+import kotlinx.android.synthetic.main.view_keyboard_stakes.view.*
 import net.pokeranalytics.android.databinding.BottomSheetStakesBinding
 import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorException
 import java.text.NumberFormat
@@ -109,7 +110,7 @@ class BottomSheetStakesFragment : BottomSheetFragment() {
             this.focusEditTextAndHideKeyboard(binding.blindsEditText)
 
 //            binding.stakesKeyboard.visibility = View.VISIBLE
-            binding.stakesKeyboard.setSeparatorVisibility(true)
+            binding.stakesKeyboard.value_separator.visibility = View.VISIBLE
 
             return@setOnTouchListener true
 
@@ -121,9 +122,7 @@ class BottomSheetStakesFragment : BottomSheetFragment() {
 
             this.focusEditTextAndHideKeyboard(binding.anteEditText)
 
-            binding.stakesKeyboard.setSeparatorVisibility(false)
+            binding.stakesKeyboard.value_separator.visibility = View.GONE
-
-//            binding.stakesKeyboard.value_separator.visibility = View.GONE
 
 //            binding.stakesKeyboard.visibility = View.VISIBLE
 //            binding.stakesKeyboard.visibility = View.GONE

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt

@@ -45,9 +45,7 @@ class BottomSheetStaticListFragment : BottomSheetFragment(), StaticRowRepresenta
 	override fun onRowSelected(position: Int, row: RowRepresentable, tag: Int) {
 		this.model.selectedRows.add(row)
 		this.onRowValueChanged()
-//        this.delegate.onRowValueChanged(row, this.row)
 		dismiss()
-//		super.onRowSelected(position, row, tag)
 	}
 
 	/**

app/src/main/java/net/pokeranalytics/android/ui/fragment/report/AbstractReportFragment.kt

@@ -3,9 +3,11 @@ package net.pokeranalytics.android.ui.fragment.report
 import android.os.Bundle
 import android.text.InputType
 import android.view.View
+import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.Report
 import net.pokeranalytics.android.calculus.Stat
@@ -58,8 +60,8 @@ abstract class AbstractReportFragment : DataManagerFragment() {
 
 	override fun saveData() {
 
-		activity?.let { activity ->
+		activity?.let {
-			val builder = AlertDialog.Builder(activity)
+			val builder = AlertDialog.Builder(it)
 
 			// Get the layout inflater
 			val inflater = requireActivity().layoutInflater
@@ -92,6 +94,19 @@ abstract class AbstractReportFragment : DataManagerFragment() {
 				}
 
 			val dialog = builder.create()
+			dialog.setOnShowListener {
+				nameEditText.requestFocus()
+				val s =
+					ContextCompat.getSystemService(requireContext(), InputMethodManager::class.java)
+				s?.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0)
+			}
+
+			dialog.setOnDismissListener {
+				val s =
+					ContextCompat.getSystemService(requireContext(), InputMethodManager::class.java)
+				s?.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0)
+			}
+
 			dialog.show()
 
 		} ?: throw PAIllegalStateException("Activity cannot be null")
@@ -106,9 +121,12 @@ abstract class AbstractReportFragment : DataManagerFragment() {
 
 		this.reportViewModel.title = name
 		val rs = this.model.item as ReportSetup
-		getRealm().executeTransaction { realm ->
+		val setupId = rs.id
+
+		val firstSave = (this.model.primaryKey == null)
+
+		getRealm().executeTransactionAsync { realm ->
 
-			val firstSave = (this.model.primaryKey == null)
 			if (firstSave) {
 				val options = this.selectedReport.options
 				rs.name = name
@@ -126,15 +144,18 @@ abstract class AbstractReportFragment : DataManagerFragment() {
 				options.filterId?.let { id ->
 					rs.filter = realm.findById(id)
 				}
-				realm.copyToRealmOrUpdate(rs)
-			} else {
-				rs.name = name
 				realm.insertOrUpdate(rs)
+//				realm.copyToRealmOrUpdate(rs)
+			} else {
+				realm.findById<ReportSetup>(setupId)?.let { reportSetup ->
+					reportSetup.name = name
+					realm.insertOrUpdate(reportSetup)
+				}
 			}
 
 		}
 
-		this.model.primaryKey = rs.id
+		this.model.primaryKey = setupId
 		this.deleteButtonShouldAppear = true
 		setToolbarTitle(this.reportViewModel.title)
 	}

app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ComposableTableReportFragment.kt

@@ -5,14 +5,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.realm.Realm
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.*
-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
@@ -32,15 +27,10 @@ import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable
 import net.pokeranalytics.android.ui.view.rows.StatRow
 import net.pokeranalytics.android.util.NULL_TEXT
 import net.pokeranalytics.android.util.TextFormat
-import timber.log.Timber
-import java.util.*
 
-open class ComposableTableReportFragment : RealmFragment(), StaticRowRepresentableDataSource, CoroutineScope,
+open class ComposableTableReportFragment : RealmFragment(), StaticRowRepresentableDataSource,
 	RowRepresentableDelegate {
 
-//	override val coroutineContext: CoroutineContext
-//		get() = Dispatchers.Main
-
     companion object {
 
         /**
@@ -84,11 +74,6 @@ open class ComposableTableReportFragment : RealmFragment(), StaticRowRepresentab
 		initData()
 		initUI()
 
-		ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
-			v.setPadding(0, 0, 0, 0)
-			insets
-		}
-
 		report?.let {
 			showResults()
 		}
@@ -163,17 +148,25 @@ open class ComposableTableReportFragment : RealmFragment(), StaticRowRepresentab
 	private fun convertReportIntoRepresentables(report: Report): ArrayList<RowRepresentable> {
 
 		val rows: ArrayList<RowRepresentable> = ArrayList()
-		this.context?.let { context ->
+		report.results.forEach { result ->
-			report.results.forEach { result ->
+			val title = result.group.query.getName(requireContext()).capitalize()
-				val title = result.group.query.getName(context).capitalize()
+			rows.add(CustomizableRowRepresentable(title = title))
-				rows.add(CustomizableRowRepresentable(title = title))
+			val statList = result.group.displayedStats ?: report.options.stats
-				val statList = result.group.displayedStats ?: report.options.stats
+			statList.forEach { stat ->
-				statList.forEach { stat ->
+				rows.add(StatRow(stat, result.computedStat(stat), result.group.query.getName(requireContext())))
-					rows.add(StatRow(stat, result.computedStat(stat), result.group.query.getName(context)))
-				}
 			}
 		}
 		return rows
+
+//		val rows: ArrayList<RowRepresentable> = ArrayList()
+//		report.options.stats.forEach {stat ->
+//			rows.add(CustomizableRowRepresentable(title = stat.localizedTitle(requireContext())))
+//			report.results.forEach {
+//				val title = it.group.name
+//				rows.add(StatRow(stat, it.computedStat(stat), it.group.name, title))
+//			}
+//		}
+//		return rows
 	}
 
 	// RowRepresentableDelegate
@@ -210,11 +203,11 @@ open class ComposableTableReportFragment : RealmFragment(), StaticRowRepresentab
 
 		showLoader()
 
-		GlobalScope.launch(coroutineContext) {
+		CoroutineScope(Dispatchers.Default).launch {
 
 			var report: Report? = null
-			val test = GlobalScope.async {
+			val test = async {
-				val s = Date()
+//				val s = Date()
 //				Timber.d(">>> start...")
 
 				val realm = Realm.getDefaultInstance()
@@ -226,9 +219,9 @@ open class ComposableTableReportFragment : RealmFragment(), StaticRowRepresentab
 
 				realm.close()
 
-				val e = Date()
+//				val e = Date()
-				val duration = (e.time - s.time) / 1000.0
+//				val duration = (e.time - s.time) / 1000.0
-				Timber.d(">>> ended in $duration seconds")
+//				Timber.d(">>> ended in $duration seconds")
 
 			}
 			test.await()

app/src/main/java/net/pokeranalytics/android/ui/fragment/report/ProgressReportFragment.kt

@@ -11,15 +11,16 @@ import com.github.mikephil.charting.data.LineDataSet
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
 import io.realm.Realm
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import net.pokeranalytics.android.R
+import net.pokeranalytics.android.calculus.calcul.*
 import net.pokeranalytics.android.calculus.AggregationType
 import net.pokeranalytics.android.calculus.Calculator
 import net.pokeranalytics.android.calculus.Report
 import net.pokeranalytics.android.calculus.Stat
-import net.pokeranalytics.android.calculus.calcul.*
 import net.pokeranalytics.android.databinding.FragmentProgressReportBinding
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.combined
@@ -82,6 +83,12 @@ class ProgressReportFragment : AbstractReportFragment() {
 
 	override fun onDestroyView() {
 
+//		childFragmentManager.findFragmentByTag(GRAPH_TAG)?.let { fragment ->
+//			val fragmentTransaction = childFragmentManager.beginTransaction()
+//			fragmentTransaction.remove(fragment)
+//			fragmentTransaction.commit()
+//		}
+
 		AppReviewManager.requestReview()
 
 		super.onDestroyView()
@@ -163,30 +170,29 @@ class ProgressReportFragment : AbstractReportFragment() {
 		graphContainer.hideWithAnimation()
 		progressBar.showWithAnimation()
 
-		GlobalScope.launch {
+		CoroutineScope(Dispatchers.Default).launch {
 
-			val s = Date()
+//			val s = Date()
 //			Timber.d(">>> start...")
 
 			val realm = Realm.getDefaultInstance()
 
-			selectedReport.results.firstOrNull()?.group?.let { group ->
+			val group = selectedReport.results.first().group
-				val report = Calculator.computeStatsWithEvolutionByAggregationType(realm, stat, group, aggregationType)
-				reports[aggregationType] = report
 
-				realm.close()
+			val report = Calculator.computeStatsWithEvolutionByAggregationType(realm, stat, group, aggregationType)
+			reports[aggregationType] = report
 
-				val e = Date()
+			realm.close()
-				val duration = (e.time - s.time) / 1000.0
-				Timber.d(">>> ended in $duration seconds")
 
-				launch(Dispatchers.Main) {
+//			val e = Date()
-					setGraphData(report, aggregationType)
+//			val duration = (e.time - s.time) / 1000.0
-					progressBar.hideWithAnimation()
+//			Timber.d(">>> ended in $duration seconds")
-					graphContainer.showWithAnimation()
-				}
-			}
 
+			launch(Dispatchers.Main) {
+				setGraphData(report, aggregationType)
+				progressBar.hideWithAnimation()
+				graphContainer.showWithAnimation()
+			}
 		}
 	}
 

app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt

@@ -13,6 +13,7 @@ import com.github.mikephil.charting.data.BarDataSet
 import com.github.mikephil.charting.data.LineDataSet
 import com.google.android.material.tabs.TabLayout
 import io.realm.Realm
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -167,7 +168,7 @@ class CalendarDetailsFragment : BaseFragment(), StaticRowRepresentableDataSource
 
 		this.model.computedResults?.let { computedResults ->
 
-			GlobalScope.launch {
+			CoroutineScope(Dispatchers.Default).launch {
 
 				val startDate = Date()
 

app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarFragment.kt

@@ -11,7 +11,6 @@ import io.realm.Realm
 import io.realm.RealmModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.Calculator
@@ -23,9 +22,7 @@ import net.pokeranalytics.android.model.Criteria
 import net.pokeranalytics.android.model.combined
 import net.pokeranalytics.android.model.filter.Query
 import net.pokeranalytics.android.model.filter.QueryCondition
-import net.pokeranalytics.android.model.realm.ComputableResult
+import net.pokeranalytics.android.model.realm.*
-import net.pokeranalytics.android.model.realm.Transaction
-import net.pokeranalytics.android.model.realm.UserConfig
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
@@ -39,12 +36,11 @@ import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable
 import net.pokeranalytics.android.util.extensions.*
-import timber.log.Timber
 import java.util.*
 import kotlin.collections.set
 
 
-class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentableDataSource,
+class CalendarFragment : RealmFragment(), StaticRowRepresentableDataSource,
 	RowRepresentableDelegate, RealmAsyncListener {
 
 	enum class TimeFilter {
@@ -101,13 +97,15 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		initData()
 		initUI()
+		initData()
 
 		addRealmChangeListener(this, UserConfig::class.java)
 		addRealmChangeListener(this, ComputableResult::class.java)
 		addRealmChangeListener(this, Transaction::class.java)
+		addRealmChangeListener(this, SessionSet::class.java)
 	}
+
 	private var transactionFilterMenuItem: MenuItem? = null
 
 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -133,11 +131,10 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
 
 	private fun setTransactionFilterItemColor() {
 		context?.let {
-			val userConfig = UserConfig.getConfiguration(getRealm())
+			UserConfig.getConfiguration(getRealm()) { userConfig ->
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				val color = if (userConfig.transactionTypeIds.isNotEmpty()) R.color.red else R.color.white
-				this.transactionFilterMenuItem?.let { item ->
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-					val color = if (userConfig.transactionTypeIds.isNotEmpty()) R.color.red else R.color.white
+					this.transactionFilterMenuItem?.iconTintList = ColorStateList.valueOf(it.getColor(color))
-					item.iconTintList = ColorStateList.valueOf(it.getColor(color))
 				}
 			}
 		}
@@ -211,9 +208,6 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
 		}
 	}
 
-	override val observedEntities: List<Class<out RealmModel>> = listOf(ComputableResult::class.java)
-
-
 	// Business
 
 	/**
@@ -348,7 +342,7 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
 		binding.progressBar.showWithAnimation()
 		binding.recyclerView.hideWithAnimation()
 
-		GlobalScope.launch {
+		CoroutineScope(Dispatchers.Default).launch {
 
 			val realm = Realm.getDefaultInstance()
 			realm.refresh()
@@ -357,7 +351,7 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
 
 			realm.close()
 
-			GlobalScope.launch(Dispatchers.Main) {
+			launch(Dispatchers.Main) {
 				displayData()
 			}
 		}
@@ -368,7 +362,7 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
 		val calendar = Calendar.getInstance()
 		calendar.time = Date().startOfMonth()
 
-		val startDate = Date()
+//		val startDate = Date()
 
 		val requiredStats: List<Stat> =
 			listOf(
@@ -378,7 +372,12 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
 				Stat.STANDARD_DEVIATION_HOURLY
 			)
 
-		val transactionTypes = UserConfig.getConfiguration(realm).transactionTypes(realm)
+		var transactionTypes = listOf<TransactionType>()
+		UserConfig.getConfiguration(realm) { userConfig ->
+			transactionTypes = userConfig.transactionTypes(realm)
+		}
+
+//		val transactionTypes = UserConfig.getConfiguration(realm).transactionTypes(realm)
 
 		// All
 		val allOptions = Calculator.Options(
@@ -490,7 +489,7 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
 		sortedMonthlyReports = monthlyReports.toSortedMap(compareByDescending { it })
 		sortedYearlyReports = yearlyReports.toSortedMap(compareByDescending { it })
 
-		Timber.d("Computation: ${System.currentTimeMillis() - startDate.time}ms")
+//		Timber.d("Computation: ${System.currentTimeMillis() - startDate.time}ms")
 
 	}
 
@@ -498,11 +497,11 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
 	 * Display data
 	 */
 	private fun displayData() {
-		Timber.d("displayData")
+//		Timber.d("displayData")
 
 		if (context == null) { return } // required because of launchAsyncStatComputation
 
-		val startDate = Date()
+//		val startDate = Date()
 
 		datesForRows.clear()
 		rows.clear()
@@ -594,8 +593,8 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
 			}
 		}
 
-		Timber.d("Display data: ${System.currentTimeMillis() - startDate.time}ms")
+//		Timber.d("Display data: ${System.currentTimeMillis() - startDate.time}ms")
-		Timber.d("Rows: ${rows.size}")
+//		Timber.d("Rows: ${rows.size}")
 
 		this.calendarAdapter.notifyDataSetChanged()
 
@@ -604,11 +603,13 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
 
 	}
 
-	override fun asyncListenedEntityChange(realm: Realm) {
+	override fun asyncListenedEntityChange(realm: Realm, clazz: Class<out RealmModel>) {
+
 		if (isAdded) { // Fixes: java.lang.IllegalStateException Fragment StatisticsFragment{9d3e5ec} not attached to a context.
 			launchAsyncStatComputation()
 			setTransactionFilterItemColor()
 		}
+
 	}
 
 	private fun showGridCalendar() {

app/src/main/java/net/pokeranalytics/android/ui/modules/data/BankrollDataFragment.kt

@@ -85,8 +85,6 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
 				onRowValueChanged(currencyCode, BankrollPropertiesRow.CURRENCY)
 				if (shouldShowCurrencyRate) {
 					refreshRate()
-				} else {
-					this.bankroll.currency?.rate = 1.0
 				}
 			}
 		}

app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt

@@ -133,7 +133,7 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 		tag: Int
 	): CharSequence {
 		return when (row) {
-			SimpleRow.NAME -> if (customField.name.isNotEmpty()) customField.name else NULL_TEXT
+			SimpleRow.NAME -> customField.name.ifEmpty { NULL_TEXT }
 			else -> super.charSequenceForRow(row, context, 0)
 		}
 	}

app/src/main/java/net/pokeranalytics/android/ui/modules/data/DataManagerFragment.kt

@@ -5,7 +5,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
-import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.ViewModelProvider
@@ -15,6 +14,7 @@ import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
 import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
+import net.pokeranalytics.android.ui.viewmodel.AddedDataViewModel
 import net.pokeranalytics.android.ui.viewmodel.DataManagerViewModel
 
 open class DataManagerFragment : RealmFragment() {
@@ -23,12 +23,11 @@ open class DataManagerFragment : RealmFragment() {
 		ViewModelProvider(this).get(modelClass)
 	}
 
-	open val modelClass: Class<out DataManagerViewModel> = DataManagerViewModel::class.java
+	protected open val addedDataViewModel: AddedDataViewModel by lazy {
+		ViewModelProvider(requireActivity()).get(AddedDataViewModel::class.java)
+	}
 
-//	lateinit var item: Deletable
+	open val modelClass: Class<out DataManagerViewModel> = DataManagerViewModel::class.java
-//	protected lateinit var liveDataType: LiveData
-//	protected var primaryKey: String? = null
-//	protected var dataType: Int? = null
 
 	var deleteButtonShouldAppear = false
 		set(value) {
@@ -53,10 +52,22 @@ open class DataManagerFragment : RealmFragment() {
 		menu.clear()
 		inflater.inflate(R.menu.toolbar_editable_data, menu)
 		this.editableMenu = menu
+		setMenuListeners()
 		updateMenuUI()
 		super.onCreateOptionsMenu(menu, inflater)
 	}
 
+	private fun setMenuListeners() {
+		editableMenu?.findItem(R.id.delete)?.setOnMenuItemClickListener {
+			deleteData()
+			return@setOnMenuItemClickListener true
+		}
+		editableMenu?.findItem(R.id.save)?.setOnMenuItemClickListener {
+			saveData()
+			return@setOnMenuItemClickListener true
+		}
+	}
+
 	/**
 	* Update menu UI
 	*/
@@ -65,13 +76,13 @@ open class DataManagerFragment : RealmFragment() {
 		editableMenu?.findItem(R.id.save)?.isVisible = this.saveButtonShouldAppear
 	}
 
-	override fun onOptionsItemSelected(item: MenuItem): Boolean {
+//	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		when (item.itemId) {
+//		when (item.itemId) {
-			R.id.save -> saveData()
+//			R.id.save -> saveData()
-			R.id.delete -> deleteData()
+//			R.id.delete -> deleteData()
-		}
+//		}
-		return true
+//		return true
-	}
+//	}
 
 	/**
 	 * Init data
@@ -96,14 +107,20 @@ open class DataManagerFragment : RealmFragment() {
 				val status = savable.getSaveValidityStatus(realm = this.getRealm())
 				when (status) {
 					SaveValidityStatus.VALID -> {
-						this.getRealm().executeTransaction {
+
-							val managedItem = it.copyToRealmOrUpdate(this.model.item)
+						this.getRealm().executeTransactionAsync { asyncRealm ->
-							if (managedItem is Savable) {
+							asyncRealm.insertOrUpdate(savable)
-								val uniqueIdentifier = managedItem.id
-								finishActivityWithResult(uniqueIdentifier)
-							}
 						}
+
 						onDataSaved()
+
+						if (this.addedDataViewModel.dataForAdd) {
+							this.addedDataViewModel.data.value = savable
+							this.parentActivity?.supportFragmentManager?.popBackStack()
+						} else {
+							val uniqueIdentifier = savable.id
+							finishActivityWithResult(uniqueIdentifier)
+						}
 					}
 					else -> {
 						val message = savable.getFailedSaveMessage(status)

app/src/main/java/net/pokeranalytics/android/ui/modules/data/EditableDataActivity.kt

@@ -8,6 +8,7 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.ui.activity.components.MediaActivity
 import java.io.File
+import java.util.*
 
 class EditableDataActivity : MediaActivity() {
 
@@ -51,11 +52,6 @@ class EditableDataActivity : MediaActivity() {
 		initUI()
 	}
 
-//	override fun onPause() {
-//		super.onPause()
-//		this.paApplication.backupOperator?.backupIfNecessary()
-//	}
-
 	/**
 	 * Init UI
 	 */

app/src/main/java/net/pokeranalytics/android/ui/modules/data/EditableDataFragment.kt

@@ -18,7 +18,6 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowUpdatable
 
-
 open class EditableDataFragment : DataManagerFragment(), RowRepresentableDelegate {
 
 	lateinit var rowRepresentableAdapter: RowRepresentableAdapter
@@ -43,7 +42,6 @@ open class EditableDataFragment : DataManagerFragment(), RowRepresentableDelegat
 		this.model.primaryKey = this.arguments?.getString(BundleKey.PRIMARY_KEY.value)
 
 		this.model.loadItemWithRealm(getRealm())
-
 	}
 
 	open fun indexOfFirstRowToSelect(): Int {
@@ -67,15 +65,20 @@ open class EditableDataFragment : DataManagerFragment(), RowRepresentableDelegat
 	}
 
 	override fun onRowValueChanged(value: Any?, row: RowRepresentable) {
-		getRealm().executeTransaction {
-			try {
-				(this.model.item as RowUpdatable).updateValue(value, row)
-			} catch (e: Exception) {
-				CrashLogging.log("Exception caught: row = $row, value=$value, class=${this.javaClass}")
-				throw e
-			}
 
+		(this.model.item as RowUpdatable).updateValue(value, row)
+
+		if (this.model.primaryKey != null) {
+			getRealm().executeTransactionAsync { asyncRealm ->
+				try {
+					asyncRealm.insertOrUpdate(this.model.item)
+				} catch (e: Exception) {
+					CrashLogging.log("Exception caught: row = $row, value=$value, class=${this.javaClass}")
+					throw e
+				}
+			}
 		}
+
 		rowRepresentableAdapter.refreshRow(row)
 	}
 

app/src/main/java/net/pokeranalytics/android/ui/modules/data/PlayerDataFragment.kt

@@ -9,9 +9,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.PickVisualMediaRequest
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -21,35 +18,23 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.databinding.FragmentPlayerBinding
 import net.pokeranalytics.android.model.realm.Comment
 import net.pokeranalytics.android.model.realm.Player
-import net.pokeranalytics.android.model.realm.handhistory.HandHistory
 import net.pokeranalytics.android.ui.activity.ColorPickerActivity
-import net.pokeranalytics.android.ui.activity.components.CameraActivity
 import net.pokeranalytics.android.ui.activity.components.MediaActivity
-import net.pokeranalytics.android.ui.activity.components.RequestCode
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.extensions.showAlertDialog
-import net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.ui.view.rows.PlayerPropertiesRow
-import net.pokeranalytics.android.ui.viewmodel.DataManagerViewModel
 import net.pokeranalytics.android.util.NULL_TEXT
-import timber.log.Timber
 import java.io.File
 
-
 /**
  * Player data fragment
  */
 class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSource {
 
-	private val playerModel: PlayerDataViewModel
-		get() { return this.model as PlayerDataViewModel }
-
-	override val modelClass: Class<out DataManagerViewModel> = PlayerDataViewModel::class.java
-
 	companion object {
 		const val REQUEST_CODE_PICK_COLOR = 1000
 	}
@@ -79,13 +64,6 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou
 			player.color = if (color != Color.TRANSPARENT) color else null
 			rowRepresentableAdapter.refreshRow(PlayerPropertiesRow.IMAGE)
 		}
-
-		if (requestCode == RequestCode.CAMERA.value) {
-			val uri = data?.getStringExtra(CameraActivity.IMAGE_URI)
-			this.player.picture = uri
-			rowRepresentableAdapter.refreshRow(PlayerPropertiesRow.IMAGE)
-		}
-
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -98,38 +76,23 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou
 		_binding = null
 	}
 
-	var pickVisualMediaRequest: ActivityResultLauncher<PickVisualMediaRequest>? = null
-
 	/**
 	 * Init UI
 	 */
 	private fun initUI() {
 		mediaActivity = parentActivity as MediaActivity?
 
-		this.playerModel.updateRowRepresentation()
+		player.updateRowRepresentation()
 
 		if (!deleteButtonShouldAppear) {
 			onRowSelected(0, PlayerPropertiesRow.NAME)
 		}
 
 		binding.addComment.setOnClickListener {
-			val comment = this.playerModel.addComment()
+			val comment = player.addComment()
 			rowRepresentableAdapter.notifyDataSetChanged()
 			onRowSelected(-1, comment)
 		}
-
-
-		this.pickVisualMediaRequest = registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
-			this.player.picture = uri.toString()
-			if (uri != null) {
-				val flag = Intent.FLAG_GRANT_READ_URI_PERMISSION
-				context?.contentResolver?.takePersistableUriPermission(uri, flag)
-				Timber.d("Selected URI: $uri")
-			} else {
-				Timber.d("No media selected")
-			}
-			rowRepresentableAdapter.refreshRow(PlayerPropertiesRow.IMAGE)
-		}
 	}
 
 	override fun getPhotos(files: ArrayList<File>) {
@@ -144,8 +107,8 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou
 		return this
 	}
 
-	override fun adapterRows(): List<RowRepresentable> {
+	override fun adapterRows(): List<RowRepresentable>? {
-		return this.playerModel.adapterRows()
+		return player.adapterRows()
 	}
 
 	override fun viewTypeForPosition(position: Int): Int {
@@ -168,8 +131,8 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou
 		tag: Int
 	): CharSequence {
 		return when (row) {
-			PlayerPropertiesRow.NAME -> player.name.ifEmpty { NULL_TEXT }
+			PlayerPropertiesRow.NAME -> if (player.name.isNotEmpty()) player.name else NULL_TEXT
-			PlayerPropertiesRow.SUMMARY -> player.summary.ifEmpty { NULL_TEXT }
+			PlayerPropertiesRow.SUMMARY -> if (player.summary.isNotEmpty()) player.summary else NULL_TEXT
 			else -> super.charSequenceForRow(row, context, 0)
 		}
 	}
@@ -181,9 +144,6 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou
 				val data = arrayListOf(RowRepresentableEditDescriptor(row.content))
 				showBottomSheet(row, this, data, isClearable = false, isDeletable = true)
 			}
-			is HandHistory -> {
-				HandHistoryActivity.newInstance(this, row.id)
-			}
 			else -> super.onRowSelected(position, row, tag)
 		}
 	}
@@ -192,19 +152,14 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou
 		when (row) {
 			is Comment -> {
 				row.updateValue(value, row)
-				this.playerModel.updateRowRepresentation()
+				player.updateRowRepresentation()
 				rowRepresentableAdapter.notifyDataSetChanged()
 			}
 			else -> {
 				super.onRowValueChanged(value, row)
-				when (row) {
+				if (row == PlayerPropertiesRow.NAME) {
-					PlayerPropertiesRow.NAME -> {
+					rowRepresentableAdapter.refreshRow(PlayerPropertiesRow.IMAGE)
-						rowRepresentableAdapter.refreshRow(PlayerPropertiesRow.IMAGE)
+
-					}
-					PlayerPropertiesRow.TAB_SELECTOR -> {
-						this.playerModel.selectedTab = value as Int
-						rowRepresentableAdapter.notifyDataSetChanged()
-					}
 				}
 			}
 		}
@@ -218,7 +173,7 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou
 					GlobalScope.launch(Dispatchers.Main) {
 						delay(300)
 						showAlertDialog(requireContext(), messageResId = R.string.are_you_sure_you_want_to_delete, showCancelButton = true, positiveAction = {
-							playerModel.deleteComment(row)
+							player.deleteComment(row)
 							rowRepresentableAdapter.notifyDataSetChanged()
 						})
 					}
@@ -247,15 +202,8 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou
 
 		builder.setItems(placesArray.toTypedArray()) { _, which ->
 			when (placesArray[which]) {
-				getString(R.string.take_a_picture) -> {
+				getString(R.string.take_a_picture) -> mediaActivity?.openImageCaptureIntent(false)
-					CameraActivity.newInstanceForResult(this, RequestCode.CAMERA)
+				getString(R.string.library) -> mediaActivity?.openImageGalleryIntent(false)
-
-//					mediaActivity?.takePicture()
-				} // mediaActivity?.openImageCaptureIntent(false)
-				getString(R.string.library) -> {
-					pickVisualMediaRequest?.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
-				}
-//					mediaActivity?.openImageGalleryIntent(false)
 				getString(R.string.select_a_color) -> {
 					ColorPickerActivity.newInstanceForResult(this, REQUEST_CODE_PICK_COLOR)
 				}
@@ -270,7 +218,7 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou
 
 	override fun onDataSaved() {
 		super.onDataSaved()
-		this.playerModel.cleanupComments()
+		player.cleanupComments()
 	}
 
 	override fun editDescriptors(row: RowRepresentable): List<RowRepresentableEditDescriptor>? {

app/src/main/java/net/pokeranalytics/android/ui/modules/data/PlayerDataViewModel.kt

@@ -1,153 +0,0 @@
-package net.pokeranalytics.android.ui.modules.data
-
-import android.content.Context
-import io.realm.Realm
-import io.realm.kotlin.where
-import net.pokeranalytics.android.model.realm.Comment
-import net.pokeranalytics.android.model.realm.Player
-import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
-import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
-import net.pokeranalytics.android.ui.view.RowViewType
-import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable
-import net.pokeranalytics.android.ui.view.rows.PlayerPropertiesRow
-import net.pokeranalytics.android.ui.view.rows.SeparatorRow
-import net.pokeranalytics.android.ui.viewmodel.DataManagerViewModel
-import net.pokeranalytics.android.util.NULL_TEXT
-import net.pokeranalytics.android.util.extensions.isSameDay
-import net.pokeranalytics.android.util.extensions.mediumDate
-import java.util.*
-
-class PlayerDataViewModel : DataManagerViewModel(), StaticRowRepresentableDataSource {
-
-    private var rowRepresentation: List<RowRepresentable> = mutableListOf()
-
-    private var commentsToDelete: ArrayList<Comment> = ArrayList()
-
-    var selectedTab: Int = 0
-        set(value) {
-            field = value
-            this.updateRowRepresentation()
-        }
-
-    private val player: Player
-        get() {
-            return this.item as Player
-        }
-
-    override fun adapterRows(): List<RowRepresentable> {
-        return this.rowRepresentation
-    }
-
-    override fun charSequenceForRow(
-        row: RowRepresentable,
-        context: Context,
-        tag: Int
-    ): CharSequence {
-        return when (row) {
-            PlayerPropertiesRow.NAME -> this.player.name.ifEmpty { NULL_TEXT }
-            else -> return super.charSequenceForRow(row, context, 0)
-        }
-    }
-
-    fun updateRowRepresentation() {
-        this.rowRepresentation = this.updatedRowRepresentationForCurrentState()
-    }
-
-    /**
-     * Update the row representation
-     */
-    private fun updatedRowRepresentationForCurrentState(): List<RowRepresentable> {
-        val rows = ArrayList<RowRepresentable>()
-        rows.add(PlayerPropertiesRow.IMAGE)
-        rows.add(PlayerPropertiesRow.NAME)
-        rows.add(PlayerPropertiesRow.SUMMARY)
-
-        val realm = Realm.getDefaultInstance()
-        val hands = this.player.hands(realm)
-        realm.close()
-
-        if (this.player.comments.isNotEmpty() || hands.isNotEmpty()) {
-            rows.add(PlayerPropertiesRow.TAB_SELECTOR)
-        }
-
-        when(this.selectedTab) {
-            0 -> this.addCommentSection(rows)
-            1 -> rows.addAll(hands)
-        }
-
-        return rows
-    }
-
-    private fun addCommentSection(rows: ArrayList<RowRepresentable>) {
-
-        if (this.player.comments.size > 0) {
-
-            val currentCommentCalendar = Calendar.getInstance()
-            val currentDateCalendar = Calendar.getInstance()
-
-            val commentsToDisplay = ArrayList<Comment>()
-            commentsToDisplay.addAll(this.player.comments)
-            commentsToDisplay.sortByDescending { it.date }
-
-            commentsToDisplay.forEachIndexed { index, comment ->
-                currentCommentCalendar.time = comment.date
-
-                if (!currentCommentCalendar.isSameDay(currentDateCalendar) || index == 0) {
-                    currentDateCalendar.time = currentCommentCalendar.time
-                    // Adds day sub section
-                    rows.add(CustomizableRowRepresentable(RowViewType.HEADER_SUBTITLE, title = currentDateCalendar.time.mediumDate()))
-                }
-
-                // Adds comment
-                rows.add(comment)
-            }
-            rows.add(SeparatorRow())
-        }
-
-    }
-
-    /**
-     * Add an entry
-     */
-    fun addComment(): Comment {
-        val entry = Comment()
-        this.player.comments.add(entry)
-        updateRowRepresentation()
-        return entry
-    }
-
-    /**
-     * Delete an entry
-     */
-    fun deleteComment(comment: Comment) {
-        commentsToDelete.add(comment)
-        this.player.comments.remove(comment)
-        updateRowRepresentation()
-    }
-
-    /**
-     * Clean up deleted entries
-     */
-    fun cleanupComments() { // called when saving the custom field
-        val realm = Realm.getDefaultInstance()
-        realm.executeTransaction {
-            this.commentsToDelete.forEach { // entries are out of realm
-                realm.where<Comment>().equalTo("id", it.id).findFirst()?.deleteFromRealm()
-            }
-        }
-        realm.close()
-        this.commentsToDelete.clear()
-    }
-
-    override fun editDescriptors(row: RowRepresentable): List<RowRepresentableEditDescriptor>? {
-
-        when (row) {
-            PlayerPropertiesRow.NAME -> return row.editingDescriptors(mapOf("defaultValue" to this.player.name))
-            PlayerPropertiesRow.SUMMARY -> return row.editingDescriptors(mapOf("defaultValue" to this.player.summary))
-        }
-
-        return null
-    }
-
-}

app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionDataFragment.kt

@@ -2,8 +2,8 @@ package net.pokeranalytics.android.ui.modules.data
 
 import android.content.Context
 import io.realm.kotlin.where
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import net.pokeranalytics.android.calculus.bankroll.BankrollReportManager
@@ -33,6 +33,11 @@ class TransactionDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 			return this.model.item as Transaction
 		}
 
+	override fun onDestroyView() {
+		super.onDestroyView()
+		this.addedDataViewModel.data.removeObservers(this)
+	}
+
 	override fun initData() {
 		super.initData()
 
@@ -40,9 +45,19 @@ class TransactionDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 		if (this.transaction.bankroll == null) {
 			val bankrolls = getRealm().where<Bankroll>().findAll()
 			if (bankrolls.size == 1) {
-				this.transaction.bankroll = bankrolls.first()
+				bankrolls.first()?.let { br ->
+					this.transaction.bankroll = getRealm().copyFromRealm(br)
+				}
 			}
 		}
+
+		this.addedDataViewModel.data.observeForever {
+			if (this.addedDataViewModel.dataForAdd) {
+				this.addedDataViewModel.dataForAdd = false
+				this.onRowValueChanged(it, this.addedDataViewModel.dataIdentifier)
+			}
+		}
+
 	}
 
 	override fun indexOfFirstRowToSelect(): Int {
@@ -102,6 +117,9 @@ class TransactionDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 	}
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, tag: Int) {
+
+		this.addedDataViewModel.dataIdentifier = row
+
 		when (row) {
 			TransactionPropertiesRow.DATE -> DateTimePickerManager.create(
 				requireContext(),
@@ -141,7 +159,7 @@ class TransactionDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 					when (val next = rows[index + 1]) {
 						TransactionPropertiesRow.DATE, TransactionPropertiesRow.COMMENT -> {}
 						else -> {
-							GlobalScope.launch(Dispatchers.Main) {
+							CoroutineScope(Dispatchers.Main).launch {
 								delay(200)
 								onRowSelected(0, next)
 							}

app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt

@@ -81,10 +81,14 @@ open class DataListFragment : DeletableItemFragment(), RowRepresentableDelegate
 			getRealm().where(this.model.identifiableClass)
 				.`in`("id", itemIds)
 				.sort(this.model.dataType.sortFields, this.model.dataType.sortOrders)
-				.findAll()
+				.findAllAsync()
 		} else {
 			this.retrieveItems(getRealm())
 		}
+		items.addChangeListener { _, _ ->
+			this.dataListAdapter.notifyDataSetChanged()
+		}
+
 		this.model.setItemsList(items)
 	}
 

app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt

@@ -8,11 +8,11 @@ import android.widget.Toast
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.view.isVisible
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.android.billingclient.api.Purchase
 import com.google.android.material.badge.BadgeDrawable
 import com.google.android.material.badge.BadgeUtils
 import com.google.android.material.tabs.TabLayout
+import io.realm.Realm
 import io.realm.RealmModel
 import io.realm.RealmResults
 import io.realm.Sort
@@ -31,6 +31,7 @@ import net.pokeranalytics.android.ui.activity.components.RequestCode
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.extensions.openUrl
 import net.pokeranalytics.android.ui.fragment.components.FilterableFragment
+import net.pokeranalytics.android.ui.fragment.components.RealmAsyncListener
 import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
 import net.pokeranalytics.android.ui.modules.filter.FilterActivityRequestCode
@@ -45,9 +46,10 @@ import net.pokeranalytics.android.util.URL
 import net.pokeranalytics.android.util.billing.AppGuard
 import net.pokeranalytics.android.util.billing.PurchaseListener
 import net.pokeranalytics.android.util.extensions.count
+import net.pokeranalytics.android.util.extensions.findById
 import java.util.*
 
-class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseListener {
+class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseListener, RealmAsyncListener {
 
 	private enum class Tab {
 		SESSIONS,
@@ -84,14 +86,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseLis
 
 	private var badgeDrawable: BadgeDrawable? = null
 
-	override val observedEntities: List<Class<out RealmModel>> =
+	override fun asyncListenedEntityChange(realm: Realm, clazz: Class<out RealmModel>) {
-		listOf(Session::class.java, Transaction::class.java, HandHistory::class.java)
-
-	override fun entitiesChanged(
-		clazz: Class<out RealmModel>,
-		results: RealmResults<out RealmModel>
-	) {
-		super.entitiesChanged(clazz, results)
 
 		when (clazz.kotlin) {
 			Session::class -> {
@@ -107,7 +102,6 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseLis
 				this.handHistoryAdapter.notifyDataSetChanged()
 			}
 		}
-
 	}
 
 	private var _binding: FragmentFeedBinding? = null
@@ -142,11 +136,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseLis
 		when (item.itemId) {
 			R.id.duplicate -> {
 				val session = this.sessionAdapter.sessionForPosition(menuPosition)
-				if (session != null) {
+				createNewSession(true, sessionId = session.id, duplicate = true)
-					createNewSession(true, sessionId = session.id, duplicate = true)
-				} else {
-					throw PAIllegalStateException("Session not found for duplicate at position: $menuPosition")
-				}
 			}
 		}
 
@@ -158,6 +148,10 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseLis
 
 		AppGuard.registerListener(this)
 
+		addRealmChangeListener(this, Session::class.java)
+		addRealmChangeListener(this, Transaction::class.java)
+		addRealmChangeListener(this, HandHistory::class.java)
+
 		initUI()
 		initData()
 	}
@@ -255,10 +249,10 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseLis
 			binding.messageBox.isVisible = false
 		}
 
-//		val viewManager = SmoothScrollLinearLayoutManager(requireContext())
+		val viewManager = SmoothScrollLinearLayoutManager(requireContext())
 		binding.menuRecyclerView.apply {
 			setHasFixedSize(true)
-			layoutManager = LinearLayoutManager(requireContext())
+			layoutManager = viewManager
 		}
 
 		// Add button
@@ -482,9 +476,8 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseLis
 
 		// gets the first session of the adapter - the last created - to preconfigure the HH
 		if (this.sessionAdapter.itemCount > 0) {
-			this.sessionAdapter.sessionForPosition(0)?.let { session ->
+			val session = this.sessionAdapter.sessionForPosition(0)
-				HandHistoryActivity.newInstance(this, session, false)
+			HandHistoryActivity.newInstance(this, session, false)
-			} ?: throw PAIllegalStateException("Cannot happen")
 		} else {
 			HandHistoryActivity.newInstance(this)
 		}
@@ -494,9 +487,16 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseLis
 	 * Delete selected transaction
 	 */
 	private fun deleteSelectedTransaction() {
-		getRealm().executeTransaction {
+
-			selectedTransaction?.deleteFromRealm()
+		selectedTransaction?.id?.let { id ->
+			getRealm().executeTransactionAsync { asyncRealm ->
+				asyncRealm.findById<Transaction>(id)?.deleteFromRealm()
+			}
 		}
+
+//		getRealm().executeTransaction {
+//			selectedTransaction?.deleteFromRealm()
+//		}
 		selectedTransactionPosition = -1
 	}
 
@@ -583,38 +583,38 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseLis
 
 	private fun retrieveLatestBlogPosts() {
 
-		this.context?.let { context ->
+		val now = Date().time
-			val now = Date().time
+//		if (true) {
-			if (Preferences.shouldShowBlogTips(context) && Preferences.getLastBlogTipsRetrievalDate(context) + 24 * 3600 * 1000 < now) {
+		if (Preferences.shouldShowBlogTips(requireContext()) && Preferences.getLastBlogTipsRetrievalDate(requireContext()) + 24 * 3600 * 1000 < now) {
 
-				BlogPostApi.getLatestPosts(context) { posts ->
+			BlogPostApi.getLatestPosts(requireContext()) { posts ->
 
-					Preferences.setLastBlogTipsRetrievalDate(now, context)
+				context?.let {
+					Preferences.setLastBlogTipsRetrievalDate(now, requireContext())
 					var count = 0
 					if (posts.isNotEmpty()) {
-						Preferences.setLatestRetrievedBlogPostId(posts.first().id, context)
+						Preferences.setLatestRetrievedBlogPostId(posts.first().id, requireContext())
-						val id = Preferences.getLatestDisplayedBlogPostId(context)
+
+						val id = Preferences.getLatestDisplayedBlogPostId(requireContext())
+
 						count = posts.count { it.id > id }
 					}
 					displayBlogPostButton(count)
 				}
+
 			}
 		}
 
 	}
 
 	private fun displayBlogPostButton(newCount: Int = 0) {
-
+		var show = false
-		context?.let { context ->
+		if (Preferences.shouldShowBlogTips(requireContext()) && newCount > 0) {
-			var show = false
+			show = true
-			if (Preferences.shouldShowBlogTips(context) && newCount > 0) {
+			this.badgeDrawable?.number = newCount
-				show = true
-				this.badgeDrawable?.number = newCount
-			}
-			this.binding.postButton.isVisible = show
-			this.badgeDrawable?.isVisible = show
 		}
-
+		this.binding.postButton.isVisible = show
+		this.badgeDrawable?.isVisible = show
 	}
 
 }

app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedHandHistoryRowRepresentableAdapter.kt

@@ -137,8 +137,6 @@ class FeedHandHistoryRowRepresentableAdapter(
 
 		this.sortedHeaders = this.headersPositions.toSortedMap()
 
-//		Timber.d("]]] this.sortedHeaders = ${this.sortedHeaders}")
-
 	}
 
 	/**

app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedSessionRowRepresentableAdapter.kt

@@ -100,7 +100,7 @@ class FeedSessionRowRepresentableAdapter(
 		BindableHolder {
 		fun bind(title: String) {
 			// Title
-			itemView.findViewById<AppCompatTextView>(net.pokeranalytics.android.R.id.title)?.let {
+			itemView.findViewById<AppCompatTextView>(R.id.title)?.let {
 				it.text = title
 			}
 		}
@@ -144,7 +144,7 @@ class FeedSessionRowRepresentableAdapter(
 
 			// If the header has no date, it's a pending session
 			return if (sortedHeaders[position] == null) {
-				context.getString(net.pokeranalytics.android.R.string.pending)
+				context.getString(R.string.pending)
 			} else {
 				// Else, return the formatted date
 				sortedHeaders[position]?.getMonthAndYear() ?: throw PAIllegalStateException("Null date should not happen there")
@@ -153,14 +153,14 @@ class FeedSessionRowRepresentableAdapter(
 		throw PAIllegalStateException("Any position should always have a header, position = $position")
 	}
 
-	fun sessionForPosition(position: Int): Session? {
+	fun sessionForPosition(position: Int): Session {
 		return this.getSessionForPosition(position)
 	}
 
 	/**
 	 * Get real index
 	 */
-	private fun getSessionForPosition(position: Int): Session? {
+	private fun getSessionForPosition(position: Int): Session {
 
 		// Row position
 		var headersBefore = 0
@@ -182,7 +182,7 @@ class FeedSessionRowRepresentableAdapter(
 		allSessions.clear()
 		allSessions.addAll(this.pendingSessions)
 		allSessions.addAll(this.startedSessions)
-		Timber.d("Update session list, total count = ${allSessions.size}")
+//		Timber.d("Update session list, total count = ${allSessions.size}")
 
 		val headersPositions = HashMap<Int, Date?>()
 

app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedTransactionRowRepresentableAdapter.kt

@@ -160,8 +160,6 @@ class FeedTransactionRowRepresentableAdapter(
 	 */
 	private fun checkHeaderCondition(currentCalendar: Calendar, previousYear: Int, previousMonth: Int): Boolean {
 		return currentCalendar.get(Calendar.YEAR) == previousYear && currentCalendar.get(Calendar.MONTH) < previousMonth || (currentCalendar.get(Calendar.YEAR) < previousYear)
-
 	}
 
-
 }

app/src/main/java/net/pokeranalytics/android/ui/modules/feed/NewDataMenuActivity.kt

@@ -9,10 +9,7 @@ import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.view.ViewAnimationUtils
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.*
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import net.pokeranalytics.android.databinding.ActivityNewDataBinding
 import net.pokeranalytics.android.ui.activity.components.BaseActivity
 import net.pokeranalytics.android.ui.extensions.px
@@ -105,7 +102,7 @@ class NewDataMenuActivity : BaseActivity() {
 		val intent = Intent()
 		intent.putExtra(IntentKey.CHOICE.keyName, choice)
 		setResult(RESULT_OK, intent)
-		GlobalScope.launch(Dispatchers.Main) {
+		CoroutineScope(Dispatchers.Main).launch {
 			delay(200)
 			hideMenu()
 		}
@@ -117,18 +114,14 @@ class NewDataMenuActivity : BaseActivity() {
 	private fun showMenu() {
 
 		val menuContainer = binding.menuContainer
+		val cx = menuContainer.measuredWidth - fabSize / 2
+		val cy = menuContainer.measuredHeight - fabSize / 2
+		val finalRadius = max(menuContainer.width, menuContainer.height)
+		val anim = ViewAnimationUtils.createCircularReveal(menuContainer, cx, cy, 0f, finalRadius.toFloat())
+		anim.duration = 150
 
-		if (menuContainer.isAttachedToWindow) {
+		menuContainer.visibility = View.VISIBLE
-			val cx = menuContainer.measuredWidth - fabSize / 2
+		anim.start()
-			val cy = menuContainer.measuredHeight - fabSize / 2
-			val finalRadius = max(menuContainer.width, menuContainer.height)
-			val anim = ViewAnimationUtils.createCircularReveal(menuContainer, cx, cy, 0f, finalRadius.toFloat())
-			anim.duration = 150
-
-			menuContainer.visibility = View.VISIBLE
-			anim.start()
-		}
-
 	}
 
 	/**
@@ -149,17 +142,11 @@ class NewDataMenuActivity : BaseActivity() {
 		anim.duration = 150
 
 		anim.addListener(object : AnimatorListenerAdapter() {
-			override fun onAnimationEnd(animation: Animator) {
+			override fun onAnimationEnd(animation: Animator?) {
 				super.onAnimationEnd(animation)
 				menuContainer.visibility = View.INVISIBLE
 				finish()
 			}
-
-//			override fun onAnimationEnd(animation: Animator?, isReverse: Boolean) {
-//				super.onAnimationEnd(animation, isReverse)
-//				menuContainer.visibility = View.INVISIBLE
-//				finish()
-//			}
 		})
 
 		anim.start()

app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsFragment.kt

@@ -90,7 +90,7 @@ open class FilterDetailsFragment : RealmFragment(), RowRepresentableDelegate {
 
 		this.arguments?.let { bundle ->
 
-			val filter = this.activityModel.currentFilter ?: throw PAIllegalStateException("Filter is null")
+			val filter = this.activityModel.currentFilter
 			val category = bundle.getInt(BundleKey.DATA_TYPE.value)
 			val categoryRow = FilterCategoryRow.values()[category]
 			Timber.d("Category row = $categoryRow")
@@ -100,7 +100,7 @@ open class FilterDetailsFragment : RealmFragment(), RowRepresentableDelegate {
 
 		} ?: throw PAIllegalStateException("Missing bundle")
 
-		Timber.d(">> Filter = ${this.activityModel.currentFilter}")
+//		Timber.d(">> Filter = ${this.activityModel.currentFilter}")
 		Timber.d("selectedRow = ${this.activityModel.selectedCategoryRow}")
 
 		this.binding.toolbar.title = this.activityModel.selectedCategoryRow?.localizedTitle(requireContext())
@@ -230,26 +230,32 @@ open class FilterDetailsFragment : RealmFragment(), RowRepresentableDelegate {
 	 */
 	private fun saveData() {
 
-		val currentFilter = this.activityModel.currentFilter
+		val filter = this.activityModel.currentFilter
 
-		//TODO: Save currentFilter details data
+//		this.activityModel.currentFilter?.id?.let { filterId ->
-		Timber.d("Save data for queryWith: ${currentFilter?.id}")
-		this.model.selectedRows.forEach {
-			Timber.d("Selected rows: $it")
-		}
 
-		this.activityModel.selectedCategoryRow?.let { category ->
+			this.activityModel.selectedCategoryRow?.let { category ->
 
-			getRealm().executeTransaction {
+//				getRealm().executeTransactionAsync { asyncRealm ->
-				currentFilter?.remove(category)
+//					asyncRealm.findById<Filter>(filterId)?.let { filter ->
-				val validConditions = this.model.selectedRows.filter { it.queryCondition != null }
+						filter.remove(category)
-				currentFilter?.createOrUpdateFilterConditions(validConditions)
+						val validConditions = this.model.selectedRows.filter { it.queryCondition != null }
-			}
+						filter.createOrUpdateFilterConditions(validConditions)
-		}
+					}
+//				}
+//			}
 
-		currentFilter?.filterConditions?.forEach {
+//		}
-			Timber.d("Condition: $it")
+
-		}
+//		//TODO: Save currentFilter details data
+//		Timber.d("Save data for queryWith: ${currentFilter?.id}")
+//		this.model.selectedRows.forEach {
+//			Timber.d("Selected rows: $it")
+//		}
+
+//		currentFilter?.filterConditions?.forEach {
+//			Timber.d("Condition: $it")
+//		}
 
 //		finishActivityWithResult(currentFilter?.id)
 	}

app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterDetailsViewModel.kt

@@ -15,7 +15,7 @@ import timber.log.Timber
 
 class FilterDetailsViewModelFactory(var filter: Filter, private var categoryRow: FilterCategoryRow): ViewModelProvider.Factory {
 
-	override fun <T : ViewModel> create(modelClass: Class<T>): T {
+	override fun <T : ViewModel?> create(modelClass: Class<T>): T {
 		return FilterDetailsViewModel(categoryRow, filter) as T
 	}
 

app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterHandler.kt

@@ -45,9 +45,8 @@ interface FilterHandler {
 	fun saveFilter(context: Context, filterId: String) {
 		Preferences.setActiveFilterId(filterId, context)
 
-
 		val realm = Realm.getDefaultInstance()
-        realm.executeTransaction { executeRealm ->
+        realm.executeTransactionAsync { executeRealm ->
             currentFilter(context, executeRealm)?.let {
                 it.useCount++
             }

app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FilterViewModel.kt

@@ -12,7 +12,7 @@ import net.pokeranalytics.android.util.extensions.findById
 
 class FilterViewModel : ViewModel(), StaticRowRepresentableDataSource {
 
-	var currentFilter: Filter? = null
+	var currentFilter: Filter = Filter()
 
 	// Main
 	var filterableType: FilterableType? = null
@@ -27,27 +27,27 @@ class FilterViewModel : ViewModel(), StaticRowRepresentableDataSource {
 
 	fun init(realm: Realm) {
 
-		if (this.currentFilter != null) { // can be called twice and we don't want that
+//		if (this.currentFilter != null) { // can be called twice and we don't want that
-			return
+//			return
-		}
+//		}
 
 		this.primaryKey?.let {
-
 			val filter = realm.findById<Filter>(it) ?: throw PAIllegalStateException("Can't find filter with id=$it")
 			this.currentFilter = realm.copyFromRealm(filter)
 			this.isUpdating = true
 		} ?: run {
-			this.filterableType?.uniqueIdentifier?.let {
+			this.currentFilter.filterableTypeUniqueIdentifier = this.filterableType?.uniqueIdentifier
-				this.currentFilter = Filter.newInstance(it) //realm.copyFromRealm(Filter.newInstanceForResult(realm, this.filterableType.ordinal))
+//			this.filterableType?.uniqueIdentifier?.let {
-			}
+//				this.currentFilter = Filter.newInstance(it) //realm.copyFromRealm(Filter.newInstanceForResult(realm, this.filterableType.ordinal))
+//			}
 		}
 
 		// Create a copy if the user cancels the updates
-		this.currentFilter?.let {
+//		this.currentFilter?.let {
-			if (it.isValid && it.isManaged) {
+//			if (it.isValid && it.isManaged) {
-				this.filterCopy = realm.copyFromRealm(it)
+//				this.filterCopy = realm.copyFromRealm(it)
-			}
+//			}
-		}
+//		}
 
 		this.categoryRows.clear()
 
@@ -59,13 +59,13 @@ class FilterViewModel : ViewModel(), StaticRowRepresentableDataSource {
 
 	// Data source
 
-	override fun adapterRows(): List<RowRepresentable>? {
+	override fun adapterRows(): List<RowRepresentable> {
 		return this.categoryRows
 	}
 
 	override fun charSequenceForRow(row: RowRepresentable, context: Context, tag: Int): CharSequence {
 		// Return the number of selected filters for this category
-		val count = this.currentFilter?.countBy(row as FilterCategoryRow) ?: 0
+		val count = this.currentFilter.countBy(row as FilterCategoryRow)
 		return if (count > 0) count.toString() else ""
 	}
 

app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt

@@ -15,7 +15,6 @@ import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.realm.Filter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.extensions.px
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.rows.FilterCategoryRow
@@ -105,7 +104,7 @@ open class FiltersFragment : RealmFragment(), RowRepresentableDelegate {
 
 	override fun onOptionsItemSelected(item: MenuItem): Boolean {
 		when (item.itemId) {
-			R.id.save -> validateUpdates()
+			R.id.save -> save()
 		}
 		return true
 	}
@@ -156,9 +155,7 @@ open class FiltersFragment : RealmFragment(), RowRepresentableDelegate {
 
 		val categoryRow = row as FilterCategoryRow
 		this.model.selectedCategoryRow = categoryRow
-		this.model.currentFilter?.let { _ ->
+		(activity as FiltersActivity).showDetailsFragment(categoryRow)
-			(activity as FiltersActivity).showDetailsFragment(categoryRow)
-		}
 	}
 
 	/**
@@ -217,18 +214,15 @@ open class FiltersFragment : RealmFragment(), RowRepresentableDelegate {
 	/**
 	 * Validate the  updates of the queryWith
 	 */
-	private fun validateUpdates() {
+	private fun save() {
-		val currentFilter = this.model.currentFilter
+		val filter = this.model.currentFilter
 
-		getRealm().executeTransaction { realm ->
+		getRealm().executeTransactionAsync { asyncRealm ->
-            currentFilter?.let {
+			filter.name = filter.query.getName(requireContext())
-                it.name = it.query.getName(requireContext())
+			asyncRealm.insertOrUpdate(filter)
-                realm.copyToRealmOrUpdate(it)
+		}
-            }
-        }
 
-		val filterId = currentFilter?.id ?: ""
+		finishActivityWithResult(filter.id)
-		finishActivityWithResult(filterId)
 	}
 
 	/**
@@ -239,9 +233,9 @@ open class FiltersFragment : RealmFragment(), RowRepresentableDelegate {
 		val filterCopy = this.model.filterCopy
 
 		val filterId = filterCopy?.id ?: ""
-        getRealm().executeTransaction { realm ->
+        getRealm().executeTransactionAsync { realm ->
             filterCopy?.let {
-                realm.copyToRealmOrUpdate(it)
+                realm.insertOrUpdate(it)
             }
         }
         finishActivityWithResult(filterId)

app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersListFragment.kt

@@ -15,8 +15,10 @@ open class FiltersListFragment : DataListFragment() {
 	override fun onRowValueChanged(value: Any?, row: RowRepresentable) {
 		when (row) {
 			is Filter -> {
-				getRealm().executeTransaction {
+
-					row.updateValue(value, row)
+				row.updateValue(value, row)
+				getRealm().executeTransactionAsync { asyncRealm ->
+					asyncRealm.insertOrUpdate(row)
 				}
 				val index = this.model.items.indexOf(row)
 				this.dataListAdapter.notifyItemChanged(index)

app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorAdapter.kt

@@ -3,10 +3,7 @@ package net.pokeranalytics.android.ui.modules.handhistory.editor
 import android.content.res.ColorStateList
 import android.text.InputType
 import android.view.*
-import android.widget.Button
+import android.widget.*
-import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.TextView
 import androidx.appcompat.widget.AppCompatButton
 import androidx.core.view.isEmpty
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -148,7 +145,7 @@ class EditorAdapter(
 		}
 	}
 
-	abstract inner class AbstractRowHandHolder(itemView: View) : RecyclerView.ViewHolder(itemView), BindableHolder {
+	abstract inner class RowHandHolder(itemView: View) : RecyclerView.ViewHolder(itemView), BindableHolder {
 
 		private var currentPosition = 0
 
@@ -198,25 +195,25 @@ class EditorAdapter(
 				// hides soft input view,
 				// 22/06/22: does not seem useful as - I believe - manifest activity has android:windowSoftInputMode="stateAlwaysHidden"
 				editText.setTextIsSelectable(true)
-//
+
-//				// Enabled
+				// Enabled
 				val isEnabled = adapter.dataSource.isEnabled(row, tag)
 				editText.isEnabled = isEnabled
-//
+
-//				// Text
+				// Text
 				val string = adapter.dataSource.charSequenceForRow(row, itemView.context, tag)
 				editText.setText(string)
-//
+
-//				// Focus
+				// Focus
 				val isFocused = adapter.dataSource.isSelected(position, row, tag)
-//				toggleFocus(editText, isFocused)
+				toggleFocus(editText, isFocused)
-//				editText.isFocusable = adapter.dataSource.isFocusable(position, row, tag)
+				editText.isFocusable = adapter.dataSource.isFocusable(position, row, tag)
-//				editText.isFocusableInTouchMode = adapter.dataSource.isFocusable(position, row, tag)
+				editText.isFocusableInTouchMode = adapter.dataSource.isFocusable(position, row, tag)
-//
+
-//				// Put cursor at the end
+				// Put cursor at the end
-//				if (isFocused) {
+				if (isFocused) {
-//					editText.setSelection(editText.text.length)
+					editText.setSelection(editText.text.length)
-//				}
+				}
 
 				// Background
 				setViewBackground(editText, isEnabled, isFocused)
@@ -245,7 +242,7 @@ class EditorAdapter(
 
 			editText.isFocusableInTouchMode = true
 
-			editText.setOnTouchListener { view, event ->
+			editText.setOnTouchListener { _, event ->
 
 				if (event.action == MotionEvent.ACTION_UP) {
 					// Both are required, otherwise requestFocus() fails
@@ -256,8 +253,6 @@ class EditorAdapter(
 
 					editTextSelected(editText)
 				}
-				view.performClick()
-
 				return@setOnTouchListener true
 			}
 
@@ -362,7 +357,7 @@ class EditorAdapter(
 				layout.setOnClickListener {
 					if ((dataSource as EditorViewModel).isEdited) {
 						delegate?.onRowSelected(this.currentPosition, row, layout.tag as Int)
-						setViewBackground(layout, isEnabled = true, isFocused = true)
+						setViewBackground(layout, true, true)
 					}
 				}
 
@@ -372,7 +367,7 @@ class EditorAdapter(
 
 	}
 
-	inner class RowStraddleHolder(itemView: View) : AbstractRowHandHolder(itemView) {
+	inner class RowStraddleHolder(itemView: View) : RowHandHolder(itemView) {
         private var container: ViewGroup = itemView.findViewById(R.id.container)
         private var positionsChipGroup: FlowLayout = itemView.findViewById(R.id.positionsChipGroup)
 
@@ -414,7 +409,7 @@ class EditorAdapter(
 		}
 	}
 
-	inner class RowPositionHolder(itemView: View) : AbstractRowHandHolder(itemView) {
+	inner class RowPositionHolder(itemView: View) : RowHandHolder(itemView) {
         private var recycler: RecyclerView = itemView.findViewById(R.id.recycler)
 
 		private var positionAdapter: PositionAdapter = PositionAdapter()
@@ -450,7 +445,7 @@ class EditorAdapter(
 
 	}
 
-	inner class RowActionReadHolder(itemView: View) : AbstractRowHandHolder(itemView) {
+	inner class RowActionReadHolder(itemView: View) : RowHandHolder(itemView) {
 
         private var playerImage: PlayerImageView = itemView.findViewById(R.id.player_image_rhar)
         private var stackText: TextView = itemView.findViewById(R.id.stackText)
@@ -486,7 +481,7 @@ class EditorAdapter(
 	/**
 	 * Display a hand action
 	 */
-	inner class RowActionHolder(itemView: View) : AbstractRowHandHolder(itemView) {
+	inner class RowActionHolder(itemView: View) : RowHandHolder(itemView) {
 
         private var playerImage: PlayerImageView = itemView.findViewById(R.id.player_image_rha)
         private var actionButton: AppCompatButton = itemView.findViewById(R.id.actionButton)
@@ -508,19 +503,18 @@ class EditorAdapter(
                 amountEditText.inputType = InputType.TYPE_NUMBER_FLAG_DECIMAL
                 amountEditText.isFocusableInTouchMode = true
 
-                amountEditText.setOnTouchListener { view, event ->
+                amountEditText.setOnTouchListener { _, event ->
 
         //					Timber.d("=== event.action = ${event.action}")
                     if (event.action == MotionEvent.ACTION_UP) {
                         // Both are required, otherwise requestFocus() fails
-//                        amountEditText.isFocusable = true
+                        amountEditText.isFocusable = true
-//                        amountEditText.isFocusableInTouchMode = true
+                        amountEditText.isFocusableInTouchMode = true
-//
+
-//                        amountEditText.requestFocus()
+                        amountEditText.requestFocus()
 
                         editTextSelected(amountEditText)
                     }
-					view.performClick()
                     return@setOnTouchListener true
                 }
 
@@ -574,7 +568,7 @@ class EditorAdapter(
 	/**
 	 * Display a hand street
 	 */
-	inner class RowStreetHolder(itemView: View) : AbstractRowHandHolder(itemView) {
+	inner class RowStreetHolder(itemView: View) : RowHandHolder(itemView) {
         private var cardsLayout: LinearLayout = itemView.findViewById(R.id.cardsLayout)
 
         override fun onBind(position: Int, row: RowRepresentable, adapter: RecyclerAdapter) {
@@ -592,7 +586,7 @@ class EditorAdapter(
 	/**
 	 * Display a hand action
 	 */
-	inner class RowPlayerSummaryHolder(itemView: View) : AbstractRowHandHolder(itemView) {
+	inner class RowPlayerSummaryHolder(itemView: View) : RowHandHolder(itemView) {
         private var hpsPlayerImage: PlayerImageView = itemView.findViewById(R.id.hps_player_image)
         private var handLayout: LinearLayout = itemView.findViewById(R.id.handLayout)
 
@@ -619,7 +613,7 @@ class EditorAdapter(
 		}
 	}
 
-	abstract inner class AbstractRowPlayerSetup(itemView: View) : AbstractRowHandHolder(itemView) {
+	abstract inner class AbstractRowPlayerSetup(itemView: View) : RowHandHolder(itemView) {
         private var psHandLayout: LinearLayout = itemView.findViewById(R.id.ps_hand_layout)
         private var positionButton: AppCompatButton = itemView.findViewById(R.id.position_button)
 

app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/editor/EditorFragment.kt

@@ -202,12 +202,15 @@ class EditorFragment : RealmFragment(), RowRepresentableDelegate, KeyboardListen
 				if (resultCode == Activity.RESULT_OK) {
 					val playerId = data?.getStringExtra(BaseFragment.BundleKey.PRIMARY_KEY.value)
 						?: throw PAIllegalStateException("Primary key not set where as activity has finished")
-					getRealm().findById<Player>(playerId)?.let { player ->
+
-						this.model.playerSelected(player)
+					val realm = getRealm()
+
+					realm.findById<Player>(playerId)?.let { player ->
+						val p = realm.copyFromRealm(player)
+						this.model.playerSelected(p)
 					} ?: throw PAIllegalStateException("Player (id=$playerId) not found")
 					this.editorAdapter.notifyDataSetChanged()
 				}
-
 			}
 		}
 
@@ -317,7 +320,7 @@ class EditorFragment : RealmFragment(), RowRepresentableDelegate, KeyboardListen
 		val handRow = this.model.rowRepresentableForPosition(selection.index) as? HandHistoryRow
 
 		val holder =
-			binding.recyclerView.findViewHolderForAdapterPosition(selection.index) as? EditorAdapter.AbstractRowHandHolder
+			binding.recyclerView.findViewHolderForAdapterPosition(selection.index) as? EditorAdapter.RowHandHolder
 		holder?.let {
 			val amountEditText = it.editTextForTag(selection.tag)
 			this.binding.keyboard.setAmountEditText(
@@ -684,10 +687,9 @@ class EditorFragment : RealmFragment(), RowRepresentableDelegate, KeyboardListen
 	 */
 	private fun deleteHand() {
 
-		getRealm().findById<HandHistory>(this.model.handHistory.id)?.let { hh ->
+		val hhId = this.model.handHistory.id
-			getRealm().executeTransaction {
+		getRealm().executeTransactionAsync { asyncRealm ->
-				hh.deleteFromRealm()
+			asyncRealm.findById<HandHistory>(hhId)?.deleteFromRealm()
-			}
 		}
 
 		this.activity?.finish()