From 9f5016f438d61fcff44a1ba233788bfae2ae7a53 Mon Sep 17 00:00:00 2001
From: Rahul Kumar Patel <whyorean@gmail.com>
Date: Sat, 27 Feb 2021 02:58:46 +0530
Subject: [PATCH] Fix FDroid filter

---
 .../java/com/aurora/store/util/CertUtil.kt    | 25 +++++++++----------
 .../java/com/aurora/store/util/PackageUtil.kt |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/util/CertUtil.kt b/app/src/main/java/com/aurora/store/util/CertUtil.kt
index 14efd0b76..4e924b1b3 100644
--- a/app/src/main/java/com/aurora/store/util/CertUtil.kt
+++ b/app/src/main/java/com/aurora/store/util/CertUtil.kt
@@ -35,22 +35,24 @@ object CertUtil {
     private fun getX509Certificates(
         context: Context,
         packageName: String
-    ): List<X509Certificate?> {
-        val certificates: MutableList<X509Certificate?> = mutableListOf()
+    ): List<X509Certificate> {
+        val certificates: MutableList<X509Certificate> = mutableListOf()
         val packageManager = context.applicationContext.packageManager
 
         try {
 
-            val packageInfo = if (isPAndAbove())
+            val packageInfo = if (isPAndAbove()) {
                 packageManager.getPackageInfo(
                     packageName,
                     PackageManager.GET_SIGNING_CERTIFICATES
                 )
-            else
+            }
+            else {
                 packageManager.getPackageInfo(
                     packageName,
                     PackageManager.GET_SIGNATURES
                 )
+            }
 
             val certificateFactory = CertificateFactory.getInstance("X509")
 
@@ -63,7 +65,7 @@ object CertUtil {
                     )
                 }
             } else {
-                for (i in 0..packageInfo.signatures.size) {
+                for (i in packageInfo.signatures.indices) {
                     val bytes = packageInfo.signatures[i].toByteArray()
                     val inStream: InputStream = ByteArrayInputStream(bytes)
                     certificates.add(
@@ -72,7 +74,7 @@ object CertUtil {
                 }
             }
         } catch (e: Exception) {
-            Log.e(e.message)
+
         }
 
         return certificates
@@ -85,13 +87,10 @@ object CertUtil {
             false
         else {
             val cert = certificates[0]
-            if (cert != null) {
-                if (cert.subjectDN != null) {
-                    val DN = cert.subjectDN.name.toUpperCase(Locale.getDefault())
-                    DN.contains(FDROID) || DN.contains(GUARDIAN)
-                } else {
-                    false
-                }
+
+            if (cert.subjectDN != null) {
+                val DN = cert.subjectDN.name.toUpperCase(Locale.getDefault())
+                DN.contains(FDROID) || DN.contains(GUARDIAN)
             } else {
                 false
             }
diff --git a/app/src/main/java/com/aurora/store/util/PackageUtil.kt b/app/src/main/java/com/aurora/store/util/PackageUtil.kt
index 9e8f3c818..59c432381 100644
--- a/app/src/main/java/com/aurora/store/util/PackageUtil.kt
+++ b/app/src/main/java/com/aurora/store/util/PackageUtil.kt
@@ -124,7 +124,7 @@ object PackageUtil {
             }
 
         if (isFdroidFilterEnabled) {
-            packageInfoList
+            packageInfoList = packageInfoList
                 .filter {
                     val packageInstaller = packageManager.getInstallerPackageName(it.packageName)
                     packageInstaller != "org.fdroid.fdroid.privileged"