From d19b16f7b371df7ccbe432cd3330d390cf47f627 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Thu, 23 Sep 2021 16:56:18 +0200
Subject: [PATCH] Remove obsolete min SDK checks

---
 .../java/de/mm20/launcher2/search/data/File.kt  |  4 +---
 .../launcher2/ui/legacy/helper/WallpaperBlur.kt | 16 +++++++---------
 .../converters/CurrencyConverter.kt             | 17 +++++------------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/files/src/main/java/de/mm20/launcher2/search/data/File.kt b/files/src/main/java/de/mm20/launcher2/search/data/File.kt
index bb548a68..13e512b3 100644
--- a/files/src/main/java/de/mm20/launcher2/search/data/File.kt
+++ b/files/src/main/java/de/mm20/launcher2/search/data/File.kt
@@ -360,9 +360,7 @@ open class File(
                     metaData.add(R.string.file_meta_app_name to pkgInfo.applicationInfo.loadLabel(context.packageManager).toString())
                     metaData.add(R.string.file_meta_app_pkgname to pkgInfo.packageName)
                     metaData.add(R.string.file_meta_app_version to pkgInfo.versionName)
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                        metaData.add(R.string.file_meta_app_min_sdk to pkgInfo.applicationInfo.minSdkVersion.toString())
-                    }
+                    metaData.add(R.string.file_meta_app_min_sdk to pkgInfo.applicationInfo.minSdkVersion.toString())
                 }
             }
             return metaData
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/helper/WallpaperBlur.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/helper/WallpaperBlur.kt
index 4159b403..b56596e8 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/helper/WallpaperBlur.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/helper/WallpaperBlur.kt
@@ -61,16 +61,14 @@ object WallpaperBlur {
                                 val out = FileOutputStream(File(context.cacheDir, "wallpaper"))
                                 resource.compress(Bitmap.CompressFormat.PNG, 100, out)
                                 out.close()
-                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                                    context.getSharedPreferences("wallpaper", Context.MODE_PRIVATE)
-                                        .edit()
-                                        .putInt(
-                                            "last_wallpaper_id", wm.getWallpaperId(
-                                                WallpaperManager.FLAG_SYSTEM
-                                            )
+                                context.getSharedPreferences("wallpaper", Context.MODE_PRIVATE)
+                                    .edit()
+                                    .putInt(
+                                        "last_wallpaper_id", wm.getWallpaperId(
+                                            WallpaperManager.FLAG_SYSTEM
                                         )
-                                        .apply()
-                                }
+                                    )
+                                    .apply()
 
                                 if (LauncherPreferences.instance.blurCards && LauncherPreferences.instance.cardOpacity < 0xFF) {
                                     blurredWallpaper = resource
diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt b/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt
index e1137ab0..480bf916 100644
--- a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt
+++ b/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt
@@ -29,19 +29,12 @@ class CurrencyConverter(context: Context) : Converter() {
 
     private fun formatName(symbol: String, value: Double): String {
         val text = StringBuilder()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            val currency = Currency.getInstance(symbol) ?: return formatNameFallback(symbol)
-            val pluralCount = PluralRules.forLocale(Locale.getDefault()).select(value)
-            text.append(currency.getName(Locale.getDefault(), Currency.PLURAL_LONG_NAME, pluralCount, booleanArrayOf(false)))
-                    .append(" ")
-                    .append(repository.getFlag(symbol))
+        val currency = Currency.getInstance(symbol) ?: return formatNameFallback(symbol)
+        val pluralCount = PluralRules.forLocale(Locale.getDefault()).select(value)
+        text.append(currency.getName(Locale.getDefault(), Currency.PLURAL_LONG_NAME, pluralCount, booleanArrayOf(false)))
+                .append(" ")
+                .append(repository.getFlag(symbol))
 
-        } else {
-            val currency = JCurrency.getInstance(symbol) ?: return formatNameFallback(symbol)
-            text.append(currency.displayName)
-                    .append(" ")
-                    .append(repository.getFlag(symbol))
-        }
         return text.toString()
     }