Update tooling to targetSdkVersion 29 and compileSdkVersion 29 (#899)

* Update targetSdkVersion and compileSdkVersion to 29

- Fixed nullability issue with StringHtmlExtension.kt extension function
- Fixed nullability issue with NavigationAwareLoginDetector.kt
- Fixed nullability issue with BrowserTabFragment.kt's interaction with ClipboardManager
- Fixed nullability issue with NotificationHandlerService.kt's intent parsing

* Lint fixes

* Fix possible null pointer exceptions when getting host from Uri

* change logic inside to fix compiling issues with api 29

Co-authored-by: Cristian Monforte <[email protected]>

Author: CDRussell

app/build.gradle

@@ -11,12 +11,12 @@ ext {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     ndkVersion '21.0.6113669'
     defaultConfig {
         applicationId "com.duckduckgo.mobile.android"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode buildVersionCode()
         versionName buildVersionName()
         testInstrumentationRunner "com.duckduckgo.app.TestRunner"

app/src/androidTest/java/com/duckduckgo/app/browser/filechooser/FileChooserIntentBuilderTest.kt

@@ -69,14 +69,14 @@ class FileChooserIntentBuilderTest {
     @Test
     fun whenUpperCaseTypesGivenThenNormalisedToLowercase() {
         val output = testee.intent(arrayOf("ImAgE/PnG"))
-        assertEquals("image/png", output.getStringArrayExtra(Intent.EXTRA_MIME_TYPES)[0])
+        assertEquals("image/png", output.getStringArrayExtra(Intent.EXTRA_MIME_TYPES)!![0])
     }
 
     @Test
     fun whenEmptyTypesGivenThenNotIncludedInOutput() {
         val output = testee.intent(arrayOf("image/png", "", " ", "image/gif"))
         val mimeTypes = output.getStringArrayExtra(Intent.EXTRA_MIME_TYPES)
-        assertEquals(2, mimeTypes.size)
+        assertEquals(2, mimeTypes!!.size)
         assertEquals("image/png", mimeTypes[0])
         assertEquals("image/gif", mimeTypes[1])
     }

app/src/androidTest/java/com/duckduckgo/app/browser/logindetection/NextPageLoginDetectionTest.kt

@@ -146,6 +146,24 @@ class NextPageLoginDetectionTest {
         assertEventNotIssued<LoginDetected>()
     }
 
+    @Test
+    fun whenLoginAttemptedHasInvalidURLThenNewPageDoesNotDetectLogin() {
+        loginDetector.onEvent(NavigationEvent.LoginAttempt(""))
+
+        loginDetector.onEvent(NavigationEvent.WebNavigationEvent(NewPage(url = "http://example.com", title = "")))
+
+        assertEventNotIssued<LoginDetected>()
+    }
+
+    @Test
+    fun whenLoginAttemptedAndUserForwardedToInvalidNewPageThenLoginDetected() {
+        loginDetector.onEvent(NavigationEvent.LoginAttempt("http://example.com/login"))
+
+        loginDetector.onEvent(NavigationEvent.WebNavigationEvent(NewPage(url = "", title = "")))
+
+        assertEventNotIssued<LoginDetected>()
+    }
+
     private inline fun <reified T> assertEvent(instanceAssertions: T.() -> Unit = {}) {
         verify(loginObserver, atLeastOnce()).onChanged(loginEventCaptor.capture())
         val issuedCommand = loginEventCaptor.allValues.find { it is T }

app/src/androidTest/java/com/duckduckgo/app/di/StubJobSchedulerModule.kt

@@ -36,9 +36,9 @@ class StubJobSchedulerModule {
     @Provides
     fun providesJobScheduler(): JobScheduler {
         return object : JobScheduler() {
-            override fun enqueue(job: JobInfo?, work: JobWorkItem?): Int = JobScheduler.RESULT_SUCCESS
+            override fun enqueue(job: JobInfo, work: JobWorkItem): Int = JobScheduler.RESULT_SUCCESS
 
-            override fun schedule(job: JobInfo?): Int = JobScheduler.RESULT_SUCCESS
+            override fun schedule(job: JobInfo): Int = JobScheduler.RESULT_SUCCESS
 
             override fun cancel(jobId: Int) {}
 

app/src/androidTest/java/com/duckduckgo/app/fire/RemoveCookiesTest.kt

@@ -20,9 +20,11 @@ import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.verifyZeroInteractions
 import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.Test
 
+@ExperimentalCoroutinesApi
 class RemoveCookiesTest {
 
     private val selectiveCookieRemover = mock<CookieRemover>()

app/src/androidTest/java/com/duckduckgo/app/icon/ui/ChangeIconViewModelTest.kt

@@ -26,8 +26,8 @@ import com.duckduckgo.app.statistics.pixels.Pixel
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
-import junit.framework.Assert.assertTrue
 import org.junit.After
+import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 import org.mockito.Mockito

app/src/androidTest/java/com/duckduckgo/app/privacy/ui/ScorecardViewModelTest.kt

@@ -38,6 +38,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
+@ExperimentalCoroutinesApi
 class ScorecardViewModelTest {
 
     @get:Rule

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

@@ -582,9 +582,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope, DaxDialogLi
             is Command.FindInPageCommand -> webView?.findAllAsync(it.searchTerm)
             is Command.DismissFindInPage -> webView?.findAllAsync("")
             is Command.ShareLink -> launchSharePageChooser(it.url)
-            is Command.CopyLink -> {
-                clipboardManager.primaryClip = ClipData.newPlainText(null, it.url)
-            }
+            is Command.CopyLink -> clipboardManager.setPrimaryClip(ClipData.newPlainText(null, it.url))
             is Command.ShowFileChooser -> {
                 launchFilePicker(it)
             }

app/src/main/java/com/duckduckgo/app/browser/logindetection/NavigationAwareLoginDetector.kt

@@ -45,8 +45,8 @@ sealed class NavigationEvent {
 
 class NextPageLoginDetection @Inject constructor() : NavigationAwareLoginDetector {
 
-    private var loginAttempt: NavigationEvent.LoginAttempt? = null
     override val loginEventLiveData = MutableLiveData<LoginDetected>()
+    private var loginAttempt: ValidUrl? = null
 
     override fun onEvent(navigationEvent: NavigationEvent) {
         Timber.i("LoginDetectionDelegate $navigationEvent")
@@ -67,7 +67,7 @@ class NextPageLoginDetection @Inject constructor() : NavigationAwareLoginDetecto
     }
 
     private fun saveLoginAttempt(navigationEvent: NavigationEvent.LoginAttempt) {
-        loginAttempt = navigationEvent
+        loginAttempt = Uri.parse(navigationEvent.url).getValidUrl() ?: return
     }
 
     private fun discardLoginAttempt() {
@@ -91,16 +91,21 @@ class NextPageLoginDetection @Inject constructor() : NavigationAwareLoginDetecto
         }
     }
 
-    @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
     private fun detectLogin(forwardedToUrl: String) {
-        val loginAttemptEvent = loginAttempt ?: return
-        val loginURI = Uri.parse(loginAttemptEvent.url).takeUnless { it.host.isNullOrBlank() } ?: return
-        val forwardedToUri = Uri.parse(forwardedToUrl).takeUnless { it.host.isNullOrBlank() } ?: return
+        val validLoginAttempt = loginAttempt ?: return
+        val forwardedToUri = Uri.parse(forwardedToUrl).getValidUrl() ?: return
 
-        Timber.i("LoginDetectionDelegate ${loginAttemptEvent.url} vs $forwardedToUrl")
-        if (loginURI.host != forwardedToUri.host || loginURI.path != forwardedToUri.path) {
-            loginEventLiveData.value = LoginDetected(loginURI.host, forwardedToUri.host)
+        Timber.i("LoginDetectionDelegate $validLoginAttempt vs $forwardedToUrl")
+        if (validLoginAttempt.host != forwardedToUri.host || validLoginAttempt.path != forwardedToUri.path) {
+            loginEventLiveData.value = LoginDetected(validLoginAttempt.host, forwardedToUri.host)
             loginAttempt = null
         }
     }
+
+    private fun Uri.getValidUrl(): ValidUrl? {
+        val validHost = host ?: return null
+        return ValidUrl(validHost, path)
+    }
+
+    private data class ValidUrl(val host: String, val path: String?)
 }

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

@@ -22,6 +22,7 @@ import android.net.Uri
 import android.os.Build
 import android.text.Html.*
 import android.text.Spanned
+import androidx.core.content.ContextCompat
 
 @Suppress("deprecation")
 fun String.html(context: Context): Spanned {
@@ -31,10 +32,10 @@ fun String.html(context: Context): Spanned {
     return fromHtml(this, ImageGetter { htmlDrawable(context, it.toInt()) }, null)
 }
 
-private fun htmlDrawable(context: Context, resource: Int): Drawable {
-    val drawable = context.getDrawable(resource)
-    drawable.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight)
-    return drawable
+private fun htmlDrawable(context: Context, resource: Int): Drawable? {
+    return ContextCompat.getDrawable(context, resource)?.also {
+        it.setBounds(0, 0, it.intrinsicWidth, it.intrinsicHeight)
+    }
 }
 
 private const val HTTPS_PREFIX = "https://"