From 4b47d3b8de575692ad9baaeea539e36e1c81b05a Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester
 <32322857+jarnedemeulemeester@users.noreply.github.com>
Date: Sat, 26 Feb 2022 16:06:47 +0100
Subject: [PATCH] Target SDK 32, up minimum to 26 (#97)

minSdk 24 -> 26
targetSdk 31 -> 32
compileSdk 31 -> 32
---
 app/build.gradle.kts                                |  6 +++---
 .../viewmodels/EpisodeBottomSheetViewModel.kt       | 12 +++---------
 .../jellyfin/viewmodels/MediaInfoViewModel.kt       | 13 +++----------
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8dde33ea..bc2e0e9a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,13 +9,13 @@ plugins {
 }
 
 android {
-    compileSdk = 31
+    compileSdk = 32
     buildToolsVersion = "32.0.0"
 
     defaultConfig {
         applicationId = "dev.jdtech.jellyfin"
-        minSdk = 24
-        targetSdk = 31
+        minSdk = 26
+        targetSdk = 32
         versionCode = 8
         versionName = "0.3.2"
 
diff --git a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/EpisodeBottomSheetViewModel.kt b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/EpisodeBottomSheetViewModel.kt
index 0c8d9e70..4ca87da5 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/EpisodeBottomSheetViewModel.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/EpisodeBottomSheetViewModel.kt
@@ -2,7 +2,6 @@ package dev.jdtech.jellyfin.viewmodels
 
 import android.app.Application
 import android.net.Uri
-import android.os.Build
 import androidx.lifecycle.*
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dev.jdtech.jellyfin.database.DownloadDatabaseDao
@@ -180,13 +179,8 @@ constructor(
     }
 
     private fun getDateString(item: BaseItemDto): String {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val instant = item.premiereDate?.toInstant(ZoneOffset.UTC)
-            val date = Date.from(instant)
-            DateFormat.getDateInstance(DateFormat.SHORT).format(date)
-        } else {
-            // TODO: Implement a way to get the year from LocalDateTime in Android < O
-            item.premiereDate.toString()
-        }
+        val instant = item.premiereDate?.toInstant(ZoneOffset.UTC)
+        val date = Date.from(instant)
+        return DateFormat.getDateInstance(DateFormat.SHORT).format(date)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaInfoViewModel.kt b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaInfoViewModel.kt
index cca8a007..2230c8fd 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaInfoViewModel.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaInfoViewModel.kt
@@ -2,7 +2,6 @@ package dev.jdtech.jellyfin.viewmodels
 
 import android.app.Application
 import android.net.Uri
-import android.os.Build
 import androidx.lifecycle.LifecycleCoroutineScope
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -249,17 +248,11 @@ constructor(
         return when (item.status) {
             "Continuing" -> dateString.plus(" - Present")
             "Ended" -> {
-                return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    return if (item.productionYear == item.endDate?.year) {
-                        dateString
-                    } else {
-                        dateString.plus(" - ${item.endDate?.year}")
-                    }
-                } else {
-                    // TODO: Implement a way to get the year from LocalDateTime in Android < O
+                return if (item.productionYear == item.endDate?.year) {
                     dateString
+                } else {
+                    dateString.plus(" - ${item.endDate?.year}")
                 }
-
             }
             else -> dateString
         }