From 812278834911bfe543dfdff6819e99f3ebd3cf53 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Mon, 16 Jan 2023 17:09:16 +0530
Subject: [PATCH] Use ConfigurationCompat.getLocales().

---
 .../com/github/libretube/ui/fragments/PlayerFragment.kt   | 8 +++-----
 app/src/main/java/com/github/libretube/util/TextUtils.kt  | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
index 2e0e9d0ed..f6f8456ee 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
@@ -27,6 +27,7 @@ import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.net.toUri
+import androidx.core.os.ConfigurationCompat
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
@@ -842,11 +843,8 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
     }
 
     private fun localizedDate(date: String?): String? {
-        return if (SDK_INT >= Build.VERSION_CODES.N) {
-            TextUtils.localizeDate(date, resources.configuration.locales[0])
-        } else {
-            TextUtils.localizeDate(date)
-        }
+        val locale = ConfigurationCompat.getLocales(resources.configuration)[0]!!
+        return TextUtils.localizeDate(date, locale)
     }
 
     private fun handleLiveVideo() {
diff --git a/app/src/main/java/com/github/libretube/util/TextUtils.kt b/app/src/main/java/com/github/libretube/util/TextUtils.kt
index e3b774b17..1fe22eeb1 100644
--- a/app/src/main/java/com/github/libretube/util/TextUtils.kt
+++ b/app/src/main/java/com/github/libretube/util/TextUtils.kt
@@ -40,7 +40,7 @@ object TextUtils {
      * @param locale The locale to use, otherwise uses system default
      * return Localized date string
      */
-    fun localizeDate(date: String?, locale: Locale? = null): String? {
+    fun localizeDate(date: String?, locale: Locale): String? {
         date ?: return null
 
         // relative time span