Merge branch 'release/5.208.0' into main

Author: daxtheduck

anrs/anrs-internal/build.gradle

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2021 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.
+ */
+
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'com.squareup.anvil'
+    id 'com.google.devtools.ksp' version "$ksp_version"
+}
+
+apply from: "$rootProject.projectDir/gradle/android-library.gradle"
+
+dependencies {
+	implementation project(":anrs-api")
+	implementation project(":anrs-impl")
+	implementation project(":anrs-store")
+
+    anvil project(':anvil-compiler')
+    implementation project(':anvil-annotations')
+    implementation project(':di')
+    implementation project(':common-ui')
+    implementation project(':common-utils')
+    implementation project(':navigation-api')
+    implementation project(':statistics')
+    implementation project(':internal-features-api')
+    implementation project(':feature-toggles-api')
+    implementation project(":app-build-config-api") // needed for feature toggles
+    implementation project(':browser-api')
+
+    ksp AndroidX.room.compiler
+
+    implementation KotlinX.coroutines.android
+    implementation AndroidX.core.ktx
+    implementation Google.dagger
+    implementation Google.android.material
+    implementation AndroidX.constraintLayout
+    implementation AndroidX.lifecycle.runtime.ktx
+
+    // Room
+    ksp AndroidX.room.compiler
+    implementation AndroidX.room.runtime
+    implementation AndroidX.room.rxJava2
+    implementation AndroidX.room.ktx
+    testImplementation AndroidX.room.testing
+
+    implementation "com.squareup.logcat:logcat:_"
+
+    testImplementation Testing.junit4
+    testImplementation AndroidX.test.ext.junit
+    testImplementation "org.mockito.kotlin:mockito-kotlin:_"
+    testImplementation project(':common-test')
+    testImplementation project(':feature-toggles-test')
+    testImplementation CashApp.turbine
+    testImplementation Testing.robolectric
+    testImplementation(KotlinX.coroutines.test) {
+        // https://github.com/Kotlin/kotlinx.coroutines/issues/2023
+        // conflicts with mockito due to direct inclusion of byte buddy
+        exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug"
+    }
+
+    coreLibraryDesugaring Android.tools.desugarJdkLibs
+}
+
+android {
+    namespace "com.duckduckgo.app.anr.internal"
+    anvil {
+        generateDaggerFactories = true // default is false
+    }
+    lint {
+        baseline file("lint-baseline.xml")
+    }
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
+    compileOptions {
+        coreLibraryDesugaringEnabled = true
+    }
+}
+

anrs/anrs-internal/lint-baseline.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.1.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.2)" variant="all" version="8.1.2">
+
+</issues>

anrs/anrs-internal/src/main/AndroidManifest.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+
+    <application>
+        <activity
+            android:name=".feature.CrashANRsInternalSettingsActivity"
+            android:label="Crash And ANRs Dev Settings"
+            android:exported="false" />
+    </application>
+
+</manifest>

anrs/anrs-internal/src/main/java/com/duckduckgo/app/anr/internal/feature/CrashANRsInternalSettingsActivity.kt

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2023 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.
+ */
+
+package com.duckduckgo.app.anr.internal.feature
+
+import android.os.Bundle
+import com.duckduckgo.anvil.annotations.ContributeToActivityStarter
+import com.duckduckgo.anvil.annotations.InjectWith
+import com.duckduckgo.app.anr.internal.databinding.ActivityCrashAnrInternalSettingsBinding
+import com.duckduckgo.app.anr.internal.feature.CrashANRsInternalScreens.InternalCrashSettings
+import com.duckduckgo.common.ui.DuckDuckGoActivity
+import com.duckduckgo.common.ui.viewbinding.viewBinding
+import com.duckduckgo.common.utils.plugins.PluginPoint
+import com.duckduckgo.di.scopes.ActivityScope
+import com.duckduckgo.navigation.api.GlobalActivityStarter
+import javax.inject.Inject
+
+@InjectWith(ActivityScope::class)
+@ContributeToActivityStarter(InternalCrashSettings::class)
+class CrashANRsInternalSettingsActivity : DuckDuckGoActivity() {
+
+    @Inject
+    lateinit var settings: PluginPoint<CrashANRsSettingPlugin>
+
+    private val binding: ActivityCrashAnrInternalSettingsBinding by viewBinding()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(binding.root)
+        setupToolbar(binding.toolbar)
+
+        setupUiElementState()
+    }
+
+    private fun setupUiElementState() {
+        settings.getPlugins()
+            .mapNotNull { it.getView(this) }
+            .forEach { remoteViewPlugin ->
+                binding.settingsContent.addView(remoteViewPlugin)
+            }
+    }
+}
+
+sealed class CrashANRsInternalScreens : GlobalActivityStarter.ActivityParams {
+    data object InternalCrashSettings : CrashANRsInternalScreens() {
+        private fun readResolve(): Any = InternalCrashSettings
+    }
+}

anrs/anrs-internal/src/main/java/com/duckduckgo/app/anr/internal/feature/CrashANRsSettingPlugin.kt

@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package com.duckduckgo.app.anr.internal.feature
+
+import android.content.*
+import android.view.*
+import com.duckduckgo.anvil.annotations.ContributesPluginPoint
+import com.duckduckgo.di.scopes.ActivityScope
+
+/**
+ * Use this interface to create a new plugin that will be used to display a specific settings section
+ */
+@ContributesPluginPoint(ActivityScope::class)
+interface CrashANRsSettingPlugin {
+    /**
+     * This method returns a [View] that will be used as a setting item
+     * @return [View]
+     */
+    fun getView(context: Context): View?
+}

anrs/anrs-internal/src/main/java/com/duckduckgo/app/anr/internal/feature/InternalViews.kt

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2023 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.
+ */
+
+package com.duckduckgo.app.anr.internal.feature
+
+import android.content.Context
+import com.duckduckgo.anvil.annotations.PriorityKey
+import com.duckduckgo.app.anr.internal.feature.CrashANRsInternalScreens.InternalCrashSettings
+import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.internal.features.api.InternalFeaturePlugin
+import com.duckduckgo.internal.features.api.InternalFeaturePlugin.Companion.CRASH_ANR_SETTINGS_PRIO_KEY
+import com.duckduckgo.navigation.api.GlobalActivityStarter
+import com.squareup.anvil.annotations.ContributesMultibinding
+import javax.inject.Inject
+
+@ContributesMultibinding(AppScope::class)
+@PriorityKey(CRASH_ANR_SETTINGS_PRIO_KEY)
+class InternalSettingsActivity @Inject constructor(
+    private val globalActivityStarter: GlobalActivityStarter,
+) : InternalFeaturePlugin {
+    override fun internalFeatureTitle(): String {
+        return "Crash and ANRs settings"
+    }
+
+    override fun internalFeatureSubtitle(): String {
+        return "Crash and ANRs dev settings for internal users"
+    }
+
+    override fun onInternalFeatureClicked(activityContext: Context) {
+        globalActivityStarter.start(activityContext, InternalCrashSettings)
+    }
+}

anrs/anrs-internal/src/main/java/com/duckduckgo/app/anr/internal/setting/CrashANRsListView.kt

@@ -0,0 +1,110 @@
+/*
+ * 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.
+ */
+
+package com.duckduckgo.app.anr.internal.setting
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.FrameLayout
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.duckduckgo.anvil.annotations.InjectWith
+import com.duckduckgo.app.anr.internal.databinding.CrashAnrsListViewBinding
+import com.duckduckgo.app.anr.internal.feature.CrashANRsSettingPlugin
+import com.duckduckgo.app.anr.internal.setting.VitalsAdapterList.VitalsItems.AnrItem
+import com.duckduckgo.app.anr.internal.setting.VitalsAdapterList.VitalsItems.CrashItem
+import com.duckduckgo.app.di.AppCoroutineScope
+import com.duckduckgo.common.ui.viewbinding.viewBinding
+import com.duckduckgo.common.utils.DispatcherProvider
+import com.duckduckgo.di.scopes.ActivityScope
+import com.duckduckgo.di.scopes.ViewScope
+import com.duckduckgo.navigation.api.GlobalActivityStarter
+import com.squareup.anvil.annotations.ContributesMultibinding
+import dagger.android.support.AndroidSupportInjection
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.launch
+
+@InjectWith(ViewScope::class)
+class CrashANRsListView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyle: Int = 0,
+) : FrameLayout(context, attrs, defStyle) {
+
+    @Inject
+    lateinit var globalActivityStarter: GlobalActivityStarter
+
+    @Inject
+    lateinit var dispatcherProvider: DispatcherProvider
+
+    @Inject
+    lateinit var crashANRsRepository: CrashANRsRepository
+
+    @Inject
+    @AppCoroutineScope
+    lateinit var appCoroutineScope: CoroutineScope
+
+    private val binding: CrashAnrsListViewBinding by viewBinding()
+    private lateinit var anrAdapter: VitalsAdapterList
+
+    override fun onAttachedToWindow() {
+        AndroidSupportInjection.inject(this)
+        super.onAttachedToWindow()
+
+        configureANRList()
+
+        findViewTreeLifecycleOwner()?.lifecycleScope?.launch {
+            crashANRsRepository.getANRs().combine(crashANRsRepository.getCrashes()) { anrs, crashes ->
+                (
+                    anrs.map {
+                        AnrItem(
+                            stackTrace = it.stackTrace,
+                            customTab = it.customTab,
+                            timestamp = it.timestamp,
+                        )
+                    } + crashes.map {
+                        CrashItem(
+                            stackTrace = it.stackTrace,
+                            processName = it.processName,
+                            customTab = it.customTab,
+                            timestamp = it.timestamp,
+                        )
+                    }
+                    ).sortedByDescending { it.timestamp }
+            }.flowOn(dispatcherProvider.io()).collect {
+                anrAdapter.setItems(it)
+            }
+        }
+    }
+
+    private fun configureANRList() {
+        binding.anrList.layoutManager = LinearLayoutManager(context)
+        anrAdapter = VitalsAdapterList()
+        binding.anrList.adapter = anrAdapter
+    }
+}
+
+@ContributesMultibinding(ActivityScope::class)
+class CrashANRsListViewPlugin @Inject constructor() : CrashANRsSettingPlugin {
+    override fun getView(context: Context): View {
+        return CrashANRsListView(context)
+    }
+}