Merge pull request #100 from figonzal1/dev

fix: cleartext traffic, share cache errors and Sonar/Kover coverage

Author: figonzal1

CLAUDE.md

@@ -44,6 +44,9 @@ bundle exec fastlane unit_test      # unit tests
 bundle exec fastlane ui_test        # instrumentation tests (DevDebug)
 bundle exec fastlane release        # build the prodRelease AAB (used for every track)
 bundle exec fastlane beta_googleplay # upload that AAB to the beta track
+
+# SonarQube (local self-hosted server on :9000):
+./gradlew koverXmlReportDevDebug sonar   # coverage (Kover) + analysis
 ```
 
 ## Gotchas
@@ -67,6 +70,13 @@ bundle exec fastlane beta_googleplay # upload that AAB to the beta track
   not from the flavor. `devDebug` is `cl.figonzal.lastquakechile.debug` and both package names are
   registered in `app/google-services.json` — moving that suffix onto the `dev` flavor would leave
   `prodDebug` holding the production applicationId.
+- SonarQube runs **locally only**, never in CI. `sonar.host.url` lives in
+  `~/.gradle/gradle.properties` and the token in the `SONAR_TOKEN` env var — never in the repo.
+  Coverage comes from **Kover** (`koverXmlReportDevDebug` →
+  `app/build/reports/kover/report-devDebug.xml`), not AGP's JaCoCo: on AGP 9 the
+  `createDevDebugUnitTestCoverageReport` task only emits HTML and Sonar needs XML.
+- The `org.sonarqube` plugin must be **>= 7.4**; 7.3.0.8198 blows up on AGP 9.2 — its
+  `sonarResolver` task reads the `res` directories before `generateDevDebugResValues` runs.
 - Dependencies live in `gradle/libs.versions.toml`; `app/build.gradle.kts` only references
   `libs.*` aliases. Never add a raw coordinate to the build file.
 - Instrumentation tests run through `InstrumentationTestRunner` + `TestApplication`, with Koin

app/build.gradle.kts

@@ -15,6 +15,8 @@ plugins {
     alias(libs.plugins.com.google.firebase.firebase.perf)
 
     alias(libs.plugins.com.google.android.libraries.mapsplatform.secrets.gradle.plugin)
+
+    alias(libs.plugins.org.jetbrains.kotlinx.kover)
 }
 
 secrets {
@@ -213,12 +215,24 @@ ksp {
     arg("room.schemaLocation", "$projectDir/schemas")
 }
 
-sonarqube {
+kover {
+    reports {
+        filters { excludes { androidGeneratedClasses() } }
+        variant("devDebug") {
+            xml { xmlFile = layout.buildDirectory.file("reports/kover/report-devDebug.xml") }
+        }
+    }
+}
+
+sonar {
     properties {
-        property("sonar.projectName", "LastQuakeChile")
         property("sonar.projectKey", "LastQuakeChile")
-        property("sonar.test.inclusions", "**/*Test*/**")
+        property("sonar.projectName", "LastQuakeChile")
+        property("sonar.projectVersion", appVersionName)
         property("sonar.sourceEncoding", "UTF-8")
-        property("sonar.sources", "src/main/java")
+        property(
+            "sonar.coverage.jacoco.xmlReportPaths",
+            layout.buildDirectory.file("reports/kover/report-devDebug.xml").get().asFile.path
+        )
     }
 }

app/src/main/AndroidManifest.xml

@@ -26,6 +26,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.Starting"
+        android:usesCleartextTraffic="false"
         tools:targetApi="n">
 
         <uses-library
@@ -103,10 +104,10 @@
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_provider" />
-        </provider> <!-- TODO: Habilitar para produccion -->
+        </provider>
         <meta-data
             android:name="firebase_performance_collection_enabled"
-            android:value="true" /> <!-- TODO: Habilitar para produccion -->
+            android:value="true" />
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
             android:value="true" />

app/src/main/java/cl/figonzal/lastquakechile/core/ui/MainActivity.kt

@@ -12,6 +12,7 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.doOnLayout
 import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
 import cl.figonzal.lastquakechile.R
 import cl.figonzal.lastquakechile.core.services.UpdaterService
@@ -30,8 +31,6 @@ import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
 import com.google.android.material.tabs.TabLayoutMediator
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.inject
@@ -84,16 +83,9 @@ class MainActivity : AppCompatActivity() {
         initLifecycleObservers()
 
         checkEULAConsentAds {
-
-            val adsScope = CoroutineScope(ioDispatcher)
-            adsScope.launch {
-
-                MobileAds.initialize(this@MainActivity)
-
-                withContext(Dispatchers.Main) {
-                    //Ads
-                    adView = startAds(binding.adViewContainer)
-                }
+            lifecycleScope.launch {
+                withContext(ioDispatcher) { MobileAds.initialize(this@MainActivity) }
+                adView = startAds(binding.adViewContainer)
             }
         }
 

app/src/main/java/cl/figonzal/lastquakechile/core/utils/BitmapExt.kt

@@ -8,6 +8,7 @@ import android.graphics.Color
 import android.net.Uri
 import android.view.View
 import androidx.core.content.FileProvider
+import timber.log.Timber
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -54,7 +55,9 @@ fun View.renderToBitmap(widthPx: Int): Bitmap {
  * a single share can now produce several images (one per [StickerDesign]) that must coexist.
  */
 fun Context.clearShareImageCache() {
-    shareCacheDir.listFiles()?.forEach { it.delete() }
+    shareCacheDir.listFiles()?.forEach {
+        if (!it.delete()) Timber.w("Could not delete cached share image %s", it.name)
+    }
 }
 
 /**

app/src/main/java/cl/figonzal/lastquakechile/core/utils/ShareExt.kt

@@ -15,6 +15,7 @@ import cl.figonzal.lastquakechile.quake_feature.domain.model.Quake
 internal const val INSTAGRAM_PACKAGE = "com.instagram.android"
 private const val INSTAGRAM_STORY_ACTION = "com.instagram.share.ADD_TO_STORY"
 internal const val WHATSAPP_PACKAGE = "com.whatsapp"
+private const val MIME_IMAGE = "image/*"
 
 fun Context.buildShareText(quake: Quake): String = String.format(
     """
@@ -47,13 +48,13 @@ fun Context.buildShareText(quake: Quake): String = String.format(
  */
 private fun instagramStoryIntent(imageUri: Uri?): Intent = Intent(INSTAGRAM_STORY_ACTION).apply {
     setPackage(INSTAGRAM_PACKAGE)
-    type = "image/*"
+    type = MIME_IMAGE
     imageUri?.let { putExtra("interactive_asset_uri", it) }
     addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
 }
 
 private fun whatsAppSendIntent(): Intent =
-    Intent(Intent.ACTION_SEND).setPackage(WHATSAPP_PACKAGE).setType("image/*")
+    Intent(Intent.ACTION_SEND).setPackage(WHATSAPP_PACKAGE).setType(MIME_IMAGE)
 
 fun Context.isInstagramStoriesAvailable(): Boolean =
     resolveActivityOrNull(instagramStoryIntent(null)) != null
@@ -117,25 +118,24 @@ fun Context.shareQuakeGeneric(quake: Quake, imageUri: Uri?) {
         action = Intent.ACTION_SEND
         putExtra(Intent.EXTRA_TEXT, buildShareText(quake))
         putExtra(Intent.EXTRA_STREAM, imageUri)
-        type = "image/*"
+        type = MIME_IMAGE
 
         val chooser = Intent.createChooser(this, getString(R.string.intent_chooser))
 
-        val resInfoList = when {
+        val targetPackages = when {
             Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> packageManager.queryIntentActivities(
                 chooser,
                 ResolveInfoFlags.of(MATCH_DEFAULT_ONLY.toLong())
             )
 
             else -> packageManager.queryIntentActivities(chooser, MATCH_DEFAULT_ONLY)
-        }
+        }.map { it.activityInfo.packageName }
 
-        for (resolveInfo in resInfoList) {
-            val packageName = resolveInfo.activityInfo.packageName
-            imageUri?.let {
+        imageUri?.let { uri ->
+            targetPackages.forEach { packageName ->
                 grantUriPermission(
                     packageName,
-                    it,
+                    uri,
                     Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION
                 )
             }

app/src/main/java/cl/figonzal/lastquakechile/core/utils/views/ViewsExt.kt

@@ -13,14 +13,14 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.view.ViewTreeObserver
 import android.widget.AbsListView
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.annotation.MenuRes
 import androidx.core.view.MenuHost
 import androidx.core.view.MenuProvider
+import androidx.core.view.doOnNextLayout
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -472,16 +472,7 @@ fun RecyclerView.addPaginationListener(
 fun ViewGroup.getViewBottomHeight(
     targetViewId: Int,
     behavior: BottomSheetBehavior<MaterialCardView>?
-) {
-
-    val callback = object : ViewTreeObserver.OnGlobalLayoutListener {
-        override fun onGlobalLayout() {
-            viewTreeObserver.removeOnGlobalLayoutListener(this)
-            behavior?.peekHeight =
-                findViewById<View>(targetViewId).bottom + 20f.toDips(resources).toInt()
-        }
-    }
-
-    viewTreeObserver.addOnGlobalLayoutListener(callback)
+) = doOnNextLayout {
+    behavior?.peekHeight = findViewById<View>(targetViewId).bottom + 20f.toDips(resources).toInt()
 }
 

app/src/main/java/cl/figonzal/lastquakechile/quake_feature/ui/QuakeDetailsActivity.kt

@@ -59,11 +59,12 @@ import com.google.android.gms.maps.model.LatLng
 import com.google.maps.android.ktx.addCircle
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeoutOrNull
 import org.koin.android.ext.android.inject
+import org.koin.core.qualifier.named
 import timber.log.Timber
 import java.util.Locale
 
@@ -121,6 +122,7 @@ class QuakeDetailsActivity : AppCompatActivity(), OnMapReadyCallback {
     private var isSnapshotRequest: Boolean? = null
 
     private val quakeStoryRenderer: QuakeStoryRenderer by inject()
+    private val ioDispatcher: CoroutineDispatcher by inject(named("ioDispatcher"))
 
     private lateinit var binding: ActivityQuakeDetailsBinding
 
@@ -178,11 +180,9 @@ class QuakeDetailsActivity : AppCompatActivity(), OnMapReadyCallback {
     }
 
     private fun refreshAd() {
-        lifecycleScope.launch(Dispatchers.IO) {
-            MobileAds.initialize(this@QuakeDetailsActivity)
-            withContext(Dispatchers.Main) {
-                loadNativeAd()
-            }
+        lifecycleScope.launch {
+            withContext(ioDispatcher) { MobileAds.initialize(this@QuakeDetailsActivity) }
+            loadNativeAd()
         }
     }
 
@@ -386,36 +386,36 @@ class QuakeDetailsActivity : AppCompatActivity(), OnMapReadyCallback {
 
     /**
      * Renders all [StickerDesign] variants (map snapshot may be null if it couldn't be
-     * captured) and opens [ShareQuakeBottomSheet] with them. Rendering happens off the main
-     * thread: the sticker views are never attached to a window, so it's safe to
-     * measure/layout/draw them from any thread, and PNG compression to the cache dir is I/O.
-     * Designs are rendered sequentially and each bitmap is recycled right after it's cached -
-     * doing all three at once would keep ~18 MB of bitmaps alive simultaneously.
+     * captured) and opens [ShareQuakeBottomSheet] with them. Rendering happens on [ioDispatcher]:
+     * the sticker views are never attached to a window, so it's safe to measure/layout/draw them
+     * off the main thread, and PNG compression to the cache dir is I/O. Designs are rendered
+     * sequentially and each bitmap is recycled right after it's cached - doing all three at once
+     * would keep ~18 MB of bitmaps alive simultaneously.
      */
     private fun shareQuake(quake: Quake) {
         captureMapSnapshot { mapSnapshot ->
-            lifecycleScope.launch(Dispatchers.Default) {
+            lifecycleScope.launch {
                 try {
-                    clearShareImageCache()
-
-                    val stickerUris = StickerDesign.entries.map { design ->
-                        val sticker = quakeStoryRenderer.renderSticker(quake, mapSnapshot, design)
-                        cacheImageUri(sticker, "sticker-${quake.quakeCode}-${design.name}", Bitmap.CompressFormat.PNG)
-                            .also { sticker.recycle() }
+                    val stickerUris = withContext(ioDispatcher) {
+                        clearShareImageCache()
+
+                        StickerDesign.entries.map { design ->
+                            val sticker = quakeStoryRenderer.renderSticker(quake, mapSnapshot, design)
+                            cacheImageUri(sticker, "sticker-${quake.quakeCode}-${design.name}", Bitmap.CompressFormat.PNG)
+                                .also { sticker.recycle() }
+                        }
                     }
-                    val magnitudeColor = quakeStoryRenderer.magnitudeColor(quake)
 
-                    withContext(Dispatchers.Main) {
-                        if (supportFragmentManager.isStateSaved) return@withContext
+                    if (supportFragmentManager.isStateSaved) return@launch
 
-                        ShareQuakeBottomSheet.newInstance(quake, stickerUris, magnitudeColor)
-                            .show(supportFragmentManager, ShareQuakeBottomSheet.TAG)
-                    }
+                    ShareQuakeBottomSheet
+                        .newInstance(quake, stickerUris, quakeStoryRenderer.magnitudeColor(quake))
+                        .show(supportFragmentManager, ShareQuakeBottomSheet.TAG)
                 } catch (e: CancellationException) {
                     throw e
                 } catch (e: Exception) {
                     Timber.e(e, "Share image generation failed")
-                    withContext(Dispatchers.Main) { toast(R.string.SHARE_ERROR) }
+                    toast(R.string.SHARE_ERROR)
                 }
             }
         }

app/src/main/res/xml/file_provider.xml

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths>
-    <!-- See table below.  The external-files-path DOES NOT require external storage permissions. -->
     <cache-path
         name="images"
         path="share/" />
-
-    <!--Uncomment below to share the entire application specific directory -->
-    <!--<external-path name="all_dirs" path="."/>-->
-</paths>
+</paths>

app/src/main/res/xml/network_security_config.xml

@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <!-- TODO: false en produccion, true con appodeal -->
     <base-config cleartextTrafficPermitted="false">
         <trust-anchors>
             <certificates src="system" />
         </trust-anchors>
     </base-config>
-
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">127.0.0.1</domain>
-    </domain-config>
-
-</network-security-config>
+</network-security-config>