Merge branch 'release/5.77.0' into main

Author: cmonfortep

CONTRIBUTING.md

@@ -13,21 +13,28 @@ Contact us at https://duckduckgo.com/feedback if you have feedback, questions or
 ## Report an issue
 A great way to contribute to the project is to report an issue when you encounter a problem.
 
-We want our app to be as stable as possible thus your bug reports are immensely valuable. When reporting bugs let us know the:
-* App version
-* Device model
-* Android version
-* Steps to reproduce the bug
-* Expected behavior
-* Actual behavior
+We want our app to be as stable as possible thus your bug reports are immensely valuable. When reporting bug, please follow the bug template.
 
 If you have encountered a security issue, please reach us through https://hackerone.com/duckduckgo.
 
+## What to expect
+
+When a new issue is opened, we will label it as:
+* Needs triage: needs a triage from a member of our team
+* under investigation: our team will investigate the issue
+
+After our team has investigated each issue, we will label them as:
+* Will fix: issue will be fixed internally by DuckDuckGo
+* [help wanted](https://github.com/duckduckgo/Android/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22): community contributions are welcome
+* Won't fix: issue will be closed without a fix
+
 ## Contribute Code
 
-We welcome pull requests aimed at fixing bugs and security issues. We have also labeled tasks you can help with as [help wanted](https://github.com/duckduckgo/Android/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22).
+We welcome pull requests aimed at fixing bugs and security issues.
+
+If you have a great idea or a feature request that can help improving our browser, start by opening a [Discussion](https://github.com/duckduckgo/Android/discussions). Discussions is the right place to have an open conversation about an idea with our devs and maintainers. Proposals that fit our product direction and timeline will be added to our backlog and labelled accordingly.
 
-If you have a great idea you really want to implement, start by logging an issue for us and mention that you are interested in helping. If it fits with our product direction and is a good candidate for community development we may be able to bend the rules and work with you to develop it.
+We have also labeled tasks you can help with as [help wanted](https://github.com/duckduckgo/Android/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22). Those tasks a great places to start contributing to DuckDuckGo and we'll support you through the process.
 
 ### Style Guide
 

app/build.gradle

@@ -95,131 +95,97 @@ android {
     }
 }
 
-ext {
-    androidX = "1.2.0"
-    materialDesign = "1.2.1"
-    swipeRefreshLayout = "1.1.0"
-    architectureComponents = "1.1.1"
-    architectureComponentsExtensions = "1.1.1"
-    androidKtxCore = "1.3.2"
-    fragmentKtx = "1.2.5"
-    constraintLayout = "2.0.4"
-    lifecycle = "2.2.0"
-    room = "2.2.5"
-    workManager = "2.4.0"
-    legacySupport = "1.0.0"
-    coreTesting = "2.1.0"
-    testRunner = "1.3.0"
-    coroutines = "1.3.5"
-    retrofitCoroutinesAdapter = "0.9.2"
-    webkit = "1.3.0"
-    referrerLibrary = "1.1.2"
-
-    junit = "4.12"
-    dagger = "2.27"
-    retrofit = "2.8.1"
-    ankoVersion = "0.10.4"
-    glide = "4.11.0"
-    lottieVersion = "3.4.0"
-    okHttp = "4.9.0"
-    rxJava = "2.1.10"
-    rxAndroid = "2.0.2"
-    timber = "4.7.1"
-    rxRelay = "2.0.0"
-    leakCanary = "2.5"
-    mockito = "3.4.6"
-    mockitoKotlin = "2.2.0"
-    commonsMath = "3.6.1"
-}
-
-
 dependencies {
-    implementation "androidx.legacy:legacy-support-v4:$legacySupport"
-    debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanary"
+    implementation AndroidX.legacy.supportV4
+    debugImplementation Square.leakCanary.android
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines"
-    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
-
-    implementation "androidx.appcompat:appcompat:$androidX"
-    implementation "com.google.android.material:material:$materialDesign"
-    implementation "androidx.constraintlayout:constraintlayout:$constraintLayout"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:$swipeRefreshLayout"
-    implementation "androidx.webkit:webkit:$webkit"
-    implementation "com.squareup.okhttp3:okhttp:$okHttp"
-    implementation "com.squareup.okhttp3:okhttp-tls:$okHttp"
-    implementation "com.squareup.retrofit2:retrofit:$retrofit"
-    implementation "com.squareup.retrofit2:converter-moshi:$retrofit"
-    implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit"
-    implementation "com.squareup.retrofit2:converter-scalars:$retrofit"
-    implementation "com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:$retrofitCoroutinesAdapter"
-    implementation "io.reactivex.rxjava2:rxjava:$rxJava"
-    implementation "io.reactivex.rxjava2:rxandroid:$rxAndroid"
-    implementation "com.jakewharton.timber:timber:$timber"
-    implementation "com.google.dagger:dagger-android:$dagger"
-    implementation "com.google.dagger:dagger-android-support:$dagger"
+    implementation Kotlin.stdlib.jdk7
+    implementation KotlinX.coroutines.core
+    implementation KotlinX.coroutines.android
+    androidTestImplementation (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"
+    }
+
+    implementation AndroidX.appCompat
+    implementation Google.android.material
+    implementation AndroidX.constraintLayout
+    implementation AndroidX.swipeRefreshLayout
+    implementation AndroidX.webkit
+    implementation Square.okHttp3.okHttp
+    implementation "com.squareup.okhttp3:okhttp-tls:_"
+    implementation Square.retrofit2.retrofit
+    implementation Square.retrofit2.converter.moshi
+    implementation Square.retrofit2.adapter.rxJava2
+    implementation Square.retrofit2.converter.scalars
+    implementation "io.reactivex.rxjava2:rxjava:_"
+    implementation "io.reactivex.rxjava2:rxandroid:_"
+    implementation JakeWharton.timber
+    implementation Google.dagger.android
+    implementation Google.dagger.android.support
 
     // RxRelay
-    implementation "com.jakewharton.rxrelay2:rxrelay:$rxRelay"
+    implementation "com.jakewharton.rxrelay2:rxrelay:_"
 
     // Anko
-    implementation "org.jetbrains.anko:anko-commons:$ankoVersion"
-    implementation "org.jetbrains.anko:anko-design:$ankoVersion"
+    implementation "org.jetbrains.anko:anko-commons:_"
+    implementation "org.jetbrains.anko:anko-design:_"
 
     // Android KTX
-    implementation "androidx.core:core-ktx:$androidKtxCore"
-    implementation "androidx.fragment:fragment-ktx:$fragmentKtx"
+    implementation AndroidX.core.ktx
+    implementation AndroidX.fragmentKtx
 
     // ViewModel and LiveData
-    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle"
+    implementation AndroidX.lifecycle.extensions
+    implementation AndroidX.lifecycle.viewModelKtx
+    implementation AndroidX.lifecycle.liveDataKtx
 
-    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle"
-    testImplementation "androidx.arch.core:core-testing:$coreTesting"
-    androidTestImplementation "androidx.arch.core:core-testing:$coreTesting"
+    implementation  AndroidX.lifecycle.commonJava8
+    testImplementation AndroidX.archCore.testing
+    androidTestImplementation AndroidX.archCore.testing
 
     // Room
-    implementation "androidx.room:room-runtime:$room"
-    implementation "androidx.room:room-rxjava2:$room"
-    implementation "androidx.room:room-ktx:$room"
-    kapt "androidx.room:room-compiler:$room"
-    testImplementation "androidx.room:room-testing:$room"
-    androidTestImplementation "androidx.room:room-testing:$room"
+    implementation AndroidX.room.runtime
+    implementation AndroidX.room.rxJava2
+    implementation AndroidX.room.ktx
+    kapt AndroidX.room.compiler
+    testImplementation AndroidX.room.testing
+    androidTestImplementation AndroidX.room.testing
 
     // WorkManager
-    implementation "androidx.work:work-runtime-ktx:$workManager"
-    androidTestImplementation "androidx.work:work-testing:$workManager"
-    implementation "androidx.work:work-rxjava2:$workManager"
+    implementation AndroidX.work.runtimeKtx
+    androidTestImplementation AndroidX.work.testing
+    implementation AndroidX.work.rxJava2
 
     // Dagger
-    kapt "com.google.dagger:dagger-android-processor:$dagger"
-    kapt "com.google.dagger:dagger-compiler:$dagger"
-    kaptAndroidTest "com.google.dagger:dagger-android-processor:$dagger"
-    kaptAndroidTest "com.google.dagger:dagger-compiler:$dagger"
+    kapt Google.dagger.android.processor
+    kapt Google.dagger.compiler
+    kaptAndroidTest "com.google.dagger:dagger-android-processor:_"
+    kaptAndroidTest "com.google.dagger:dagger-compiler:_"
 
     // Glide
-    implementation "com.github.bumptech.glide:glide:$glide"
-    implementation "com.github.bumptech.glide:okhttp3-integration:$glide"
-    kapt "com.github.bumptech.glide:compiler:$glide"
+    implementation "com.github.bumptech.glide:glide:_"
+    implementation "com.github.bumptech.glide:okhttp3-integration:_"
+    kapt "com.github.bumptech.glide:compiler:_"
 
     // Lottie
-    implementation "com.airbnb.android:lottie:$lottieVersion"
+    implementation "com.airbnb.android:lottie:_"
 
     // Apache commons
-    implementation "org.apache.commons:commons-math3:$commonsMath"
+    implementation "org.apache.commons:commons-math3:_"
 
     // Play Store referrer library
-    implementation("com.android.installreferrer:installreferrer:$referrerLibrary")
+    implementation("com.android.installreferrer:installreferrer:_")
 
     // Testing dependencies
-    androidTestImplementation "androidx.test:runner:$testRunner"
-    androidTestImplementation "androidx.test:rules:$testRunner"
-    androidTestUtil "androidx.test:orchestrator:$testRunner"
-    androidTestImplementation "org.mockito:mockito-android:$mockito"
-    androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlin"
-    androidTestImplementation "com.squareup.okhttp3:mockwebserver:$okHttp"
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    androidTestImplementation AndroidX.test.runner
+    androidTestImplementation AndroidX.test.rules
+    androidTestUtil AndroidX.test.orchestrator
+    androidTestImplementation Testing.mockito.android
+    androidTestImplementation Testing.mockito.kotlin
+    androidTestImplementation Square.okHttp3.mockWebServer
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:_"
 }

app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt

@@ -117,4 +117,10 @@ class BookmarksViewModelTest {
         testee.delete(bookmark)
         verify(faviconManager).deletePersistedFavicon(bookmark.url)
     }
+
+    @Test
+    fun whenBookmarkInsertedThenDaoUpdated() {
+        testee.insert(bookmark)
+        verify(bookmarksDao).insert(bookmark)
+    }
 }