From beb15093888439cdef853f78d1cdbf3eb07128e7 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Fri, 11 Sep 2020 15:54:24 +0200
Subject: [PATCH] Fixes warnings

---
 .../android/model/realm/Session.kt               | 16 ++++++++++------
 .../android/ui/activity/GraphActivity.kt         |  4 ++--
 .../ui/activity/components/ReportActivity.kt     |  4 ++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
index 75c5cf66..4050473c 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
@@ -165,9 +165,11 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 	private var startDateHourMinuteComponent: Double? = null
 		get() {
 			if (field == null && startDate != null) {
-				val cal = Calendar.getInstance()
-				cal.time = startDate
-				field = cal.hourMinute()
+				startDate?.let { date ->
+					val cal = Calendar.getInstance()
+					cal.time = date
+					field = cal.hourMinute()
+				}
 			}
 			return field
 		}
@@ -175,9 +177,11 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 	private var endDateHourMinuteComponent: Double? = null
 		get() {
 			if (field == null && endDate != null) {
-				val cal = Calendar.getInstance()
-				cal.time = endDate
-				field = cal.hourMinute()
+				endDate?.let { date ->
+					val cal = Calendar.getInstance()
+					cal.time = date
+					field = cal.hourMinute()
+				}
 			}
 			return field
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/GraphActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/GraphActivity.kt
index e1b5c300..a029e445 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/GraphActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/GraphActivity.kt
@@ -3,7 +3,7 @@ package net.pokeranalytics.android.ui.activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import com.github.mikephil.charting.data.BarDataSet
 import com.github.mikephil.charting.data.LineDataSet
 import kotlinx.android.synthetic.main.activity_graph.*
@@ -18,7 +18,7 @@ import net.pokeranalytics.android.ui.viewmodel.ViewModelHolder
 class GraphActivity : BaseActivity(), ViewModelHolder {
 
 	override val model: GraphViewModel by lazy {
-		ViewModelProviders.of(this).get(GraphViewModel::class.java)
+		ViewModelProvider(this).get(GraphViewModel::class.java)
 	}
 
 	companion object {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/components/ReportActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/ReportActivity.kt
index 8e47e781..d971ac98 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/components/ReportActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/ReportActivity.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import net.pokeranalytics.android.calculus.Report
 import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.ui.viewmodel.ReportViewModel
@@ -15,7 +15,7 @@ class ReportParameters(var report: Report, var title: String, var stat: Stat? =
 abstract class ReportActivity : BaseActivity(), ViewModelHolder {
 
 	override val model: ReportViewModel by lazy {
-		ViewModelProviders.of(this).get(ReportViewModel::class.java)
+		ViewModelProvider(this).get(ReportViewModel::class.java)
 	}
 
 	companion object {