From 8ac5119019ab0f282a8aa80dabe0110b077d76d7 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Tue, 24 Jan 2023 14:12:40 +0100
Subject: [PATCH] Additional crash fixes

---
 .../android/ui/fragment/ImportFragment.kt      | 16 ++++++----------
 .../android/ui/modules/feed/FeedFragment.kt    | 18 +++++++-----------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt
index 748f9c49..d842c3db 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt
@@ -16,6 +16,7 @@ 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
@@ -101,7 +102,11 @@ class ImportFragment : RealmFragment(), ImportDelegate {
 				val s = Date()
 				Timber.d(">>> Start Import...")
 
-				importer.start()
+				try {
+					importer.start()
+				} catch (e: ImportException) {
+					exceptions.add(e)
+				}
 
 				val e = Date()
 				val duration = (e.time - s.time) / 1000.0
@@ -122,15 +127,6 @@ class ImportFragment : RealmFragment(), ImportDelegate {
 				snackBar.show()
 			}
 
-//			if (shouldDismissActivity) {
-//
-//				activity?.let {
-//					it.setResult(ResultCode.IMPORT_UNRECOGNIZED_FORMAT.value)
-//					it.finish()
-//				}
-//
-//			} else {
-//			}
 			importDidFinish()
 
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt
index 86fc78f1..8886cec4 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt
@@ -582,25 +582,21 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseLis
 
 	private fun retrieveLatestBlogPosts() {
 
-		val now = Date().time
-//		if (true) {
-		if (Preferences.shouldShowBlogTips(requireContext()) && Preferences.getLastBlogTipsRetrievalDate(requireContext()) + 24 * 3600 * 1000 < now) {
+		this.context?.let { context ->
+			val now = Date().time
+			if (Preferences.shouldShowBlogTips(context) && Preferences.getLastBlogTipsRetrievalDate(context) + 24 * 3600 * 1000 < now) {
 
-			BlogPostApi.getLatestPosts(requireContext()) { posts ->
+				BlogPostApi.getLatestPosts(context) { posts ->
 
-				context?.let {
-					Preferences.setLastBlogTipsRetrievalDate(now, requireContext())
+					Preferences.setLastBlogTipsRetrievalDate(now, context)
 					var count = 0
 					if (posts.isNotEmpty()) {
-						Preferences.setLatestRetrievedBlogPostId(posts.first().id, requireContext())
-
-						val id = Preferences.getLatestDisplayedBlogPostId(requireContext())
-
+						Preferences.setLatestRetrievedBlogPostId(posts.first().id, context)
+						val id = Preferences.getLatestDisplayedBlogPostId(context)
 						count = posts.count { it.id > id }
 					}
 					displayBlogPostButton(count)
 				}
-
 			}
 		}