From 8ab999e0f66c398a1a2de610ad2acd4ce252c621 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Fri, 8 Nov 2019 12:34:53 +0100
Subject: [PATCH] Fixes issue with Poker Agent CSV import + bumps version

---
 app/build.gradle                                              | 4 ++--
 .../pokeranalytics/android/util/csv/ProductCSVDescriptors.kt  | 2 +-
 .../pokeranalytics/android/util/csv/SessionCSVDescriptor.kt   | 3 ++-
 app/src/main/res/layout/row_header_title_amount.xml           | 3 ++-
 app/standard/release/output.json                              | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 533f1377..fecd3d42 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,8 +33,8 @@ android {
         applicationId "net.pokeranalytics.android"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 70
-        versionName "2.2.12"
+        versionCode 73
+        versionName "2.3.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/app/src/main/java/net/pokeranalytics/android/util/csv/ProductCSVDescriptors.kt b/app/src/main/java/net/pokeranalytics/android/util/csv/ProductCSVDescriptors.kt
index 197cd7f1..ffc006d0 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/csv/ProductCSVDescriptors.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/csv/ProductCSVDescriptors.kt
@@ -29,7 +29,7 @@ class ProductCSVDescriptors {
                     SessionField.SmallBlind("SB"),
                     SessionField.BigBlind("BB"),
                     SessionField.NetResult("P/L"),
-                    SessionField.Duration("Hrs", randomTime = true),
+                    SessionField.Duration("Hrs", randomTime = false),
                     SessionField.LimitAndGame("Type")
                 )
             }
diff --git a/app/src/main/java/net/pokeranalytics/android/util/csv/SessionCSVDescriptor.kt b/app/src/main/java/net/pokeranalytics/android/util/csv/SessionCSVDescriptor.kt
index 7bfcfb11..c3c1907e 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/csv/SessionCSVDescriptor.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/csv/SessionCSVDescriptor.kt
@@ -181,7 +181,8 @@ class SessionCSVDescriptor(source: DataSource, private var isTournament: Boolean
 								}
 
 								if (startInSeconds < 0) {
-									throw PAIllegalStateException("negative start: $startDate, start = $startInSeconds, net = ${session.result?.netResult}")
+									startInSeconds = 20 * 3600.0
+//									throw PAIllegalStateException("negative start: $startDate, start = $startInSeconds, net = ${session.result?.netResult}")
 								}
 
 								val hour = (startInSeconds / 3600.0).toInt()
diff --git a/app/src/main/res/layout/row_header_title_amount.xml b/app/src/main/res/layout/row_header_title_amount.xml
index 59326e1f..5b3231d9 100644
--- a/app/src/main/res/layout/row_header_title_amount.xml
+++ b/app/src/main/res/layout/row_header_title_amount.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.LinearLayoutCompat
+	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/rowHeaderTitleAmount.container"
diff --git a/app/standard/release/output.json b/app/standard/release/output.json
index 2bc3f147..db61eb46 100644
--- a/app/standard/release/output.json
+++ b/app/standard/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":70,"versionName":"2.2.12","enabled":true,"outputFile":"PokerAnalytics_2.2.12(70)_191014_1156_release.apk","fullName":"standardRelease","baseName":"standard-release"},"path":"PokerAnalytics_2.2.12(70)_191014_1156_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":73,"versionName":"2.3.1","enabled":true,"outputFile":"PokerAnalytics_2.3.1(73)_191102_1506_release.apk","fullName":"standardRelease","baseName":"standard-release"},"path":"PokerAnalytics_2.3.1(73)_191102_1506_release.apk","properties":{}}]
\ No newline at end of file