From 574390e89ff5501d00cae3f26753a2a1681bdd27 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Wed, 31 May 2023 16:53:11 +0800
Subject: [PATCH] fixup! Read system xml blacklist as default

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 .../store/data/providers/BlacklistProvider.kt | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/data/providers/BlacklistProvider.kt b/app/src/main/java/com/aurora/store/data/providers/BlacklistProvider.kt
index 5239df73d..770939fa8 100644
--- a/app/src/main/java/com/aurora/store/data/providers/BlacklistProvider.kt
+++ b/app/src/main/java/com/aurora/store/data/providers/BlacklistProvider.kt
@@ -22,6 +22,7 @@ package com.aurora.store.data.providers
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.preference.PreferenceManager
+import com.aurora.extensions.isNAndAbove
 import com.aurora.store.data.SingletonHolder
 import com.aurora.store.util.Preferences
 import com.google.gson.Gson
@@ -41,12 +42,27 @@ class BlacklistProvider private constructor(var context: Context) {
         .create()
 
     fun getBlackList(): MutableSet<String> {
-        val rawBlacklist = PreferenceManager.getDefaultSharedPreferences(context)
-            .getString(PREFERENCE_BLACKLIST, (Context::class.java.getDeclaredMethod(
-                "getSharedPreferences", File::class.java, Int::class.java).invoke(context,
-                File("/product/etc/" + context.packageName + "/blacklist.xml"),
-                Context.MODE_PRIVATE) as SharedPreferences).getString(PREFERENCE_BLACKLIST, ""))
         return try {
+            val rawBlacklist = if (isNAndAbove()) {
+                val refMethod = Context::class.java.getDeclaredMethod(
+                    "getSharedPreferences",
+                    File::class.java,
+                    Int::class.java
+                )
+                val refSharedPreferences = refMethod.invoke(
+                    context,
+                    File("/product/etc/" + context.packageName + "/blacklist.xml"),
+                    Context.MODE_PRIVATE
+                ) as SharedPreferences
+
+                PreferenceManager.getDefaultSharedPreferences(context)
+                    .getString(
+                        PREFERENCE_BLACKLIST,
+                        refSharedPreferences.getString(PREFERENCE_BLACKLIST, "")
+                    )
+            } else {
+                Preferences.getString(context, PREFERENCE_BLACKLIST)
+            }
             if (rawBlacklist!!.isEmpty())
                 mutableSetOf()
             else