From 28f823b121bab0bb54d669d933d0550b69a14d8f Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Mon, 4 Jan 2021 14:40:12 +0100
Subject: [PATCH] Crash fix attempt

---
 .../android/ui/modules/feed/FeedFragment.kt   | 37 ++-----------------
 .../android/util/billing/AppGuard.kt          |  5 +--
 2 files changed, 6 insertions(+), 36 deletions(-)

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 ad496014..e80ae985 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
@@ -106,11 +106,6 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseLis
 	private var _binding: FragmentFeedBinding? = null
 	private val binding get() = _binding!!
 
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		AppGuard.registerListener(this)
-	}
-
 	override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -154,35 +149,11 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseLis
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		initUI()
-		initData()
 
-//		if (ContextCompat.checkSelfPermission(requireActivity(), Manifest.permission.READ_EXTERNAL_STORAGE)
-//			!= PackageManager.PERMISSION_GRANTED) {
-//
-//			if (ActivityCompat.shouldShowRequestPermissionRationale(requireActivity(),
-//					Manifest.permission.READ_EXTERNAL_STORAGE)) {
-//				// Show an explanation to the user *asynchronously* -- don't block
-//				// this thread waiting for the user's response! After the user
-//				// sees the explanation, try again to request the permission.
-//			} else {
-//				// No explanation needed, we can request the permission.
-//				ActivityCompat.requestPermissions(requireActivity(),
-//					arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE),
-//					12)
-//
-//				// MY_PERMISSIONS_REQUEST_READ_CONTACTS is an
-//				// app-defined int constant. The callback method gets the
-//				// result of the request.
-//			}
-//
-//		} else {
-//
-//			val uri = Uri.fromFile(File("sdcard/Download/Results_0802.csv"))
-//			ImportActivity.newInstanceForResult(requireActivity(), uri)
-//
-//		}
+		AppGuard.registerListener(this)
 
+		initUI()
+		initData()
 	}
 
 	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -214,12 +185,12 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseLis
 	}
 
 	override fun onDestroy() {
-		AppGuard.unregisterListener(this)
 		super.onDestroy()
 	}
 
 	override fun onDestroyView() {
 		super.onDestroyView()
+		AppGuard.unregisterListener(this)
 		realmTransactions.removeAllChangeListeners()
 		_binding = null
 	}
diff --git a/app/src/main/java/net/pokeranalytics/android/util/billing/AppGuard.kt b/app/src/main/java/net/pokeranalytics/android/util/billing/AppGuard.kt
index ec401d48..319379d1 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/billing/AppGuard.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/billing/AppGuard.kt
@@ -237,7 +237,6 @@ object AppGuard : PurchasesUpdatedListener {
 			// Handle any other error codes.
 		}
 
-
 	}
 
 	private fun sendNoPurchaseRetrievedEvent() {
@@ -326,14 +325,14 @@ object AppGuard : PurchasesUpdatedListener {
 	}
 
 	/***
-	 * Removes a listener
+	 * Removes a PurchaseListener
 	 */
 	fun registerListener(listener: PurchaseListener) {
 		this.purchaseListeners.add(listener)
 	}
 
 	/***
-	 * Removes a listener
+	 * Removes a PurchaseListener
 	 */
 	fun unregisterListener(listener: PurchaseListener) {
 		this.purchaseListeners.remove(listener)