Target Android 15 (SDK 35) (#5204)

Task/Issue URL:
https://app.asana.com/0/1207908166761516/1206705314358009/f

### Description

Targets Android SDK 35 and makes the required changes to be compatible.
See the Asana task for full details.

A key part was adding native library alignment checks and updated
dependencies to support 16KB page size alignment.

End to End test run:
https://github.com/duckduckgo/Android/actions/runs/16137443827/job/45536745475

Key changes include:

- Updated target SDK to v35
- Added script to verify ELF alignment in native libraries
- Updated SQLCipher to use newer version with proper alignment
- Added alignment flags to CMake configurations
- Removed deprecated WebSQL database settings
- Updated Conscrypt, NetGuard, and sync-crypto dependencies

### Steps to test this PR

- [ ] Run the app and verify no crashes related to native libraries
- [ ] Test autofill functionality with updated SQLCipher
- [ ] Verify VPN and network protection features work correctly
- [ ] Test web browsing functionality
- [ ] Check it runs on different Android versions to ensure
compatibility (SDK 26-35)
- [ ] Test AppTp functionality 
- [ ] Test sync funcationality

### UI changes

N/A

---
- To see the specific tasks where the Asana app for GitHub is being
used, see below:
  - https://app.asana.com/0/0/1209856558112240

---------

Co-authored-by: Aitor Viana <[email protected]>
Co-authored-by: Craig Russell <[email protected]>

Author: 3 people

.github/workflows/ci.yml

@@ -149,24 +149,55 @@ jobs:
       - name: Build
         run: ./gradlew androidTestsBuild
 
+      - name: Find test APK path
+        id: find-apk
+        run: |
+          TEST_APK_PATH=$(find . -path '*/build/outputs/apk/play/debug/*.apk' -type f -print -quit)
+          echo "Found test APK at: $TEST_APK_PATH"
+          echo "apk_path=$TEST_APK_PATH" >> "$GITHUB_OUTPUT"
+
+      - name: Make script executable
+        run: chmod +x scripts/check_elf_alignment.sh
+
+      - name: Check native libraries alignment
+        id: check-alignment
+        continue-on-error: true
+        run: ./scripts/check_elf_alignment.sh ${{ steps.find-apk.outputs.apk_path }}
+
+      - name: Handle native alignment failure
+        if: steps.check-alignment.outcome == 'failure'
+        run: |
+          echo "::error::Native library alignment check failed!"
+          echo "::error::Please check the native libraries in your APK for correct page size alignment."
+          exit 1
+
       - name: Run Android Tests
+        if: steps.check-alignment.outcome == 'success'
         run: ./gradlew runFlankAndroidTests
 
       - name: Bundle the Android CI tests report
-        if: always()
+        if: |
+          always() &&
+          steps.check-alignment.outcome == 'success'
         run: find . -type d -name 'fladleResults' | zip -@ -r android-tests-report.zip
 
       - name: Generate json file with failures
-        if: ${{ failure() }}
+        if: |
+          failure() &&
+          steps.check-alignment.outcome == 'success'
         run: cat build/fladle/fladleResults/HtmlErrorReport.html | cut -d\`  -f2 >> results.json
 
       - name: Print failure report
-        if: ${{ failure() }}
+        if: |
+          failure() &&
+          steps.check-alignment.outcome == 'success'
         run: |
           jq -r '.[] | .label as $id | .items[] | "Test:", $id, "Failure:", .label, "URL:", .url, "\n"' results.json
 
       - name: Upload the Android CI tests report
-        if: always()
+        if: |
+          always() &&
+          steps.check-alignment.outcome == 'success'
         uses: actions/upload-artifact@v4
         with:
           name: android-tests-report

anrs/anrs-impl/CMakeLists.txt

@@ -26,4 +26,10 @@ target_link_libraries(
 
        # Links the target library to the log library
        # included in the NDK.
-       ${log-lib} )
+       ${log-lib} )
+
+target_link_options(
+       crash-ndk
+       PRIVATE
+       "-Wl,-z,common-page-size=16384"
+       "-Wl,-z,max-page-size=16384")

anrs/anrs-impl/src/main/java/com/duckduckgo/app/anr/ndk/NativeCrashInit.kt

@@ -95,7 +95,7 @@ class NativeCrashInit @Inject constructor(
         }
     }
 
-    override fun failure(t: Throwable?) {
+    override fun failure(t: Throwable) {
         logcat(ERROR) { "ndk-crash: error loading library in process $processName: ${t?.asLog()}" }
     }
 

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/heartbeat/VpnServiceHeartbeat.kt

@@ -16,7 +16,6 @@
 
 package com.duckduckgo.mobile.android.vpn.heartbeat
 
-import android.content.Context
 import android.os.Process
 import com.duckduckgo.common.utils.ConflatedJob
 import com.duckduckgo.common.utils.DispatcherProvider
@@ -42,7 +41,6 @@ import logcat.logcat
 )
 @SingleInstanceIn(VpnScope::class)
 class VpnServiceHeartbeat @Inject constructor(
-    private val context: Context,
     private val vpnDatabase: VpnDatabase,
     private val dispatcherProvider: DispatcherProvider,
 ) : VpnServiceCallbacks {

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

@@ -2452,7 +2452,7 @@ class BrowserTabFragment :
 
     private fun launchDialogForIntent(
         context: Context,
-        pm: PackageManager?,
+        pm: PackageManager,
         intent: Intent,
         activities: List<ResolveInfo>,
         useFirstActivityFound: Boolean,
@@ -2942,7 +2942,6 @@ class BrowserTabFragment :
                 mixedContentMode = WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE
                 javaScriptCanOpenWindowsAutomatically = appBuildConfig.isTest // only allow when running tests
                 setSupportMultipleWindows(true)
-                disableWebSql(this)
                 setSupportZoom(true)
                 if (accessibilitySettingsDataStore.overrideSystemFontSize) {
                     textZoom = accessibilitySettingsDataStore.fontSize.toInt()
@@ -3347,13 +3346,6 @@ class BrowserTabFragment :
         binding.swipeRefreshContainer.progressViewStartOffset -= 15
     }
 
-    /**
-     * Explicitly disable database to try protect against Magellan WebSQL/SQLite vulnerability
-     */
-    private fun disableWebSql(settings: WebSettings) {
-        settings.databaseEnabled = false
-    }
-
     @Suppress("NewApi") // This API and the behaviour described only apply to apps with targetSdkVersion ≥ TIRAMISU.
     private fun setAlgorithmicDarkeningAllowed(settings: WebSettings) {
         // https://developer.android.com/reference/androidx/webkit/WebSettingsCompat#setAlgorithmicDarkeningAllowed(android.webkit.WebSettings,boolean)

app/src/main/java/com/duckduckgo/app/browser/urlextraction/UrlExtractingWebView.kt

@@ -40,7 +40,6 @@ class UrlExtractingWebView(
             javaScriptEnabled = true
             domStorageEnabled = true
             mixedContentMode = WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE
-            disableWebSql(this)
             loadsImagesAutomatically = false
         }
         setWebViewClient(webViewClient)
@@ -54,13 +53,6 @@ class UrlExtractingWebView(
         }
     }
 
-    /**
-     * Explicitly disable database to try protect against Magellan WebSQL/SQLite vulnerability
-     */
-    private fun disableWebSql(settings: WebSettings) {
-        settings.databaseEnabled = false
-    }
-
     override fun loadUrl(url: String) {
         initialUrl = url
         super.loadUrl(url)

app/src/main/java/com/duckduckgo/app/global/view/ViewChildrenSequences.kt

@@ -67,7 +67,7 @@ private class ViewChildrenRecursiveSequence(private val view: View) : Sequence<V
 
     private class RecursiveViewIterator(view: View) : Iterator<View> {
         private val sequences = arrayListOf(view.childrenSequence())
-        private var current = sequences.removeLast().iterator()
+        private var current = sequences.removeLastElement().iterator()
 
         override fun next(): View {
             if (!hasNext()) throw NoSuchElementException()
@@ -80,13 +80,13 @@ private class ViewChildrenRecursiveSequence(private val view: View) : Sequence<V
 
         override fun hasNext(): Boolean {
             if (!current.hasNext() && sequences.isNotEmpty()) {
-                current = sequences.removeLast().iterator()
+                current = sequences.removeLastElement().iterator()
             }
             return current.hasNext()
         }
 
         @Suppress("NOTHING_TO_INLINE")
-        private inline fun <T : Any> MutableList<T>.removeLast(): T {
+        private inline fun <T : Any> MutableList<T>.removeLastElement(): T {
             if (isEmpty()) throw NoSuchElementException()
             return removeAt(size - 1)
         }

app/src/test/java/com/duckduckgo/app/bookmarks/model/SyncSavedSitesRepositoryTest.kt

@@ -213,7 +213,7 @@ class SyncSavedSitesRepositoryTest {
         savedSitesRelationsDao.insertList(relation)
 
         val removedEntities = entities.toMutableList()
-        val removedEntity = removedEntities.removeFirst()
+        val removedEntity = removedEntities.removeAt(0)
 
         val removedEntitiesIds = removedEntities.map { it.entityId }
         val childrenJSON = stringListAdapter.toJson(removedEntitiesIds)
@@ -320,7 +320,7 @@ class SyncSavedSitesRepositoryTest {
         savedSitesRelationsDao.insertList(folderRelation)
 
         val updatedChildren = bookmarks.toMutableList()
-        val removedChildren = updatedChildren.removeFirst()
+        val removedChildren = updatedChildren.removeAt(0)
 
         repository.replaceBookmarkFolder(folder, updatedChildren.map { it.entityId })
 

autofill/autofill-impl/build.gradle

@@ -46,6 +46,7 @@ dependencies {
     implementation project(':data-store-api')
     testImplementation project(':feature-toggles-test')
     implementation project(path: ':settings-api') // temporary until we release new settings
+    implementation project(':library-loader-api')
 
     anvil project(path: ':anvil-compiler')
     implementation project(path: ':anvil-annotations')
@@ -80,7 +81,7 @@ dependencies {
     ksp AndroidX.room.compiler
     implementation AndroidX.room.ktx
 
-    implementation "net.zetetic:android-database-sqlcipher:_"
+    implementation "net.zetetic:sqlcipher-android:_"
     implementation "com.facebook.shimmer:shimmer:_"
 
     // Testing dependencies

autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/securestorage/SecureStorageDatabaseFactory.kt

@@ -22,20 +22,27 @@ import com.duckduckgo.autofill.api.AutofillFeature
 import com.duckduckgo.autofill.store.db.ALL_MIGRATIONS
 import com.duckduckgo.autofill.store.db.SecureStorageDatabase
 import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.library.loader.LibraryLoader
 import com.squareup.anvil.annotations.ContributesBinding
 import dagger.SingleInstanceIn
 import javax.inject.Inject
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import net.sqlcipher.database.SupportFactory
+import logcat.LogPriority.ERROR
+import logcat.asLog
+import logcat.logcat
+import net.zetetic.database.sqlcipher.SupportOpenHelperFactory
 
 interface SecureStorageDatabaseFactory {
     suspend fun getDatabase(): SecureStorageDatabase?
 }
 
 @SingleInstanceIn(AppScope::class)
-@ContributesBinding(AppScope::class)
+@ContributesBinding(
+    scope = AppScope::class,
+    boundType = SecureStorageDatabaseFactory::class,
+)
 class RealSecureStorageDatabaseFactory @Inject constructor(
     private val context: Context,
     private val keyProvider: SecureStorageKeyProvider,
@@ -45,6 +52,17 @@ class RealSecureStorageDatabaseFactory @Inject constructor(
 
     private val mutex = Mutex()
 
+    init {
+        logcat { "Loading the sqlcipher native library" }
+        try {
+            LibraryLoader.loadLibrary(context, "sqlcipher")
+            logcat { "sqlcipher native library loaded ok" }
+        } catch (t: Throwable) {
+            // error loading the library
+            logcat(ERROR) { "Error loading sqlcipher library: ${t.asLog()}" }
+        }
+    }
+
     override suspend fun getDatabase(): SecureStorageDatabase? {
         return if (autofillFeature.createAsyncPreferences().isEnabled()) {
             getAsyncDatabase()
@@ -80,7 +98,7 @@ class RealSecureStorageDatabaseFactory @Inject constructor(
                 context,
                 SecureStorageDatabase::class.java,
                 "secure_storage_database_encrypted.db",
-            ).openHelperFactory(SupportFactory(keyProvider.getl1Key()))
+            ).openHelperFactory(SupportOpenHelperFactory(keyProvider.getl1Key()))
                 .addMigrations(*ALL_MIGRATIONS)
                 .build()
             _database