Target Android 15 (SDK 35)

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

@@ -2023,7 +2023,7 @@ class BrowserTabFragment :
 
     private fun launchDialogForIntent(
         context: Context,
-        pm: PackageManager?,
+        pm: PackageManager,
         intent: Intent,
         activities: List<ResolveInfo>,
         useFirstActivityFound: Boolean,
@@ -2487,7 +2487,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()
@@ -2872,13 +2871,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

@@ -71,7 +71,7 @@ dependencies {
     implementation AndroidX.room.ktx
     implementation AndroidX.biometric
 
-    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

@@ -24,7 +24,7 @@ import com.duckduckgo.securestorage.store.db.SecureStorageDatabase
 import com.squareup.anvil.annotations.ContributesBinding
 import dagger.SingleInstanceIn
 import javax.inject.Inject
-import net.sqlcipher.database.SupportFactory
+import net.zetetic.database.sqlcipher.SupportOpenHelperFactory
 
 interface SecureStorageDatabaseFactory {
     fun getDatabase(): SecureStorageDatabase?
@@ -52,7 +52,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

build.gradle

@@ -5,8 +5,8 @@ buildscript {
 
     ext {
         min_sdk = 26
-        target_sdk = 34
-        compile_sdk = 34
+        target_sdk = 35
+        compile_sdk = 35
 
         // Calculate lint_version (must always be gradle_plugin + 23)
         def gradle_plugin_version = versionFor(project, Android.tools.build.gradlePlugin)

common/common-ui/src/main/res/values-v35/design-system-theming.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2024 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+
+    <style name="Platform.Theme.DuckDuckGo" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="android:windowLightStatusBar">?attr/preferDarkStatusBarIcons</item>
+        <item name="android:windowLightNavigationBar">?attr/preferDarkNavigationBarIcons</item>
+        <item name="android:statusBarColor">?attr/preferredStatusBarColor</item>
+        <item name="android:navigationBarColor">?attr/preferredNavigationBarColor</item>
+        <item name="preferDarkNavigationBarIcons">false</item>
+        <item name="preferredNavigationBarColor">?attr/daxColorBlack</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
+
+</resources>

subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/ui/SubscriptionsWebViewActivity.kt

@@ -246,7 +246,6 @@ class SubscriptionsWebViewActivity : DuckDuckGoActivity(), DownloadConfirmationD
                 displayZoomControls = false
                 mixedContentMode = WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE
                 setSupportMultipleWindows(false)
-                databaseEnabled = false
                 setSupportZoom(true)
             }
             it.setDownloadListener { url, _, contentDisposition, mimeType, _ ->

verified-installation/verified-installation-impl/src/main/java/com/duckduckgo/verifiedinstallation/certificate/SigningCertificateHashExtractor.kt

@@ -69,11 +69,11 @@ class SigningCertificateHashExtractorImpl @Inject constructor(
             return null
         }
 
-        if (info.signingInfo.signingCertificateHistory.size != 1) {
+        if (info.signingInfo!!.signingCertificateHistory.size != 1) {
             return null
         }
 
-        return info.signingInfo.signingCertificateHistory?.lastOrNull()?.sha256()
+        return info.signingInfo!!.signingCertificateHistory?.lastOrNull()?.sha256()
     }
 
     private fun Signature.sha256(): String {

versions.properties

@@ -121,9 +121,9 @@ version.mockito=5.13.0
 
 version.moshi=1.8.0
 
-version.okhttp3=4.12.0
+version.net.zetetic..sqlcipher-android=4.6.1
 
-version.net.zetetic..android-database-sqlcipher=4.5.4
+version.okhttp3=4.12.0
 
  version.okio=3.9.0
 
@@ -143,7 +143,7 @@ version.com.jakewharton.retrofit..retrofit2-kotlin-coroutines-adapter=0.9.2
 
 version.androidx.viewpager2=1.1.0
 
-version.robolectric=4.13
+version.robolectric=4.14
 
 version.com.facebook.shimmer..shimmer=0.5.0