Merge pull request #2822 from hussainmohd-a/dev-v055y

v055y

Author: hussainmohd-a

app/build.gradle

@@ -19,6 +19,11 @@ def isFdroidBuildServer = fdroidBuildServer != null && !fdroidBuildServer.isEmpt
 def deGoogled = !apkBuild || fdroidBuild || isFdroidBuildServer
 def shouldSplit = !alphaBuild
 
+// Pass -PwebsiteDegoogled=true when building the fdroid flavor with our own keys.
+// Official F-Droid builds omit this flag and will be labeled as "fdroid".
+def isWebsiteDegoogled = project.hasProperty("websiteDegoogled") &&
+        project.property("websiteDegoogled").toString().toBoolean()
+
 println("app-task names: '$taskNames'")
 println("gradle deGoogled? $deGoogled (fdroidBuild: $fdroidBuild, fdroidBuildServer: $isFdroidBuildServer, apkBuild: $apkBuild)")
 println("gradle alphaBuild? $alphaBuild, should split? $shouldSplit")
@@ -61,6 +66,8 @@ def getVersionCode = {
     return code
 }
 
+def appVersionCode = getVersionCode()
+
 try {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 } catch (Exception ex) {
@@ -88,6 +95,8 @@ android {
         minSdkVersion(23)
         targetSdkVersion 35
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        // Defaults to false; the fdroid flavor overrides it via -PwebsiteDegoogled=true.
+        buildConfigField "boolean", "IS_WEBSITE_DEGOOGLD_BUILD", "false"
     }
 
     signingConfigs {
@@ -266,6 +275,8 @@ android {
         }
         fdroid {
             dimension "releaseChannel"
+            // true only when built with -PwebsiteDegoogled=true (our own keys).
+            buildConfigField "boolean", "IS_WEBSITE_DEGOOGLD_BUILD", String.valueOf(isWebsiteDegoogled)
         }
         website {
             dimension "releaseChannel"
@@ -277,6 +288,9 @@ android {
             // for build type alpha, versionCode is set in env overriding gradle.properties
             versionCode = getVersionCode()
             versionName = gitVersion
+            // add base version code to the build config, so that if there is override of
+            // version numbers by some builds (because of split apks)
+            buildConfigField "int", "BASE_VERSION_CODE", String.valueOf(appVersionCode)
             vectorDrawables.useSupportLibrary = true
         }
     }
@@ -383,9 +397,7 @@ dependencies {
 
     // add ":debug" suffix to the dependency to include debug symbols
     download firestackDependency()
-    websiteImplementation firestackDependency()
-    fdroidImplementation firestackDependency()
-    playImplementation firestackDependency()
+    implementation firestackDependency()
 
     // Work manager
     implementation('androidx.work:work-runtime-ktx:2.11.2') {

app/src/full/java/com/celzero/bravedns/adapter/AppWiseDomainsAdapter.kt

@@ -16,21 +16,32 @@
 package com.celzero.bravedns.adapter
 
 import Logger
+import Logger.LOG_TAG_DNS
 import Logger.LOG_TAG_UI
 import android.content.Context
+import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.LifecycleOwner
 import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.RequestBuilder
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
+import com.bumptech.glide.request.target.CustomViewTarget
+import com.bumptech.glide.request.transition.DrawableCrossFadeFactory
+import com.bumptech.glide.request.transition.Transition
 import com.celzero.bravedns.R
 import com.celzero.bravedns.data.AppConnection
 import com.celzero.bravedns.databinding.ListItemAppDomainDetailsBinding
+import com.celzero.bravedns.glide.FavIconDownloader
 import com.celzero.bravedns.service.DomainRulesManager
 import com.celzero.bravedns.service.VpnController
 import com.celzero.bravedns.ui.bottomsheet.AppDomainRulesBottomSheet
@@ -137,14 +148,16 @@ class AppWiseDomainsAdapter(
                 } else {
                     b.acdIpAddress.text = conn.appOrDnsName
                 }
-                b.acdFlag.visibility = View.VISIBLE
-                b.acdFlag.text = conn.flag
+                //b.acdFlag.visibility = View.VISIBLE
+                //b.acdFlag.text = conn.flag
+                showFlagOrIcon(conn.appOrDnsName, conn.flag)
                 return
             }
 
             b.acdCount.text = conn.count.toString()
             b.acdDomain.text = conn.appOrDnsName
-            b.acdFlag.text = conn.flag
+            //b.acdFlag.text = conn.flag
+            showFlagOrIcon(conn.appOrDnsName, conn.flag)
             if (conn.ipAddress.isNotEmpty()) {
                 b.acdIpAddress.visibility = View.VISIBLE
                 b.acdIpAddress.text = beautifyIpString(conn.ipAddress)
@@ -154,6 +167,139 @@ class AppWiseDomainsAdapter(
             updateStatusUi(conn)
         }
 
+        private fun showFlagOrIcon(query: String?, flag: String? = null) {
+            b.acdFlag.text = flag
+            if (query == null) {
+                hideFavIcon()
+                showFlag()
+                return
+            }
+            val query = query.dropLastWhile { it == ',' }
+
+            // no need to check in glide cache if the value is available in failed
+            // cache
+            if (FavIconDownloader.isUrlAvailableInFailedCache(query) != null) {
+                hideFavIcon()
+                showFlag()
+            } else {
+                // Glide will cache the icons against the urls. To extract the fav
+                // icon from the cache, first verify that the cache is available with
+                // the next dns url. If it is not available then glide will throw an
+                // error, do the duckduckgo url check in that case.
+                displayNextDnsFavIcon(query)
+            }
+        }
+
+        private fun displayNextDnsFavIcon(query: String) {
+            // url to check if the icon is cached from nextdns
+            val nextDnsUrl = FavIconDownloader.constructFavIcoUrlNextDns(query)
+            // url to check if the icon is cached from duckduckgo
+            val duckDuckGoUrl = FavIconDownloader.constructFavUrlDuckDuckGo(query)
+            // subdomain to check if the icon is cached from duckduckgo
+            val duckduckgoDomainURL = FavIconDownloader.getDomainUrlFromFdqnDuckduckgo(query)
+            try {
+                val factory = DrawableCrossFadeFactory.Builder().setCrossFadeEnabled(true).build()
+                var request = Glide.with(context.applicationContext)
+                    .load(nextDnsUrl)
+                    .onlyRetrieveFromCache(true)
+                    .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
+                    .transition(DrawableTransitionOptions.withCrossFade(factory))
+
+                val errorRequest = displayDuckduckgoFavIcon(duckDuckGoUrl, duckduckgoDomainURL)
+                if (errorRequest != null) {
+                    request = request.error(errorRequest)
+                }
+
+                request.into(
+                    object : CustomViewTarget<ImageView, Drawable>(b.acdIcon) {
+                        override fun onLoadFailed(errorDrawable: Drawable?) {
+                            showFlag()
+                            hideFavIcon()
+                        }
+
+                        override fun onResourceReady(
+                            resource: Drawable,
+                            transition: Transition<in Drawable>?
+                        ) {
+                            hideFlag()
+                            showFavIcon(resource)
+                        }
+
+                        override fun onResourceCleared(placeholder: Drawable?) {
+                            hideFavIcon()
+                            showFlag()
+                        }
+                    }
+                )
+            } catch (_: Exception) {
+                Logger.d(LOG_TAG_DNS, "err loading icon, load flag instead")
+                displayDuckduckgoFavIcon(duckDuckGoUrl, duckduckgoDomainURL)?.into(
+                    object : CustomViewTarget<ImageView, Drawable>(b.acdIcon) {
+                        override fun onLoadFailed(errorDrawable: Drawable?) {
+                            showFlag()
+                            hideFavIcon()
+                        }
+
+                        override fun onResourceReady(
+                            resource: Drawable,
+                            transition: Transition<in Drawable>?
+                        ) {
+                            hideFlag()
+                            showFavIcon(resource)
+                        }
+
+                        override fun onResourceCleared(placeholder: Drawable?) {
+                            hideFavIcon()
+                            showFlag()
+                        }
+                    }
+                )
+            }
+        }
+
+        /**
+         * Loads the fav icons from the cache, the icons are cached by favIconDownloader. On
+         * failure, will check if there is a icon for top level domain is available in cache. Else,
+         * will show the Flag.
+         *
+         * This method will be executed only when show fav icon setting is turned on.
+         */
+        private fun displayDuckduckgoFavIcon(url: String, subDomainURL: String): RequestBuilder<Drawable>? {
+            return try {
+                val factory = DrawableCrossFadeFactory.Builder().setCrossFadeEnabled(true).build()
+                Glide.with(context.applicationContext)
+                    .load(url)
+                    .onlyRetrieveFromCache(true)
+                    .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
+                    .error(
+                        Glide.with(context.applicationContext)
+                            .load(subDomainURL)
+                            .onlyRetrieveFromCache(true)
+                    )
+                    .transition(DrawableTransitionOptions.withCrossFade(factory))
+            } catch (e: Exception) {
+                null
+            }
+        }
+
+        private fun showFavIcon(drawable: Drawable) {
+            b.acdIcon.visibility = View.VISIBLE
+            b.acdIcon.setImageDrawable(drawable)
+        }
+
+        private fun hideFavIcon() {
+            b.acdIcon.visibility = View.GONE
+            b.acdIcon.setImageDrawable(null)
+        }
+
+        private fun showFlag() {
+            b.acdFlag.visibility = View.VISIBLE
+        }
+
+        private fun hideFlag() {
+            b.acdFlag.visibility = View.GONE
+        }
+
         private fun setupClickListeners(conn: AppConnection) {
             b.acdContainer.setOnClickListener {
                 if (isActiveConn) {