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

@@ -12,7 +12,6 @@ import net.pokeranalytics.android.calculus.optimalduration.CashGameOptimalDurati
 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.extensions.formattedHourlyDuration
 import timber.log.Timber
 import kotlin.coroutines.CoroutineContext
@@ -33,7 +32,7 @@ class ReportWhistleBlower(var context: Context) {
 
     private val listeners: MutableList<NewPerformanceListener> = mutableListOf()
 
-    var paused: Boolean = false
+    private var paused: Boolean = false
 
     private var timer: CountDownTimer? = null
 
@@ -66,7 +65,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,13 +131,10 @@ 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()
     }
 
@@ -147,8 +142,6 @@ class ReportTask(private var whistleBlower: ReportWhistleBlower, var context: Co
         this.cancelled = true
     }
 
-    var messages: MutableList<String> = mutableListOf()
-
     private fun launchReports() {
         CoroutineScope(coroutineContext).launch {
 
@@ -197,18 +190,14 @@ 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) {
@@ -228,7 +217,6 @@ 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)
@@ -237,8 +225,6 @@ class ReportTask(private var whistleBlower: ReportWhistleBlower, var context: Co
 
                 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
@@ -260,7 +246,6 @@ class ReportTask(private var whistleBlower: ReportWhistleBlower, var context: Co
                     }
 
                 }
-                messages.add("storePerf = $storePerf...")
 
                 if (currentPerf == null && storePerf) {
                     val performance = Performance(
@@ -276,9 +261,6 @@ class ReportTask(private var whistleBlower: ReportWhistleBlower, var context: Co
                 }
 
             } ?: 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/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/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,7 +8,6 @@ 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
@@ -21,8 +18,6 @@ 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.ReportWhistleBlower
 import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.calculus.calcul.ReportDisplay
 import net.pokeranalytics.android.databinding.FragmentReportsBinding
@@ -31,7 +26,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 +41,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>) {
@@ -188,24 +182,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 +199,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)
 		}
@@ -362,32 +342,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/res/layout/fragment_reports.xml

@@ -66,18 +66,4 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent" />
 
-	<com.google.android.material.floatingactionbutton.FloatingActionButton
-		android:id="@+id/computeButton"
-		style="@style/PokerAnalyticsTheme.FloatingButton"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="bottom|end"
-		android:layout_marginStart="16dp"
-		android:layout_marginBottom="16dp"
-		android:src="@drawable/ic_outline_restart"
-		android:tint="@color/black"
-		app:fabSize="normal"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintStart_toStartOf="parent" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>