From 07b85289dd7c9575f59f8b935fe0256b6e861f86 Mon Sep 17 00:00:00 2001
From: Prateek Jain <prateek.jain23995@yahoo.com>
Date: Thu, 26 Dec 2019 18:12:30 +0530
Subject: [PATCH 01/10] Showing confirmation dialog to user to confirm download

---
 .../app/browser/BrowserTabFragment.kt         |  7 +++
 .../browser/DownloadConfirmationFragment.kt   | 44 +++++++++++++
 .../app/browser/downloader/FileDownloader.kt  |  6 +-
 .../downloader/NetworkFileDownloader.kt       | 20 +++++-
 .../main/res/layout/download_confirmation.xml | 63 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  2 +
 6 files changed, 138 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
 create mode 100644 app/src/main/res/layout/download_confirmation.xml

diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
index a1f998ac4adc..9984ff802c35 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -62,6 +62,7 @@ import com.duckduckgo.app.browser.autocomplete.BrowserAutoCompleteSuggestionsAda
 import com.duckduckgo.app.browser.downloader.FileDownloadNotificationManager
 import com.duckduckgo.app.browser.downloader.FileDownloader
 import com.duckduckgo.app.browser.downloader.FileDownloader.PendingFileDownload
+import com.duckduckgo.app.browser.downloader.NetworkFileDownloader.UserDownloadAction
 import com.duckduckgo.app.browser.filechooser.FileChooserIntentBuilder
 import com.duckduckgo.app.browser.model.BasicAuthenticationCredentials
 import com.duckduckgo.app.browser.model.BasicAuthenticationRequest
@@ -1010,6 +1011,11 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
         pendingFileDownload = null
         thread {
             fileDownloader.download(pendingDownload, object : FileDownloader.FileDownloadListener {
+                override fun confirmDownload(fileName: String, userDownloadAction: UserDownloadAction) {
+                    val downloadConfirmationFragment = DownloadConfirmationFragment(fileName, userDownloadAction)
+                    downloadConfirmationFragment.show(fragmentManager!!, DOWNLAOD_CONFIRM_TAG)
+                }
+
                 override fun downloadStarted() {
                     fileDownloadNotificationManager.showDownloadInProgressNotification()
                 }
@@ -1090,6 +1096,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
         private const val URL_BUNDLE_KEY = "url"
 
         private const val AUTHENTICATION_DIALOG_TAG = "AUTH_DIALOG_TAG"
+        private const val DOWNLAOD_CONFIRM_TAG = "DOWNLAOD_CONFIRM_TAG"
         private const val DAX_DIALOG_DIALOG_TAG = "DAX_DIALOG_TAG"
 
         private const val MIN_PROGRESS = 10
diff --git a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
new file mode 100644
index 000000000000..04890db941c3
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2019 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.browser
+
+import android.annotation.SuppressLint
+import android.app.Dialog
+import android.view.LayoutInflater
+import com.duckduckgo.app.browser.downloader.NetworkFileDownloader
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import kotlinx.android.synthetic.main.download_confirmation.view.*
+
+class DownloadConfirmationFragment(private val fileName: String, private val userDownloadAction: NetworkFileDownloader.UserDownloadAction) : BottomSheetDialogFragment() {
+
+    @SuppressLint("RestrictedApi")
+    override fun setupDialog(dialog: Dialog, style: Int) {
+        super.setupDialog(dialog, style)
+        val view = LayoutInflater.from(context).inflate(R.layout.download_confirmation, null)
+        dialog.setContentView(view)
+
+        view.download_message.text = getString(R.string.download_filename, fileName)
+        view.continue_download.setOnClickListener {
+            userDownloadAction.accept()
+            dismiss()
+        }
+        view.cancel.setOnClickListener {
+            userDownloadAction.cancel()
+            dismiss()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt
index a2157c8d1f09..2c67b0bde8d3 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt
@@ -19,6 +19,7 @@ package com.duckduckgo.app.browser.downloader
 import android.os.Environment
 import android.webkit.URLUtil
 import androidx.annotation.WorkerThread
+import com.duckduckgo.app.browser.downloader.NetworkFileDownloader.UserDownloadAction
 import java.io.File
 import javax.inject.Inject
 
@@ -28,14 +29,14 @@ class FileDownloader @Inject constructor(
 ) {
 
     @WorkerThread
-    fun download(pending: PendingFileDownload?, callback: FileDownloadListener?) {
+    fun download(pending: PendingFileDownload?, callback: FileDownloadListener) {
 
         if (pending == null) {
             return
         }
 
         when {
-            URLUtil.isNetworkUrl(pending.url) -> networkDownloader.download(pending)
+            URLUtil.isNetworkUrl(pending.url) -> networkDownloader.download(pending, callback)
             URLUtil.isDataUrl(pending.url) -> dataUriDownloader.download(pending, callback)
             else -> callback?.downloadFailed("Not supported")
         }
@@ -50,6 +51,7 @@ class FileDownloader @Inject constructor(
     )
 
     interface FileDownloadListener {
+        fun confirmDownload(fileName: String, userDownloadAction: UserDownloadAction)
         fun downloadStarted()
         fun downloadFinished(file: File, mimeType: String?)
         fun downloadFailed(message: String)
diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
index 4c4c6d0caaba..e40973ebb379 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
@@ -21,14 +21,26 @@ import android.content.Context
 import android.webkit.CookieManager
 import android.webkit.URLUtil
 import androidx.core.net.toUri
+import com.duckduckgo.app.browser.downloader.FileDownloader.FileDownloadListener
 import timber.log.Timber
 import javax.inject.Inject
 
 class NetworkFileDownloader @Inject constructor(private val context: Context) {
 
-    fun download(pendingDownload: FileDownloader.PendingFileDownload) {
+    fun download(pendingDownload: FileDownloader.PendingFileDownload, callback: FileDownloadListener) {
         val guessedFileName = guessFileName(pendingDownload)
+        callback.confirmDownload(guessedFileName, object : UserDownloadAction {
+            override fun accept() {
+                initiateDownload(pendingDownload, guessedFileName)
+            }
 
+            override fun cancel() {
+                Timber.i("Cancelled download for url ${pendingDownload.url}")
+            }
+        })
+    }
+
+    private fun initiateDownload(pendingDownload: FileDownloader.PendingFileDownload, guessedFileName: String?) {
         val request = DownloadManager.Request(pendingDownload.url.toUri()).apply {
             allowScanningByMediaScanner()
             addRequestHeader("Cookie", CookieManager.getInstance().getCookie(pendingDownload.url))
@@ -39,10 +51,14 @@ class NetworkFileDownloader @Inject constructor(private val context: Context) {
         manager?.enqueue(request)
     }
 
-    private fun guessFileName(pending: FileDownloader.PendingFileDownload): String? {
+    private fun guessFileName(pending: FileDownloader.PendingFileDownload): String {
         val guessedFileName = URLUtil.guessFileName(pending.url, pending.contentDisposition, pending.mimeType)
         Timber.i("Guessed filename of $guessedFileName for url ${pending.url}")
         return guessedFileName
     }
 
+    interface UserDownloadAction {
+        fun accept()
+        fun cancel()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_confirmation.xml b/app/src/main/res/layout/download_confirmation.xml
new file mode 100644
index 000000000000..719823325e8e
--- /dev/null
+++ b/app/src/main/res/layout/download_confirmation.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:custom="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:background="@color/white"
+    android:padding="16dp">
+
+
+    <TextView
+        android:id="@+id/download_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        custom:text="sample-file.pdf ?"
+        android:textColor="@android:color/black"
+        android:textSize="16sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/cancel"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_weight="1"
+            android:background="@android:color/black"
+            android:text="@string/fireCancel"
+            android:textColor="@android:color/white" />
+
+        <Button
+            android:id="@+id/continue_download"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_weight="1"
+            android:background="@android:color/black"
+            android:text="@string/fireContinue"
+            android:textColor="@android:color/white" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index afe9846610c7..da33ed700780 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -148,6 +148,8 @@
     <string name="fireMenu">Clear Data</string>
     <string name="fireClearAll">Clear All Tabs and Data</string>
     <string name="fireCancel">Cancel</string>
+    <string name="fireContinue">Continue</string>
+    <string name="download_filename">Download %1$s ?</string>
     <string name="fireDataCleared">Data cleared</string>
     <string name="fireProcessName" translatable="false">:fire</string>
 

From 0d6cb775ffa5be0c9304ac2b4108ded8f1edf782 Mon Sep 17 00:00:00 2001
From: Prateek Jain <prateek.jain23995@yahoo.com>
Date: Thu, 26 Dec 2019 19:13:12 +0530
Subject: [PATCH 02/10] Converting downlaod user downlaod action menus to list
 to accommodate more items

---
 .../main/res/layout/download_confirmation.xml | 79 +++++++++++++------
 app/src/main/res/values/strings.xml           |  2 +-
 2 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/app/src/main/res/layout/download_confirmation.xml b/app/src/main/res/layout/download_confirmation.xml
index 719823325e8e..9fdef5049699 100644
--- a/app/src/main/res/layout/download_confirmation.xml
+++ b/app/src/main/res/layout/download_confirmation.xml
@@ -16,11 +16,11 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:custom="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:custom="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:background="@color/white"
+    android:orientation="vertical"
     android:padding="16dp">
 
 
@@ -28,36 +28,71 @@
         android:id="@+id/download_message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        custom:text="sample-file.pdf ?"
         android:textColor="@android:color/black"
-        android:textSize="16sp" />
+        android:textSize="16sp"
+        custom:text="Save sample-file.pdf ?" />
+
 
     <LinearLayout
+        android:layout_marginTop="16dp"
+        android:id="@+id/continue_download"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:orientation="horizontal">
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?attr/selectableItemBackground"
+        android:orientation="horizontal"
+        android:paddingLeft="10dp"
+        android:paddingTop="8dp"
+        android:paddingRight="10dp"
+        android:paddingBottom="8dp">
 
-        <Button
-            android:id="@+id/cancel"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:layout_weight="1"
-            android:background="@android:color/black"
-            android:text="@string/fireCancel"
-            android:textColor="@android:color/white" />
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginEnd="32dp"
+            android:src="@android:drawable/ic_menu_save"
+            android:tint="#737373" />
 
-        <Button
-            android:id="@+id/continue_download"
-            android:layout_width="0dp"
+        <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_weight="1"
-            android:background="@android:color/black"
+            android:layout_gravity="center_vertical"
             android:text="@string/fireContinue"
-            android:textColor="@android:color/white" />
+            android:textColor="@android:color/black"
+            android:textSize="16sp" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/cancel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?attr/selectableItemBackground"
+        android:orientation="horizontal"
+        android:paddingLeft="10dp"
+        android:paddingTop="8dp"
+        android:paddingRight="10dp"
+        android:paddingBottom="8dp">
+
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginEnd="32dp"
+            android:src="@android:drawable/ic_menu_close_clear_cancel"
+            android:tint="#737373" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="@string/fireCancel"
+            android:textColor="@android:color/black"
+            android:textSize="16sp" />
 
     </LinearLayout>
 
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index da33ed700780..91c7cd8554ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -149,7 +149,7 @@
     <string name="fireClearAll">Clear All Tabs and Data</string>
     <string name="fireCancel">Cancel</string>
     <string name="fireContinue">Continue</string>
-    <string name="download_filename">Download %1$s ?</string>
+    <string name="download_filename">Save %1$s ?</string>
     <string name="fireDataCleared">Data cleared</string>
     <string name="fireProcessName" translatable="false">:fire</string>
 

From a53caae926d69bcbef8a94b7cc8497c562979bc7 Mon Sep 17 00:00:00 2001
From: Prateek Jain <prateek.jain23995@yahoo.com>
Date: Thu, 26 Dec 2019 20:59:16 +0530
Subject: [PATCH 03/10] Giving user an option to keep both files or replace
 original one when downloading

---
 .../app/browser/BrowserTabFragment.kt         |  9 ++-
 .../browser/DownloadConfirmationFragment.kt   | 33 ++++++++-
 .../app/browser/downloader/FileDownloader.kt  |  5 +-
 .../downloader/NetworkFileDownloader.kt       | 41 ++++++++---
 .../main/res/layout/download_confirmation.xml | 70 ++++++++++++++++++-
 app/src/main/res/values/strings.xml           |  2 +
 6 files changed, 142 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
index 9984ff802c35..1353a7e15768 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -62,6 +62,7 @@ import com.duckduckgo.app.browser.autocomplete.BrowserAutoCompleteSuggestionsAda
 import com.duckduckgo.app.browser.downloader.FileDownloadNotificationManager
 import com.duckduckgo.app.browser.downloader.FileDownloader
 import com.duckduckgo.app.browser.downloader.FileDownloader.PendingFileDownload
+import com.duckduckgo.app.browser.downloader.NetworkFileDownloader
 import com.duckduckgo.app.browser.downloader.NetworkFileDownloader.UserDownloadAction
 import com.duckduckgo.app.browser.filechooser.FileChooserIntentBuilder
 import com.duckduckgo.app.browser.model.BasicAuthenticationCredentials
@@ -1011,8 +1012,12 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
         pendingFileDownload = null
         thread {
             fileDownloader.download(pendingDownload, object : FileDownloader.FileDownloadListener {
-                override fun confirmDownload(fileName: String, userDownloadAction: UserDownloadAction) {
-                    val downloadConfirmationFragment = DownloadConfirmationFragment(fileName, userDownloadAction)
+                override fun confirmDownload(
+                    downloadFileData: NetworkFileDownloader.DownloadFileData,
+                    userDownloadAction: UserDownloadAction
+                ) {
+                    val downloadConfirmationFragment =
+                        DownloadConfirmationFragment(downloadFileData, userDownloadAction)
                     downloadConfirmationFragment.show(fragmentManager!!, DOWNLAOD_CONFIRM_TAG)
                 }
 
diff --git a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
index 04890db941c3..09d357ad48d6 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
@@ -19,19 +19,38 @@ package com.duckduckgo.app.browser
 import android.annotation.SuppressLint
 import android.app.Dialog
 import android.view.LayoutInflater
-import com.duckduckgo.app.browser.downloader.NetworkFileDownloader
+import android.view.View
+import com.duckduckgo.app.browser.downloader.NetworkFileDownloader.DownloadFileData
+import com.duckduckgo.app.browser.downloader.NetworkFileDownloader.UserDownloadAction
+import com.duckduckgo.app.global.view.gone
+import com.duckduckgo.app.global.view.show
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.android.synthetic.main.download_confirmation.view.*
 
-class DownloadConfirmationFragment(private val fileName: String, private val userDownloadAction: NetworkFileDownloader.UserDownloadAction) : BottomSheetDialogFragment() {
+class DownloadConfirmationFragment(
+    private val downloadFileData: DownloadFileData,
+    private val userDownloadAction: UserDownloadAction
+) : BottomSheetDialogFragment() {
 
     @SuppressLint("RestrictedApi")
     override fun setupDialog(dialog: Dialog, style: Int) {
         super.setupDialog(dialog, style)
         val view = LayoutInflater.from(context).inflate(R.layout.download_confirmation, null)
         dialog.setContentView(view)
+        setupViews(view)
+    }
 
-        view.download_message.text = getString(R.string.download_filename, fileName)
+    private fun setupViews(view: View) {
+        view.download_message.text =
+            getString(R.string.download_filename, downloadFileData.fileName)
+        view.replace.setOnClickListener {
+            userDownloadAction.acceptAndReplace()
+            dismiss()
+        }
+        view.keep_both.setOnClickListener {
+            userDownloadAction.accept()
+            dismiss()
+        }
         view.continue_download.setOnClickListener {
             userDownloadAction.accept()
             dismiss()
@@ -40,5 +59,13 @@ class DownloadConfirmationFragment(private val fileName: String, private val use
             userDownloadAction.cancel()
             dismiss()
         }
+
+        if (downloadFileData.alreadyDownloaded) {
+            view.already_downloaded_options.show()
+            view.continue_download.gone()
+        } else {
+            view.already_downloaded_options.gone()
+            view.continue_download.show()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt
index 2c67b0bde8d3..bd25628f0bb9 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt
@@ -51,7 +51,10 @@ class FileDownloader @Inject constructor(
     )
 
     interface FileDownloadListener {
-        fun confirmDownload(fileName: String, userDownloadAction: UserDownloadAction)
+        fun confirmDownload(
+            downloadFileData: NetworkFileDownloader.DownloadFileData,
+            userDownloadAction: UserDownloadAction
+        )
         fun downloadStarted()
         fun downloadFinished(file: File, mimeType: String?)
         fun downloadFailed(message: String)
diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
index e40973ebb379..32b1b221c6c9 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
@@ -23,24 +23,39 @@ import android.webkit.URLUtil
 import androidx.core.net.toUri
 import com.duckduckgo.app.browser.downloader.FileDownloader.FileDownloadListener
 import timber.log.Timber
+import java.io.File
 import javax.inject.Inject
 
 class NetworkFileDownloader @Inject constructor(private val context: Context) {
 
-    fun download(pendingDownload: FileDownloader.PendingFileDownload, callback: FileDownloadListener) {
+    fun download(
+        pendingDownload: FileDownloader.PendingFileDownload,
+        callback: FileDownloadListener
+    ) {
         val guessedFileName = guessFileName(pendingDownload)
-        callback.confirmDownload(guessedFileName, object : UserDownloadAction {
-            override fun accept() {
-                initiateDownload(pendingDownload, guessedFileName)
-            }
+        val alreadyDownloaded = File(pendingDownload.directory, guessedFileName).exists()
+        callback.confirmDownload(
+            DownloadFileData(guessedFileName, alreadyDownloaded),
+            object : UserDownloadAction {
+                override fun acceptAndReplace() {
+                    File(pendingDownload.directory, guessedFileName).delete()
+                    initiateDownload(pendingDownload, guessedFileName)
+                }
 
-            override fun cancel() {
-                Timber.i("Cancelled download for url ${pendingDownload.url}")
-            }
-        })
+                override fun accept() {
+                    initiateDownload(pendingDownload, guessedFileName)
+                }
+
+                override fun cancel() {
+                    Timber.i("Cancelled download for url ${pendingDownload.url}")
+                }
+            })
     }
 
-    private fun initiateDownload(pendingDownload: FileDownloader.PendingFileDownload, guessedFileName: String?) {
+    private fun initiateDownload(
+        pendingDownload: FileDownloader.PendingFileDownload,
+        guessedFileName: String?
+    ) {
         val request = DownloadManager.Request(pendingDownload.url.toUri()).apply {
             allowScanningByMediaScanner()
             addRequestHeader("Cookie", CookieManager.getInstance().getCookie(pendingDownload.url))
@@ -52,13 +67,17 @@ class NetworkFileDownloader @Inject constructor(private val context: Context) {
     }
 
     private fun guessFileName(pending: FileDownloader.PendingFileDownload): String {
-        val guessedFileName = URLUtil.guessFileName(pending.url, pending.contentDisposition, pending.mimeType)
+        val guessedFileName =
+            URLUtil.guessFileName(pending.url, pending.contentDisposition, pending.mimeType)
         Timber.i("Guessed filename of $guessedFileName for url ${pending.url}")
         return guessedFileName
     }
 
     interface UserDownloadAction {
         fun accept()
+        fun acceptAndReplace()
         fun cancel()
     }
+
+    class DownloadFileData(val fileName: String, val alreadyDownloaded: Boolean)
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_confirmation.xml b/app/src/main/res/layout/download_confirmation.xml
index 9fdef5049699..cd235e05f7a9 100644
--- a/app/src/main/res/layout/download_confirmation.xml
+++ b/app/src/main/res/layout/download_confirmation.xml
@@ -30,11 +30,79 @@
         android:layout_height="wrap_content"
         android:textColor="@android:color/black"
         android:textSize="16sp"
+        android:layout_marginBottom="16dp"
         custom:text="Save sample-file.pdf ?" />
 
+    <LinearLayout
+        android:id="@+id/already_downloaded_options"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:id="@+id/replace"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?attr/selectableItemBackground"
+            android:orientation="horizontal"
+            android:paddingLeft="10dp"
+            android:paddingTop="8dp"
+            android:paddingRight="10dp"
+            android:paddingBottom="8dp">
+
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginEnd="32dp"
+                android:src="@drawable/ic_refresh_24dp"
+                android:tint="#737373" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/replace"
+                android:textColor="@android:color/black"
+                android:textSize="16sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/keep_both"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?attr/selectableItemBackground"
+            android:orientation="horizontal"
+            android:paddingLeft="10dp"
+            android:paddingTop="8dp"
+            android:paddingRight="10dp"
+            android:paddingBottom="8dp">
+
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginEnd="32dp"
+                android:src="@android:drawable/ic_menu_save"
+                android:tint="#737373" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/keep_both"
+                android:textColor="@android:color/black"
+                android:textSize="16sp" />
+
+        </LinearLayout>
+
+
+    </LinearLayout>
 
     <LinearLayout
-        android:layout_marginTop="16dp"
         android:id="@+id/continue_download"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 91c7cd8554ab..e1adc18541f0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -150,6 +150,8 @@
     <string name="fireCancel">Cancel</string>
     <string name="fireContinue">Continue</string>
     <string name="download_filename">Save %1$s ?</string>
+    <string name="keep_both">Keep both</string>
+    <string name="replace">Replace</string>
     <string name="fireDataCleared">Data cleared</string>
     <string name="fireProcessName" translatable="false">:fire</string>
 

From c07fdab2bf5fc093bffd691eeb834f35abe9ef9a Mon Sep 17 00:00:00 2001
From: Prateek Jain <prateek.jain23995@yahoo.com>
Date: Thu, 26 Dec 2019 22:38:25 +0530
Subject: [PATCH 04/10] Giving user an option to open an already downloaded
 file

---
 app/src/main/AndroidManifest.xml              |  10 ++++
 .../browser/DownloadConfirmationFragment.kt   |  21 +++++++-
 .../downloader/NetworkFileDownloader.kt       |   7 +--
 .../res/drawable-hdpi/ic_menu_archive.png     | Bin 0 -> 1094 bytes
 .../res/drawable-mdpi/ic_menu_archive.png     | Bin 0 -> 831 bytes
 .../res/drawable-xhdpi/ic_menu_archive.png    | Bin 0 -> 1398 bytes
 .../res/drawable-xxhdpi/ic_menu_archive.png   | Bin 0 -> 2359 bytes
 .../main/res/layout/download_confirmation.xml |  45 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   2 +
 app/src/main/res/xml/provider_paths.xml       |  21 ++++++++
 10 files changed, 102 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_menu_archive.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_menu_archive.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_menu_archive.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_menu_archive.png
 create mode 100644 app/src/main/res/xml/provider_paths.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 17dafa24136f..cfd8093f60fe 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,6 +29,16 @@
             android:exported="false"
             tools:replace="android:authorities" />
 
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"/>
+        </provider>
+
         <!--
             To protect user privacy, disable SafeBrowsing which could send URLs to Google servers
             https://developer.android.com/reference/android/webkit/WebView
diff --git a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
index 09d357ad48d6..7c0023adffaa 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
@@ -18,8 +18,10 @@ package com.duckduckgo.app.browser
 
 import android.annotation.SuppressLint
 import android.app.Dialog
+import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
+import androidx.core.content.FileProvider.getUriForFile
 import com.duckduckgo.app.browser.downloader.NetworkFileDownloader.DownloadFileData
 import com.duckduckgo.app.browser.downloader.NetworkFileDownloader.UserDownloadAction
 import com.duckduckgo.app.global.view.gone
@@ -42,7 +44,11 @@ class DownloadConfirmationFragment(
 
     private fun setupViews(view: View) {
         view.download_message.text =
-            getString(R.string.download_filename, downloadFileData.fileName)
+            getString(R.string.download_filename, downloadFileData.file.name)
+        view.open_with.setOnClickListener {
+            openFile()
+            dismiss()
+        }
         view.replace.setOnClickListener {
             userDownloadAction.acceptAndReplace()
             dismiss()
@@ -68,4 +74,17 @@ class DownloadConfirmationFragment(
             view.continue_download.show()
         }
     }
+
+    private fun openFile() {
+        val uri = getUriForFile(
+            context!!,
+            "${BuildConfig.APPLICATION_ID}.provider",
+            downloadFileData.file
+        )
+        val mime = activity?.contentResolver?.getType(uri)
+        val intent = Intent(Intent.ACTION_VIEW)
+        intent.setDataAndType(uri, mime)
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        startActivity(intent)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
index 32b1b221c6c9..fa7a0ca471a1 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
@@ -33,9 +33,10 @@ class NetworkFileDownloader @Inject constructor(private val context: Context) {
         callback: FileDownloadListener
     ) {
         val guessedFileName = guessFileName(pendingDownload)
-        val alreadyDownloaded = File(pendingDownload.directory, guessedFileName).exists()
+        val fileToDownload = File(pendingDownload.directory, guessedFileName)
+        val alreadyDownloaded = fileToDownload.exists()
         callback.confirmDownload(
-            DownloadFileData(guessedFileName, alreadyDownloaded),
+            DownloadFileData(fileToDownload, alreadyDownloaded),
             object : UserDownloadAction {
                 override fun acceptAndReplace() {
                     File(pendingDownload.directory, guessedFileName).delete()
@@ -79,5 +80,5 @@ class NetworkFileDownloader @Inject constructor(private val context: Context) {
         fun cancel()
     }
 
-    class DownloadFileData(val fileName: String, val alreadyDownloaded: Boolean)
+    class DownloadFileData(val file: File, val alreadyDownloaded: Boolean)
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_archive.png b/app/src/main/res/drawable-hdpi/ic_menu_archive.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2d9bc1a3c96d1f3b42520c3b7a8419968489ade
GIT binary patch
literal 1094
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877l!}s{b%+Ad7K3vk;OpT
z1B~5HX4`=T%L*LRfizez!?|}o;S3DSex5FlArXh)PCuV79V&3#{_~%l<4cZkdSp6k
zZV_eTa(c__7}_cS=m00@j?fP0orMlgj}F8isBaJ`cyNfZN{3zH$d;^?QH)uv8teg?
zj|G-5G&Ic2UB7pCzJ*2Uo3HCS%_mOqdLA2=fB#(iGwb~4Zx6}te(Ni=j@|eF>wxVO
z4zhe#JEECv&bQ{=XM_FASU65G#x0q#V_l-(?QXxOiLIONuHM`Ku73ZF@`Wzm4@;*1
zJn?&hZD`y|sX}EXGsYrwca!B-0oksH%8&b<(~(`2lG#6_@nz?ffCIcdN2jyjiJoj@
zXnHx!@WcdQ7)c&D!oyu<^ZUk`TZ#eGLnj><=xm!IaLV@G+fH-2Q*yj>=I_br)LzLj
z*QI~v<ll9>_D|^4-@NeTRoA~$v@Xr|)H$&5?`i>=pC2}Vyr$>;N4Wf@s%22Ve>tNx
zUlOBQ(Cp}G*J}=`l}hN&l6lLp>Bog!-Litrwn)4Di07vtwD}qx4Z7;q>z*?Ie&w1|
zHfJRo8Y~MRKmPRid+O2LwGPr%5w&Uk=T<O^{9ITkTz7<rp=aIf{A=I+=iRh@`g*^~
z4G%G)gph&=-E_X{mXD?r?jO=#YrcGWjrc6VJIxc`a#h}1`!{mUA6_X&4W;KbcRsVu
znH>1&y>O(L-0A15*%vdo9;gZ5p6nmp<fGM)v?cACjTm2>(yBnw65o9v;$-jlF6+79
zIH$BbboU*>(=Pe{WUl;ueylK2>$`04KHeSQ{FVmy*)=p--d6hT#3#G<z-&3ATT^bb
zJ^lXYoY<Ss$)Yo}?LsR8E|f57o>2X}^w^`dl9#KEkC%GAozAt$@fTMB*Oy<Dr%E&k
zcwF3T_cMoYdYHoM#-FDa*DO>#VzPU}p1K*^XI*%`jX^-~^>_21%vT;LNtW0d=A8PJ
z$Dy+MT=dP|F58XyD!iB19$%xh+(zr^EdhtB-~~#{U+HvsU4PHVB;#>1G+cd}!*2KE
zd`v7)d}dGe4|{1jyNqXn#M+b7eb?=i`6gy`OKY3z1y<evsak(O|CL;#rm@Q4`Q}fj
ziuTW+C+^E~IAgiW-o8C&uD{lqlX0|GoYU*^rth;%S57uCnX&#;bxGal{|R#r`{ciO
zKdG~$`y<1rEe!J7nSxr2oEp;}aor4?{(}2^-{13Z<fRpo-%j{@sR@|PR7+eVN>UO_
zQmvAUQh^kMk%6J1u7RPhkwu7+k(G(Lm8r3=frXWU!4kislPDT;^HVa@DsgMLDtxLG
xs6i5BLvVgtNqJ&XDuZK6ep0G}XKrG8YEWuoN@d~6R2!fo22WQ%mvv4FO#njD-yi@0

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_menu_archive.png b/app/src/main/res/drawable-mdpi/ic_menu_archive.png
new file mode 100644
index 0000000000000000000000000000000000000000..49ac569dc2bb8062b66b2e1341d3ad399eb11931
GIT binary patch
literal 831
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE)4(M`_JqL@;D1TB8!2v
z2N=7Z%(epwmK8Xr18D^?ZvQoBE>N4hr;B5V$MLIE_GXJD3bfC!ydQghcejubw<GhS
zl`Me*AtDFE1doP@O>z?POxFG<92V8lx;2y~S7h;uaE&CMBl<o`Ek|k`10Kb`E86|O
z&-I&Lb!Xajw~}QyQp=ysym{Z+`osO%I`KuDmYh<IV=7>DS2tg>s(wAQW!mn-lgB3-
zyl9(HYqdr1fOA0CUHAO*d@iTRXPRNB?;U+BuQo&8Y|TG`Tvi4TyF1cbSf!W`BpyC}
z`xjsF`V|wWU4MDtNI)k`=d3=5^|l2Q*4ftW^ssx_x+BAzeWOI%il2-0Sj(3_4tgK6
zAz0{Rm$`N9&cjM<u9-_4MOj=AG=2MFyL-YkhNIs~zS$=fHecJil(|9m<@)ox+`5?V
zNinXK{d<nD-uv$2LlTL?0*vyDKN~-{y47=eYSU`}*u$6Krk`U|(=X3%zApJ)XyLMu
zn{#(x_1m%Pt?4o?sVe5rIwt;%Jxcu9>Rdajo&?$STnM-MT~ib%Ev2#V%AM$P)BdU?
z55vaijeYlyOI;2~SiFamD{X(jSCm!QM*n?=Y^!=5ol+8BdgL+d`8K5PTxxPKhDqT-
zb>H(7ADFd0PEK_%*k|(mKtS(0(e9>OAq|0V4lpGPTw>u+jNUxOU2vIiX4gu$m!gTr
zkt};IoD9s0T{Md!<z8G@WlSQ=J}+<f$j!R;Z!TM^Iht}_$dS|h71e$`a)%`Iqu!R~
za<lB5SIuxQbz7hxCnv`hvfpQp){n#~T1%7O?v}J$+i~s0iH(+vc_yt7(S9KOXJ*a*
zr+**molgAY{7v{dkL;V$gIg~E)0S$9YeY#(Vo9o1a#1RfVlXl=G}JXP)HSjQF*33;
zF}E@`)-|xOGB8-;S9B6ZLvDUbW?Cg~4OfLvl>#+Lf@}!RPb(=;EJ|f?Ovz75Rq)JB
bOiv9;O-!jQJeg_(RK(!v>gTe~DWM4f2U}0P

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_archive.png b/app/src/main/res/drawable-xhdpi/ic_menu_archive.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1be9d5b98a60e3a61125a140ce57e4bb91a4234
GIT binary patch
literal 1398
zcmZ{kdpHw%7{`CMX-v!AL&9RZ&@?0WX4vGG%h0A#F58q#la}!$#_3EsF5^Lkm^vhp
zr<^I|ehJkH$z@Ki2PK!HN0M>Y`S1L3{`h`B&-*^__xb+!-tcrkfkf;@005BAPDHYV
zgrAauNgM>$`AQrT?0SL-c2Y85HA^PhC?~&55<2}W$DVNf&t*)MU8sbFf3>i-5eNV*
z!I^01b8dX;)*F^4N##W|i#dElc_zoy*%jhdVvx(<@G>CTqY`9g(R&2r3Q<!nRk;MG
z!e>#$X`RWA+t6ghwQ_?B*lFS+sR15A@z6;T+C4(~#k%M*XMAR|<6>|%rywnQm1A^f
zW%*TTlgZlLYlzn6L9Y|(x}F{LN6h?gLZB9;_Rmlq4!<*#e8npQ3O=;U?&b};`IL;s
zw<}H{lHPu%&FH7yy<gP|Q93)+Uz+eVq)iRjO^Zt%<mIo%J`G1J*iClp-U&EToL5J`
z@E&6S3$#~yk9D<+Qz;~W-xj)B+cjezLlwmMARRS!L-!o<4Nfp0vh_S(WSyNOu7(R|
zQUOvLsY><dy04C<#0ug?+%Q-3O5(2T=;Uro4!y6LHKUFupVvDWR+A3gzTM(vuOKbt
zFIU$f?#R&1dgFcrpk=je`;VQ?MhoR2H5nOmZ2w-i2SD(68{!7M)r0*du30|4w1oll
z*ZvQ?`_)j-n9^OE(Pi=i{+vcCe)&6U`0`-G=;SGJl>)qc>5jHemP&}imyD0pZ+9`E
zl~REu=3qOf`TSrC?@EP>9E`|(u&*@<(KuJFs=-Wbb=;S~X3@OfA`*{@?eoge@MIW}
zk$L;|yFuQ&D9Q*nMNvS@$msr%x0G*iz*}LGtO-}&J9Br(H6z{__xBoJ&q#Ur;KL-t
zn}s!N7bvPpK$sTtr1#xHWse`&A7PDtUm4D+kKI(098i5!a^fs{JNRhLeg+1v%#Zl+
z20@)46BgCN0uS9T`PA7|WL%oYuN{h$>Q8gK(!E~h!i7aR!upO)<mh<d+XTlKDM>hB
zq;6C%ciy{3$XGf}y}F{<rSyK9=9VOlz@PM))F%@(0jjFYRVi^)@$qOPFWYZZKhxL6
zR%kg)8}^`B(rk(>NOV;I9=X)3oLyhF^+W+EyRKr3qSP2U@V3zjy3l}|JuK7`<%6&p
zQ(vYyqHu&Mqd+({Xs+MWW3K}-*W2~^sCY3Qt*zQ%$Spb7Mn~kVu8wupMuCl!xN(yk
zUQ>;~r$rLk{VBsW1mur+Z#kGi*Xj8rVX<(#cC$LGOI5yZIk#)4fJcyu4KPS4hE^VJ
zJ$&4I-~m-_38xDo#6H{}%TpoP`qqsU3~kTZJs+PsAUiTJ)gVPM*o>DAXO`6K<%ZR1
zki_na0g$#zw>avho8HzS0$vX^xJ}3Wqgb;X{U>k;sxL6VTrkpbJ;3`D0jQ&EO#KL=
zfcIBdxID1od&)Jy&_gArIAaft;4s*UtFnGMU$CqNxFFl>EUUZzwrxK<-%=gazxrrX
zrER#Swai6{vJC6hTcnGhZ)_D~@E;d<@i8#kuO<2pl+^4`?&-po@U&~N{aSM3ic6uo
zV0cic=!`S{0PWTo2u$TCuFm^+ay%2uVaEAJKGDldl@kll&Oe**nQ+CYO^Sebp@;G%
zoy>J8NcAH9rMKLNmv6_2u(PW+W|f?mN&($M%xH}8UWV0^`#VxET2SiuzAj8iUXnhW
zL}k;1*bJ+XXods;hc!0FU`;VNGasy_mB}$H6B7*9+zN}8*Lzg=pFkvwex4ck|AB-A
xHEBse<7b06i^=8$MKgdMofXVLIY$PCGRTY|dfdexhK=M1IFsCokL&}J{{co^R(Jpa

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_archive.png b/app/src/main/res/drawable-xxhdpi/ic_menu_archive.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2d93b9f00ba97aaa5cbaaf99fd89e908c5c302c
GIT binary patch
literal 2359
zcmbVMYgkg*8s3PvOv|#2My)Mnc2Qu1h%yoqNST)uDJZo>*eVhifdX+R8A~V2ZsTN4
zJ<-K(YNe*7j%GMBS!#}UoGGg*=;~4Hc+_(=Q*$<zo%5qJKhAodz1RBI`rh}uu9X`V
zxzfqu3kLuIoI+QzILMq}`Rr|x|I@>o0A!l04&kd~<Vk9cKnVj3kvtIwL#2Xbm;(z$
z>1j=H5CEW)#9Y3b9}!L!%B47gMF*#qDiAaP1ktq$flvag!9+M&ETdujYOiBKv51D{
zks}BZ3MQN)UZqpQF}g^uP$v-vim>$MV33xI5J+LQ0Mtr1%T!b?4f~##imWZ$cr5r{
zMJ=IWKRCsYhys~%B@B{r1YaS+p8)zpIEds&p-_B4A^{@c2}C?Z^o1x?5|K(EfFB1I
zv8EIyQ8_I3M_Y(Q!=|X!3MwA2(P(fQ5>Bp6#zTRDfff!T(HGJ1Ri(?+0<Eu1wP2Eg
z1*?Qgu|h4D%RmdGAW^<WO~WFdeh5LTh=}+^EK_|<6p}K$R-nK`I09ZOwZ!#aTczf}
z|8e89+A40k0>*P-m3)g*h}0u#!6X>T-CrBBC?eia*C@qEQ3RV=a^V&!EK`TFXjtR~
zClZUO1So(2K@>j%g-GxZfROP0n1N&>gGFMJ87o$hCpkWcC5HI<lgTV5k>t;Upb)|e
z$dAbg@MEz9SZx0lfuu=ns7$36$b|5uT`^*p7(!x_$bkWWiKQ}?us|(Wa^>>PlN}J1
zB3H{*DRKqKj3I*&0-;!DkuBx<5G@N<inqcdwo)zy-{+Sq{)~M}2$>iV;>TvQ{#V=|
zu%iDbXL!UJyrnt*t63(ukPfsgKeaw0e7Zca47o8%<Z3*uc##PJHp!tZ23Pyw)iK5@
z;Y!R+@7BvnC6B7t<v)6GkW-ehK7)U&fz!)aoK>ZDt`j%pQ?Bh^to^6Cbvv)$%;?9K
zoDjuZ+hpvw{pCTt@KnL6hw8#^+0)dHzT?Nt9R>dg+xXJ!=*T-lUAkxA3wWEnexzRh
z(rYhwsTV&xe>;i**cuZ7NBs=|1MEg5S9Aj4V`~KXj(XH-lUae$xSbCw>wd5?dSp*?
z-<jXcl!p&}^rh$hV$xjAM>5aMZ1*tkyWCGd%Mo^5sXwXAlAOJ~`rb%b^pX9&u2>0B
z74H7*;GWEL<>lokOH11d@K-A;7Bt?x*>YZ|f4p*&U-+Eki?2XNN4>J<T0D>Et;@)e
z)|9ohgw3$G4vLM9Jy+>gIIy#M%^6#BVd6EyxsD}lHhV|IbK2RBQBA;RZbn9JiddW$
zb7e#QzjmTJFO-)<Lj0Q}x^E7lIu{>r^QM0J<&&?|pNE+s;3zpL$fvovd0unx`1iVo
zE=ME#_j~tt8w~TfeJzLTe{XW~b#R(CZC6oIkzK#my<xrAzq9Zu5>1?fQGP4T7p1+n
z@s7!a&&kOl*w5#ToD4qD7brE%*h!OyN3qdpH1Oo$k^=))vsf>yiYlFVuBq%nMTLZ9
zV>~=&ySTVGWxpBg=!hw=t#vz<%57ZOy8)&Dv9`A3jPr)rSeMq;R`N_^@`E2vaAqMD
z(1kT&g3)Vr#--#Z83(>oQrL!e%A#pMSN4R(qWs9@+!VjJyeW^%?8hQS<6-M>+e`by
z>yE~8rh*v9Q~l7f>IIvA^mZT}y0BU!f=UkOdDfpJUUWAO3=sX3mBS}ZeZyQHPa=6X
z$JO<hJ9qB1&CH6mindFDVK0vgFjZ3%XXx%0Gh%(+=64j&TSMJ#_#yW?x5wrQn#bdj
zXl9v2QgU_A^oymXKfB*7(s|08t2w|MV?b_kW?`*hb#!vW7$!WDpYEPeJ?as8uHtNA
zAyWdVRI1LgC7S8qqxo@hw>u}4)u;aUPP|0BeHNweKpL9U`R!`d!kJUbYie?PB>waX
zBHi;vk-e7QBqBBrnd-*dmI0?zUo74?Tg`7gFMXEZmA`eB$lB3kiCse3#M=1y_zkA<
z!NEaA)5QLFbj}?4K`S85k^1z}uB6wkZBBh%nY=AsHo>4XkQNm6<U(<AvEJ@<i8&8*
z8P#r30y)#`9^SoMu#sO<((Y>Qxu|veS)9vOtLm=d(fgw{1KWm7!`oT_>;ZeLY1UtK
z;SQB>l1KN&b-sG#Q(XGEYuigFz}s}m`rhE1Hvzb722vV1y>OboVf?vyS=eCy93ThC
zL&e!CPPiL~hWs0Wyn(8(mT!7Hml!|WA=`PX7woem_Ym_1@P~|2u(!5zbVg!QQX}T8
z?ACe7Q-Y<^i=CaFMpfMK{joR_y$#t+k35XsR9;!R!<%0z9ozh!e6<yH%#HqR3dhlT
z_98?C{(i}=scO!B_ZGm%p@~vavB@#`n|BLFwl)I0g5JVF53pmde$P)!_pe%*wHCZ(
zd)*a5IR+mat~lNjhzUl$rlZTiaF)$>#$m$+%Sr2_%>BLTnBcw5<k2Qz09<Htbct@C
zhc1g=ha7_wLlfBtRgm5%`;2!^wtc}XI{Ma~v388UmOl6gFAp{A*Rh}~-E!Lmr{K<>
zk=wVYB)<%7n=u{{8JYTe8^_Jq8|rQ16#W)@mHznam>Xlg-8arp?cQo-j7hDHFS%}b
z=Q)-c3^^2i>s{l1c$q%$)tKF$#98Z5PrH(bR5Zq2fS+o4!O-S)37>n+{JZC)Y=Jr(
UJt&%6U;vO28WPF6v?3wvPlBhnNdN!<

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/download_confirmation.xml b/app/src/main/res/layout/download_confirmation.xml
index cd235e05f7a9..96f5157609c6 100644
--- a/app/src/main/res/layout/download_confirmation.xml
+++ b/app/src/main/res/layout/download_confirmation.xml
@@ -39,6 +39,51 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
+        <RelativeLayout
+            android:id="@+id/open_with"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?attr/selectableItemBackground"
+            android:orientation="horizontal"
+            android:paddingLeft="10dp"
+            android:paddingTop="8dp"
+            android:paddingRight="10dp"
+            android:paddingBottom="8dp">
+
+            <ImageView
+                android:id="@+id/open_with_icon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginEnd="32dp"
+                android:layout_alignParentStart="true"
+                android:layout_centerInParent="true"
+                android:src="@drawable/ic_menu_archive"
+                android:tint="#737373" />
+
+            <TextView
+                android:layout_toEndOf="@id/open_with_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/open_with"
+                android:textColor="@android:color/black"
+                android:id="@+id/open_with_text"
+                android:textSize="16sp" />
+            <TextView
+                android:layout_below="@+id/open_with_text"
+                android:layout_toEndOf="@id/open_with_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/file_already_downloaded"
+                android:textColor="@color/brownishGray"
+                android:textSize="12sp" />
+
+        </RelativeLayout>
+
+
         <LinearLayout
             android:id="@+id/replace"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e1adc18541f0..ef0100b410e8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -152,6 +152,8 @@
     <string name="download_filename">Save %1$s ?</string>
     <string name="keep_both">Keep both</string>
     <string name="replace">Replace</string>
+    <string name="open_with">Open with…</string>
+    <string name="file_already_downloaded">File already downloaded</string>
     <string name="fireDataCleared">Data cleared</string>
     <string name="fireProcessName" translatable="false">:fire</string>
 
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
new file mode 100644
index 000000000000..b35839ef1254
--- /dev/null
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path
+        name="external_files"
+        path="." />
+</paths>
\ No newline at end of file

From bcd38108d08f29b70383e93bd7449e70e0f63f68 Mon Sep 17 00:00:00 2001
From: Prateek Jain <prateek.jain23995@yahoo.com>
Date: Thu, 26 Dec 2019 23:12:59 +0530
Subject: [PATCH 05/10] Creating download manager to determine when to download
 file

---
 .../app/browser/BrowserTabFragment.kt         | 74 +++++++++++++++----
 .../browser/DownloadConfirmationFragment.kt   | 21 ++++--
 .../app/browser/downloader/FileDownloader.kt  | 11 +--
 .../downloader/NetworkFileDownloadManager.kt  | 66 +++++++++++++++++
 .../downloader/NetworkFileDownloader.kt       | 43 +----------
 5 files changed, 150 insertions(+), 65 deletions(-)
 create mode 100644 app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloadManager.kt

diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
index 1353a7e15768..1108787111f9 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -23,7 +23,11 @@ import android.annotation.SuppressLint
 import android.app.Activity.RESULT_OK
 import android.app.ActivityOptions
 import android.appwidget.AppWidgetManager
-import android.content.*
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.media.MediaScannerConnection
@@ -33,13 +37,27 @@ import android.os.Bundle
 import android.os.Environment
 import android.os.Handler
 import android.text.Editable
-import android.view.*
-import android.view.View.*
+import android.view.ContextMenu
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.View.GONE
+import android.view.View.OnFocusChangeListener
+import android.view.View.VISIBLE
+import android.view.View.inflate
+import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
-import android.webkit.*
+import android.webkit.ValueCallback
+import android.webkit.WebChromeClient
+import android.webkit.WebSettings
+import android.webkit.WebView
 import android.webkit.WebView.FindListener
 import android.webkit.WebView.HitTestResult
-import android.webkit.WebView.HitTestResult.*
+import android.webkit.WebView.HitTestResult.IMAGE_TYPE
+import android.webkit.WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
+import android.webkit.WebView.HitTestResult.UNKNOWN_TYPE
+import android.webkit.WebViewDatabase
 import android.widget.EditText
 import android.widget.TextView
 import androidx.annotation.AnyThread
@@ -53,17 +71,28 @@ import androidx.core.view.isNotEmpty
 import androidx.core.view.isVisible
 import androidx.core.view.postDelayed
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.*
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.Observer
+import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.duckduckgo.app.autocomplete.api.AutoCompleteApi.AutoCompleteSuggestion
 import com.duckduckgo.app.bookmarks.ui.EditBookmarkDialogFragment
-import com.duckduckgo.app.browser.BrowserTabViewModel.*
+import com.duckduckgo.app.browser.BrowserTabViewModel.AutoCompleteViewState
+import com.duckduckgo.app.browser.BrowserTabViewModel.BrowserViewState
+import com.duckduckgo.app.browser.BrowserTabViewModel.Command
+import com.duckduckgo.app.browser.BrowserTabViewModel.CtaViewState
+import com.duckduckgo.app.browser.BrowserTabViewModel.FindInPageViewState
+import com.duckduckgo.app.browser.BrowserTabViewModel.GlobalLayoutViewState
+import com.duckduckgo.app.browser.BrowserTabViewModel.LoadingViewState
+import com.duckduckgo.app.browser.BrowserTabViewModel.OmnibarViewState
 import com.duckduckgo.app.browser.autocomplete.BrowserAutoCompleteSuggestionsAdapter
 import com.duckduckgo.app.browser.downloader.FileDownloadNotificationManager
 import com.duckduckgo.app.browser.downloader.FileDownloader
 import com.duckduckgo.app.browser.downloader.FileDownloader.PendingFileDownload
-import com.duckduckgo.app.browser.downloader.NetworkFileDownloader
-import com.duckduckgo.app.browser.downloader.NetworkFileDownloader.UserDownloadAction
+import com.duckduckgo.app.browser.downloader.NetworkFileDownloadManager.DownloadFileData
+import com.duckduckgo.app.browser.downloader.NetworkFileDownloadManager.UserDownloadAction
 import com.duckduckgo.app.browser.filechooser.FileChooserIntentBuilder
 import com.duckduckgo.app.browser.model.BasicAuthenticationCredentials
 import com.duckduckgo.app.browser.model.BasicAuthenticationRequest
@@ -77,13 +106,23 @@ import com.duckduckgo.app.browser.tabpreview.WebViewPreviewPersister
 import com.duckduckgo.app.browser.ui.HttpAuthenticationDialogFragment
 import com.duckduckgo.app.browser.useragent.UserAgentProvider
 import com.duckduckgo.app.cta.ui.Cta
-import com.duckduckgo.app.cta.ui.HomePanelCta
 import com.duckduckgo.app.cta.ui.CtaViewModel
 import com.duckduckgo.app.cta.ui.DaxBubbleCta
 import com.duckduckgo.app.cta.ui.DaxDialogCta
+import com.duckduckgo.app.cta.ui.HomePanelCta
 import com.duckduckgo.app.global.ViewModelFactory
 import com.duckduckgo.app.global.device.DeviceInfo
-import com.duckduckgo.app.global.view.*
+import com.duckduckgo.app.global.view.NonDismissibleBehavior
+import com.duckduckgo.app.global.view.TextChangedWatcher
+import com.duckduckgo.app.global.view.gone
+import com.duckduckgo.app.global.view.hide
+import com.duckduckgo.app.global.view.hideKeyboard
+import com.duckduckgo.app.global.view.isDifferent
+import com.duckduckgo.app.global.view.isImmersiveModeEnabled
+import com.duckduckgo.app.global.view.renderIfChanged
+import com.duckduckgo.app.global.view.show
+import com.duckduckgo.app.global.view.showKeyboard
+import com.duckduckgo.app.global.view.toggleFullScreen
 import com.duckduckgo.app.privacy.model.PrivacyGrade
 import com.duckduckgo.app.privacy.renderer.icon
 import com.duckduckgo.app.privacy.store.PrivacySettingsStore
@@ -97,15 +136,22 @@ import com.duckduckgo.app.widget.ui.AddWidgetInstructionsActivity
 import com.duckduckgo.widget.SearchWidgetLight
 import com.google.android.material.snackbar.Snackbar
 import dagger.android.support.AndroidSupportInjection
-import kotlinx.android.synthetic.main.include_dax_dialog_cta.*
 import kotlinx.android.synthetic.main.fragment_browser_tab.*
 import kotlinx.android.synthetic.main.include_cta_buttons.view.*
+import kotlinx.android.synthetic.main.include_dax_dialog_cta.*
 import kotlinx.android.synthetic.main.include_find_in_page.*
 import kotlinx.android.synthetic.main.include_new_browser_tab.*
 import kotlinx.android.synthetic.main.include_omnibar_toolbar.*
 import kotlinx.android.synthetic.main.include_omnibar_toolbar.view.*
 import kotlinx.android.synthetic.main.popup_window_browser_menu.view.*
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.jetbrains.anko.longToast
 import org.jetbrains.anko.share
 import timber.log.Timber
@@ -1013,7 +1059,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
         thread {
             fileDownloader.download(pendingDownload, object : FileDownloader.FileDownloadListener {
                 override fun confirmDownload(
-                    downloadFileData: NetworkFileDownloader.DownloadFileData,
+                    downloadFileData: DownloadFileData,
                     userDownloadAction: UserDownloadAction
                 ) {
                     val downloadConfirmationFragment =
diff --git a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
index 7c0023adffaa..0b73448b8ec3 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
@@ -18,16 +18,19 @@ package com.duckduckgo.app.browser
 
 import android.annotation.SuppressLint
 import android.app.Dialog
+import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
+import android.widget.Toast
 import androidx.core.content.FileProvider.getUriForFile
-import com.duckduckgo.app.browser.downloader.NetworkFileDownloader.DownloadFileData
-import com.duckduckgo.app.browser.downloader.NetworkFileDownloader.UserDownloadAction
+import com.duckduckgo.app.browser.downloader.NetworkFileDownloadManager.DownloadFileData
+import com.duckduckgo.app.browser.downloader.NetworkFileDownloadManager.UserDownloadAction
 import com.duckduckgo.app.global.view.gone
 import com.duckduckgo.app.global.view.show
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.android.synthetic.main.download_confirmation.view.*
+import timber.log.Timber
 
 class DownloadConfirmationFragment(
     private val downloadFileData: DownloadFileData,
@@ -82,9 +85,15 @@ class DownloadConfirmationFragment(
             downloadFileData.file
         )
         val mime = activity?.contentResolver?.getType(uri)
-        val intent = Intent(Intent.ACTION_VIEW)
-        intent.setDataAndType(uri, mime)
-        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-        startActivity(intent)
+
+        try {
+            val intent = Intent(Intent.ACTION_VIEW)
+            intent.setDataAndType(uri, mime)
+            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            startActivity(intent)
+        } catch (e: ActivityNotFoundException) {
+            Timber.e(e,"No suitable activity found")
+            Toast.makeText(activity, "Can't open file", Toast.LENGTH_SHORT).show()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt
index bd25628f0bb9..bc433cac6d53 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt
@@ -19,13 +19,14 @@ package com.duckduckgo.app.browser.downloader
 import android.os.Environment
 import android.webkit.URLUtil
 import androidx.annotation.WorkerThread
-import com.duckduckgo.app.browser.downloader.NetworkFileDownloader.UserDownloadAction
+import com.duckduckgo.app.browser.downloader.NetworkFileDownloadManager.DownloadFileData
+import com.duckduckgo.app.browser.downloader.NetworkFileDownloadManager.UserDownloadAction
 import java.io.File
 import javax.inject.Inject
 
 class FileDownloader @Inject constructor(
     private val dataUriDownloader: DataUriDownloader,
-    private val networkDownloader: NetworkFileDownloader
+    private val networkFileDownloadManager: NetworkFileDownloadManager
 ) {
 
     @WorkerThread
@@ -36,9 +37,9 @@ class FileDownloader @Inject constructor(
         }
 
         when {
-            URLUtil.isNetworkUrl(pending.url) -> networkDownloader.download(pending, callback)
+            URLUtil.isNetworkUrl(pending.url) -> networkFileDownloadManager.download(pending, callback)
             URLUtil.isDataUrl(pending.url) -> dataUriDownloader.download(pending, callback)
-            else -> callback?.downloadFailed("Not supported")
+            else -> callback.downloadFailed("Not supported")
         }
     }
 
@@ -52,7 +53,7 @@ class FileDownloader @Inject constructor(
 
     interface FileDownloadListener {
         fun confirmDownload(
-            downloadFileData: NetworkFileDownloader.DownloadFileData,
+            downloadFileData: DownloadFileData,
             userDownloadAction: UserDownloadAction
         )
         fun downloadStarted()
diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloadManager.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloadManager.kt
new file mode 100644
index 000000000000..03776cae862f
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloadManager.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2019 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.browser.downloader
+
+import android.webkit.URLUtil
+import timber.log.Timber
+import java.io.File
+import javax.inject.Inject
+
+
+class NetworkFileDownloadManager @Inject constructor(private val networkDownloader: NetworkFileDownloader) {
+
+    fun download(
+        pendingDownload: FileDownloader.PendingFileDownload,
+        callback: FileDownloader.FileDownloadListener
+    ) {
+        val guessedFileName = guessFileName(pendingDownload)
+        val fileToDownload = File(pendingDownload.directory, guessedFileName)
+        val alreadyDownloaded = fileToDownload.exists()
+        callback.confirmDownload(
+            DownloadFileData(fileToDownload, alreadyDownloaded),
+            object : UserDownloadAction {
+                override fun acceptAndReplace() {
+                    File(pendingDownload.directory, guessedFileName).delete()
+                    networkDownloader.download(pendingDownload)
+                }
+
+                override fun accept() {
+                    networkDownloader.download(pendingDownload)
+                }
+
+                override fun cancel() {
+                    Timber.i("Cancelled download for url ${pendingDownload.url}")
+                }
+            })
+    }
+
+    private fun guessFileName(pending: FileDownloader.PendingFileDownload): String {
+        val guessedFileName =
+            URLUtil.guessFileName(pending.url, pending.contentDisposition, pending.mimeType)
+        Timber.i("Guessed filename of $guessedFileName for url ${pending.url}")
+        return guessedFileName
+    }
+
+    interface UserDownloadAction {
+        fun accept()
+        fun acceptAndReplace()
+        fun cancel()
+    }
+
+    class DownloadFileData(val file: File, val alreadyDownloaded: Boolean)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
index fa7a0ca471a1..3a31bf3735cb 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
@@ -21,42 +21,14 @@ import android.content.Context
 import android.webkit.CookieManager
 import android.webkit.URLUtil
 import androidx.core.net.toUri
-import com.duckduckgo.app.browser.downloader.FileDownloader.FileDownloadListener
 import timber.log.Timber
-import java.io.File
 import javax.inject.Inject
 
 class NetworkFileDownloader @Inject constructor(private val context: Context) {
 
-    fun download(
-        pendingDownload: FileDownloader.PendingFileDownload,
-        callback: FileDownloadListener
-    ) {
+    fun download(pendingDownload: FileDownloader.PendingFileDownload) {
         val guessedFileName = guessFileName(pendingDownload)
-        val fileToDownload = File(pendingDownload.directory, guessedFileName)
-        val alreadyDownloaded = fileToDownload.exists()
-        callback.confirmDownload(
-            DownloadFileData(fileToDownload, alreadyDownloaded),
-            object : UserDownloadAction {
-                override fun acceptAndReplace() {
-                    File(pendingDownload.directory, guessedFileName).delete()
-                    initiateDownload(pendingDownload, guessedFileName)
-                }
 
-                override fun accept() {
-                    initiateDownload(pendingDownload, guessedFileName)
-                }
-
-                override fun cancel() {
-                    Timber.i("Cancelled download for url ${pendingDownload.url}")
-                }
-            })
-    }
-
-    private fun initiateDownload(
-        pendingDownload: FileDownloader.PendingFileDownload,
-        guessedFileName: String?
-    ) {
         val request = DownloadManager.Request(pendingDownload.url.toUri()).apply {
             allowScanningByMediaScanner()
             addRequestHeader("Cookie", CookieManager.getInstance().getCookie(pendingDownload.url))
@@ -67,18 +39,9 @@ class NetworkFileDownloader @Inject constructor(private val context: Context) {
         manager?.enqueue(request)
     }
 
-    private fun guessFileName(pending: FileDownloader.PendingFileDownload): String {
-        val guessedFileName =
-            URLUtil.guessFileName(pending.url, pending.contentDisposition, pending.mimeType)
+    private fun guessFileName(pending: FileDownloader.PendingFileDownload): String? {
+        val guessedFileName = URLUtil.guessFileName(pending.url, pending.contentDisposition, pending.mimeType)
         Timber.i("Guessed filename of $guessedFileName for url ${pending.url}")
         return guessedFileName
     }
-
-    interface UserDownloadAction {
-        fun accept()
-        fun acceptAndReplace()
-        fun cancel()
-    }
-
-    class DownloadFileData(val file: File, val alreadyDownloaded: Boolean)
 }
\ No newline at end of file

From 0c592544f00d8ab184ce4e31068c6ec1b2f3baaf Mon Sep 17 00:00:00 2001
From: Prateek Jain <prateek.jain23995@yahoo.com>
Date: Sat, 15 Feb 2020 15:49:24 +0530
Subject: [PATCH 06/10] updating download popup icons and layout as per
 prescribed design

---
 .../app/browser/BrowserTabFragment.kt         |   4 +-
 .../browser/DownloadConfirmationFragment.kt   |  39 +--
 .../app/global/view/TextViewExtension.kt      |  25 ++
 .../res/drawable-hdpi/ic_menu_archive.png     | Bin 1094 -> 0 bytes
 .../res/drawable-mdpi/ic_menu_archive.png     | Bin 831 -> 0 bytes
 .../res/drawable-xhdpi/ic_menu_archive.png    | Bin 1398 -> 0 bytes
 .../res/drawable-xxhdpi/ic_menu_archive.png   | Bin 2359 -> 0 bytes
 ..._browsnish_24dp.xml => ic_cancel_24dp.xml} |   0
 app/src/main/res/drawable/ic_file_24dp.xml    |  25 ++
 .../main/res/drawable/ic_keepboth_24dp.xml    |  25 ++
 app/src/main/res/drawable/ic_open_24dp.xml    |  25 ++
 app/src/main/res/drawable/ic_replace_24dp.xml |  25 ++
 .../main/res/layout/download_confirmation.xml | 236 ++++++------------
 .../main/res/layout/sheet_fire_clear_data.xml |   2 +-
 app/src/main/res/values/strings.xml           |   6 +-
 15 files changed, 228 insertions(+), 184 deletions(-)
 create mode 100644 app/src/main/java/com/duckduckgo/app/global/view/TextViewExtension.kt
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_menu_archive.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_menu_archive.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_menu_archive.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_menu_archive.png
 rename app/src/main/res/drawable/{ic_clear_browsnish_24dp.xml => ic_cancel_24dp.xml} (100%)
 create mode 100644 app/src/main/res/drawable/ic_file_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_keepboth_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_open_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_replace_24dp.xml

diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
index 1108787111f9..0f53e6b833a0 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -1064,7 +1064,9 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
                 ) {
                     val downloadConfirmationFragment =
                         DownloadConfirmationFragment(downloadFileData, userDownloadAction)
-                    downloadConfirmationFragment.show(fragmentManager!!, DOWNLAOD_CONFIRM_TAG)
+                    fragmentManager?.let {
+                        downloadConfirmationFragment.show(it, DOWNLAOD_CONFIRM_TAG)
+                    }
                 }
 
                 override fun downloadStarted() {
diff --git a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
index 0b73448b8ec3..a0d4817a893f 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
@@ -18,7 +18,6 @@ package com.duckduckgo.app.browser
 
 import android.annotation.SuppressLint
 import android.app.Dialog
-import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
@@ -27,6 +26,7 @@ import androidx.core.content.FileProvider.getUriForFile
 import com.duckduckgo.app.browser.downloader.NetworkFileDownloadManager.DownloadFileData
 import com.duckduckgo.app.browser.downloader.NetworkFileDownloadManager.UserDownloadAction
 import com.duckduckgo.app.global.view.gone
+import com.duckduckgo.app.global.view.leftDrawable
 import com.duckduckgo.app.global.view.show
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.android.synthetic.main.download_confirmation.view.*
@@ -47,7 +47,7 @@ class DownloadConfirmationFragment(
 
     private fun setupViews(view: View) {
         view.download_message.text =
-            getString(R.string.download_filename, downloadFileData.file.name)
+            getString(getMessageResource(), downloadFileData.file.name)
         view.open_with.setOnClickListener {
             openFile()
             dismiss()
@@ -56,10 +56,6 @@ class DownloadConfirmationFragment(
             userDownloadAction.acceptAndReplace()
             dismiss()
         }
-        view.keep_both.setOnClickListener {
-            userDownloadAction.accept()
-            dismiss()
-        }
         view.continue_download.setOnClickListener {
             userDownloadAction.accept()
             dismiss()
@@ -70,14 +66,24 @@ class DownloadConfirmationFragment(
         }
 
         if (downloadFileData.alreadyDownloaded) {
-            view.already_downloaded_options.show()
-            view.continue_download.gone()
+            view.open_with.show()
+            view.replace.show()
+            view.continue_download.text = getString(R.string.keep_both)
+            view.continue_download.leftDrawable(R.drawable.ic_keepboth_24dp)
         } else {
-            view.already_downloaded_options.gone()
-            view.continue_download.show()
+            view.open_with.gone()
+            view.replace.gone()
+            view.continue_download.text = getString(R.string.fireContinue)
+            view.continue_download.leftDrawable(R.drawable.ic_file_24dp)
+
         }
     }
 
+    private fun getMessageResource() =
+        if (downloadFileData.alreadyDownloaded) R.string.file_already_downloaded
+        else R.string.download_filename
+
+
     private fun openFile() {
         val uri = getUriForFile(
             context!!,
@@ -86,14 +92,15 @@ class DownloadConfirmationFragment(
         )
         val mime = activity?.contentResolver?.getType(uri)
 
-        try {
-            val intent = Intent(Intent.ACTION_VIEW)
-            intent.setDataAndType(uri, mime)
-            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        val intent = Intent(Intent.ACTION_VIEW)
+        intent.setDataAndType(uri, mime)
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        if (intent.resolveActivity(activity?.packageManager!!) != null) {
             startActivity(intent)
-        } catch (e: ActivityNotFoundException) {
-            Timber.e(e,"No suitable activity found")
+        } else {
+            Timber.e("No suitable activity found")
             Toast.makeText(activity, "Can't open file", Toast.LENGTH_SHORT).show()
+
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/global/view/TextViewExtension.kt b/app/src/main/java/com/duckduckgo/app/global/view/TextViewExtension.kt
new file mode 100644
index 000000000000..8857b91c039e
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/global/view/TextViewExtension.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020 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.global.view
+
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+
+
+fun TextView.leftDrawable(@DrawableRes id: Int = 0) {
+    this.setCompoundDrawablesWithIntrinsicBounds(id, 0, 0, 0)
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_archive.png b/app/src/main/res/drawable-hdpi/ic_menu_archive.png
deleted file mode 100644
index e2d9bc1a3c96d1f3b42520c3b7a8419968489ade..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1094
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877l!}s{b%+Ad7K3vk;OpT
z1B~5HX4`=T%L*LRfizez!?|}o;S3DSex5FlArXh)PCuV79V&3#{_~%l<4cZkdSp6k
zZV_eTa(c__7}_cS=m00@j?fP0orMlgj}F8isBaJ`cyNfZN{3zH$d;^?QH)uv8teg?
zj|G-5G&Ic2UB7pCzJ*2Uo3HCS%_mOqdLA2=fB#(iGwb~4Zx6}te(Ni=j@|eF>wxVO
z4zhe#JEECv&bQ{=XM_FASU65G#x0q#V_l-(?QXxOiLIONuHM`Ku73ZF@`Wzm4@;*1
zJn?&hZD`y|sX}EXGsYrwca!B-0oksH%8&b<(~(`2lG#6_@nz?ffCIcdN2jyjiJoj@
zXnHx!@WcdQ7)c&D!oyu<^ZUk`TZ#eGLnj><=xm!IaLV@G+fH-2Q*yj>=I_br)LzLj
z*QI~v<ll9>_D|^4-@NeTRoA~$v@Xr|)H$&5?`i>=pC2}Vyr$>;N4Wf@s%22Ve>tNx
zUlOBQ(Cp}G*J}=`l}hN&l6lLp>Bog!-Litrwn)4Di07vtwD}qx4Z7;q>z*?Ie&w1|
zHfJRo8Y~MRKmPRid+O2LwGPr%5w&Uk=T<O^{9ITkTz7<rp=aIf{A=I+=iRh@`g*^~
z4G%G)gph&=-E_X{mXD?r?jO=#YrcGWjrc6VJIxc`a#h}1`!{mUA6_X&4W;KbcRsVu
znH>1&y>O(L-0A15*%vdo9;gZ5p6nmp<fGM)v?cACjTm2>(yBnw65o9v;$-jlF6+79
zIH$BbboU*>(=Pe{WUl;ueylK2>$`04KHeSQ{FVmy*)=p--d6hT#3#G<z-&3ATT^bb
zJ^lXYoY<Ss$)Yo}?LsR8E|f57o>2X}^w^`dl9#KEkC%GAozAt$@fTMB*Oy<Dr%E&k
zcwF3T_cMoYdYHoM#-FDa*DO>#VzPU}p1K*^XI*%`jX^-~^>_21%vT;LNtW0d=A8PJ
z$Dy+MT=dP|F58XyD!iB19$%xh+(zr^EdhtB-~~#{U+HvsU4PHVB;#>1G+cd}!*2KE
zd`v7)d}dGe4|{1jyNqXn#M+b7eb?=i`6gy`OKY3z1y<evsak(O|CL;#rm@Q4`Q}fj
ziuTW+C+^E~IAgiW-o8C&uD{lqlX0|GoYU*^rth;%S57uCnX&#;bxGal{|R#r`{ciO
zKdG~$`y<1rEe!J7nSxr2oEp;}aor4?{(}2^-{13Z<fRpo-%j{@sR@|PR7+eVN>UO_
zQmvAUQh^kMk%6J1u7RPhkwu7+k(G(Lm8r3=frXWU!4kislPDT;^HVa@DsgMLDtxLG
xs6i5BLvVgtNqJ&XDuZK6ep0G}XKrG8YEWuoN@d~6R2!fo22WQ%mvv4FO#njD-yi@0

diff --git a/app/src/main/res/drawable-mdpi/ic_menu_archive.png b/app/src/main/res/drawable-mdpi/ic_menu_archive.png
deleted file mode 100644
index 49ac569dc2bb8062b66b2e1341d3ad399eb11931..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 831
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE)4(M`_JqL@;D1TB8!2v
z2N=7Z%(epwmK8Xr18D^?ZvQoBE>N4hr;B5V$MLIE_GXJD3bfC!ydQghcejubw<GhS
zl`Me*AtDFE1doP@O>z?POxFG<92V8lx;2y~S7h;uaE&CMBl<o`Ek|k`10Kb`E86|O
z&-I&Lb!Xajw~}QyQp=ysym{Z+`osO%I`KuDmYh<IV=7>DS2tg>s(wAQW!mn-lgB3-
zyl9(HYqdr1fOA0CUHAO*d@iTRXPRNB?;U+BuQo&8Y|TG`Tvi4TyF1cbSf!W`BpyC}
z`xjsF`V|wWU4MDtNI)k`=d3=5^|l2Q*4ftW^ssx_x+BAzeWOI%il2-0Sj(3_4tgK6
zAz0{Rm$`N9&cjM<u9-_4MOj=AG=2MFyL-YkhNIs~zS$=fHecJil(|9m<@)ox+`5?V
zNinXK{d<nD-uv$2LlTL?0*vyDKN~-{y47=eYSU`}*u$6Krk`U|(=X3%zApJ)XyLMu
zn{#(x_1m%Pt?4o?sVe5rIwt;%Jxcu9>Rdajo&?$STnM-MT~ib%Ev2#V%AM$P)BdU?
z55vaijeYlyOI;2~SiFamD{X(jSCm!QM*n?=Y^!=5ol+8BdgL+d`8K5PTxxPKhDqT-
zb>H(7ADFd0PEK_%*k|(mKtS(0(e9>OAq|0V4lpGPTw>u+jNUxOU2vIiX4gu$m!gTr
zkt};IoD9s0T{Md!<z8G@WlSQ=J}+<f$j!R;Z!TM^Iht}_$dS|h71e$`a)%`Iqu!R~
za<lB5SIuxQbz7hxCnv`hvfpQp){n#~T1%7O?v}J$+i~s0iH(+vc_yt7(S9KOXJ*a*
zr+**molgAY{7v{dkL;V$gIg~E)0S$9YeY#(Vo9o1a#1RfVlXl=G}JXP)HSjQF*33;
zF}E@`)-|xOGB8-;S9B6ZLvDUbW?Cg~4OfLvl>#+Lf@}!RPb(=;EJ|f?Ovz75Rq)JB
bOiv9;O-!jQJeg_(RK(!v>gTe~DWM4f2U}0P

diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_archive.png b/app/src/main/res/drawable-xhdpi/ic_menu_archive.png
deleted file mode 100644
index b1be9d5b98a60e3a61125a140ce57e4bb91a4234..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1398
zcmZ{kdpHw%7{`CMX-v!AL&9RZ&@?0WX4vGG%h0A#F58q#la}!$#_3EsF5^Lkm^vhp
zr<^I|ehJkH$z@Ki2PK!HN0M>Y`S1L3{`h`B&-*^__xb+!-tcrkfkf;@005BAPDHYV
zgrAauNgM>$`AQrT?0SL-c2Y85HA^PhC?~&55<2}W$DVNf&t*)MU8sbFf3>i-5eNV*
z!I^01b8dX;)*F^4N##W|i#dElc_zoy*%jhdVvx(<@G>CTqY`9g(R&2r3Q<!nRk;MG
z!e>#$X`RWA+t6ghwQ_?B*lFS+sR15A@z6;T+C4(~#k%M*XMAR|<6>|%rywnQm1A^f
zW%*TTlgZlLYlzn6L9Y|(x}F{LN6h?gLZB9;_Rmlq4!<*#e8npQ3O=;U?&b};`IL;s
zw<}H{lHPu%&FH7yy<gP|Q93)+Uz+eVq)iRjO^Zt%<mIo%J`G1J*iClp-U&EToL5J`
z@E&6S3$#~yk9D<+Qz;~W-xj)B+cjezLlwmMARRS!L-!o<4Nfp0vh_S(WSyNOu7(R|
zQUOvLsY><dy04C<#0ug?+%Q-3O5(2T=;Uro4!y6LHKUFupVvDWR+A3gzTM(vuOKbt
zFIU$f?#R&1dgFcrpk=je`;VQ?MhoR2H5nOmZ2w-i2SD(68{!7M)r0*du30|4w1oll
z*ZvQ?`_)j-n9^OE(Pi=i{+vcCe)&6U`0`-G=;SGJl>)qc>5jHemP&}imyD0pZ+9`E
zl~REu=3qOf`TSrC?@EP>9E`|(u&*@<(KuJFs=-Wbb=;S~X3@OfA`*{@?eoge@MIW}
zk$L;|yFuQ&D9Q*nMNvS@$msr%x0G*iz*}LGtO-}&J9Br(H6z{__xBoJ&q#Ur;KL-t
zn}s!N7bvPpK$sTtr1#xHWse`&A7PDtUm4D+kKI(098i5!a^fs{JNRhLeg+1v%#Zl+
z20@)46BgCN0uS9T`PA7|WL%oYuN{h$>Q8gK(!E~h!i7aR!upO)<mh<d+XTlKDM>hB
zq;6C%ciy{3$XGf}y}F{<rSyK9=9VOlz@PM))F%@(0jjFYRVi^)@$qOPFWYZZKhxL6
zR%kg)8}^`B(rk(>NOV;I9=X)3oLyhF^+W+EyRKr3qSP2U@V3zjy3l}|JuK7`<%6&p
zQ(vYyqHu&Mqd+({Xs+MWW3K}-*W2~^sCY3Qt*zQ%$Spb7Mn~kVu8wupMuCl!xN(yk
zUQ>;~r$rLk{VBsW1mur+Z#kGi*Xj8rVX<(#cC$LGOI5yZIk#)4fJcyu4KPS4hE^VJ
zJ$&4I-~m-_38xDo#6H{}%TpoP`qqsU3~kTZJs+PsAUiTJ)gVPM*o>DAXO`6K<%ZR1
zki_na0g$#zw>avho8HzS0$vX^xJ}3Wqgb;X{U>k;sxL6VTrkpbJ;3`D0jQ&EO#KL=
zfcIBdxID1od&)Jy&_gArIAaft;4s*UtFnGMU$CqNxFFl>EUUZzwrxK<-%=gazxrrX
zrER#Swai6{vJC6hTcnGhZ)_D~@E;d<@i8#kuO<2pl+^4`?&-po@U&~N{aSM3ic6uo
zV0cic=!`S{0PWTo2u$TCuFm^+ay%2uVaEAJKGDldl@kll&Oe**nQ+CYO^Sebp@;G%
zoy>J8NcAH9rMKLNmv6_2u(PW+W|f?mN&($M%xH}8UWV0^`#VxET2SiuzAj8iUXnhW
zL}k;1*bJ+XXods;hc!0FU`;VNGasy_mB}$H6B7*9+zN}8*Lzg=pFkvwex4ck|AB-A
xHEBse<7b06i^=8$MKgdMofXVLIY$PCGRTY|dfdexhK=M1IFsCokL&}J{{co^R(Jpa

diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_archive.png b/app/src/main/res/drawable-xxhdpi/ic_menu_archive.png
deleted file mode 100644
index a2d93b9f00ba97aaa5cbaaf99fd89e908c5c302c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2359
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
UJt&%6U;vO28WPF6v?3wvPlBhnNdN!<

diff --git a/app/src/main/res/drawable/ic_clear_browsnish_24dp.xml b/app/src/main/res/drawable/ic_cancel_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_clear_browsnish_24dp.xml
rename to app/src/main/res/drawable/ic_cancel_24dp.xml
diff --git a/app/src/main/res/drawable/ic_file_24dp.xml b/app/src/main/res/drawable/ic_file_24dp.xml
new file mode 100644
index 000000000000..4cba662ac5e8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_file_24dp.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (c) 2020 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8.83c0,-0.53 -0.21,-1.04 -0.59,-1.41l-4.83,-4.83c-0.37,-0.38 -0.88,-0.59 -1.41,-0.59L6,2zM13,8L13,3.5L18.5,9L14,9c-0.55,0 -1,-0.45 -1,-1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_keepboth_24dp.xml b/app/src/main/res/drawable/ic_keepboth_24dp.xml
new file mode 100644
index 000000000000..c24250c5f783
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keepboth_24dp.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (c) 2020 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14.59,2.59c-0.38,-0.38 -0.89,-0.59 -1.42,-0.59L6,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8.83c0,-0.53 -0.21,-1.04 -0.59,-1.41l-4.82,-4.83zM15,16h-2v2c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1v-2L9,16c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h2v-2c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v2h2c0.55,0 1,0.45 1,1s-0.45,1 -1,1zM13,8L13,3.5L18.5,9L14,9c-0.55,0 -1,-0.45 -1,-1z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_open_24dp.xml b/app/src/main/res/drawable/ic_open_24dp.xml
new file mode 100644
index 000000000000..3bc816b19c57
--- /dev/null
+++ b/app/src/main/res/drawable/ic_open_24dp.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (c) 2020 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,19H6c-0.55,0 -1,-0.45 -1,-1V6c0,-0.55 0.45,-1 1,-1h5c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-6c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v5c0,0.55 -0.45,1 -1,1zM14,4c0,0.55 0.45,1 1,1h2.59l-9.13,9.13c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L19,6.41V9c0,0.55 0.45,1 1,1s1,-0.45 1,-1V3h-6c-0.55,0 -1,0.45 -1,1z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_replace_24dp.xml b/app/src/main/res/drawable/ic_replace_24dp.xml
new file mode 100644
index 000000000000..3d38c55642db
--- /dev/null
+++ b/app/src/main/res/drawable/ic_replace_24dp.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (c) 2020 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15,1L4,1c-1.1,0 -2,0.9 -2,2v13c0,0.55 0.45,1 1,1s1,-0.45 1,-1L4,4c0,-0.55 0.45,-1 1,-1h10c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1zM15.59,5.59l4.83,4.83c0.37,0.37 0.58,0.88 0.58,1.41L21,21c0,1.1 -0.9,2 -2,2L7.99,23C6.89,23 6,22.1 6,21l0.01,-14c0,-1.1 0.89,-2 1.99,-2h6.17c0.53,0 1.04,0.21 1.42,0.59zM15,12h4.5L14,6.5L14,11c0,0.55 0.45,1 1,1z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_confirmation.xml b/app/src/main/res/layout/download_confirmation.xml
index 96f5157609c6..a33af92c558c 100644
--- a/app/src/main/res/layout/download_confirmation.xml
+++ b/app/src/main/res/layout/download_confirmation.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2019 DuckDuckGo
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 DuckDuckGo
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -15,197 +14,108 @@
   ~ limitations under the License.
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/tools"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/white"
-    android:orientation="vertical"
-    android:padding="16dp">
+    app:layout_behavior="@string/bottom_sheet_behavior">
 
 
     <TextView
         android:id="@+id/download_message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
+        android:fontFamily="sans-serif"
+        android:paddingStart="24dp"
+        android:paddingTop="17dp"
+        android:paddingEnd="24dp"
+        android:textColor="@color/grayishTwo"
         android:textSize="16sp"
-        android:layout_marginBottom="16dp"
-        custom:text="Save sample-file.pdf ?" />
+        android:textStyle="normal"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Save sample-file.pdf ?" />
+
 
     <LinearLayout
-        android:id="@+id/already_downloaded_options"
-        android:orientation="vertical"
+        android:id="@+id/download_actions"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintTop_toBottomOf="@id/download_message">
 
-        <RelativeLayout
+        <TextView
             android:id="@+id/open_with"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:clickable="true"
-            android:focusable="true"
             android:background="?attr/selectableItemBackground"
-            android:orientation="horizontal"
-            android:paddingLeft="10dp"
-            android:paddingTop="8dp"
-            android:paddingRight="10dp"
-            android:paddingBottom="8dp">
+            android:drawableStart="@drawable/ic_open_24dp"
+            android:drawablePadding="24dp"
+            android:fontFamily="sans-serif"
+            android:paddingStart="24dp"
+            android:paddingTop="24dp"
+            android:paddingEnd="24dp"
+            android:paddingBottom="17dp"
+            android:text="@string/open_with"
+            android:textColor="@color/brownishGray"
+            android:textSize="16sp"
+            android:textStyle="normal"
+            android:visibility="gone" />
 
-            <ImageView
-                android:id="@+id/open_with_icon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginEnd="32dp"
-                android:layout_alignParentStart="true"
-                android:layout_centerInParent="true"
-                android:src="@drawable/ic_menu_archive"
-                android:tint="#737373" />
-
-            <TextView
-                android:layout_toEndOf="@id/open_with_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/open_with"
-                android:textColor="@android:color/black"
-                android:id="@+id/open_with_text"
-                android:textSize="16sp" />
-            <TextView
-                android:layout_below="@+id/open_with_text"
-                android:layout_toEndOf="@id/open_with_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/file_already_downloaded"
-                android:textColor="@color/brownishGray"
-                android:textSize="12sp" />
-
-        </RelativeLayout>
-
-
-        <LinearLayout
+        <TextView
             android:id="@+id/replace"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:clickable="true"
-            android:focusable="true"
             android:background="?attr/selectableItemBackground"
-            android:orientation="horizontal"
-            android:paddingLeft="10dp"
-            android:paddingTop="8dp"
-            android:paddingRight="10dp"
-            android:paddingBottom="8dp">
+            android:drawableStart="@drawable/ic_replace_24dp"
+            android:drawablePadding="24dp"
+            android:fontFamily="sans-serif"
+            android:paddingStart="24dp"
+            android:paddingTop="24dp"
+            android:paddingEnd="24dp"
+            android:paddingBottom="17dp"
+            android:text="@string/replace"
+            android:textColor="@color/brownishGray"
+            android:textSize="16sp"
+            android:textStyle="normal"
+            android:visibility="gone" />
 
-            <ImageView
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginEnd="32dp"
-                android:src="@drawable/ic_refresh_24dp"
-                android:tint="#737373" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/replace"
-                android:textColor="@android:color/black"
-                android:textSize="16sp" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/keep_both"
+        <TextView
+            android:id="@+id/continue_download"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:clickable="true"
-            android:focusable="true"
             android:background="?attr/selectableItemBackground"
-            android:orientation="horizontal"
-            android:paddingLeft="10dp"
-            android:paddingTop="8dp"
-            android:paddingRight="10dp"
-            android:paddingBottom="8dp">
-
-            <ImageView
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginEnd="32dp"
-                android:src="@android:drawable/ic_menu_save"
-                android:tint="#737373" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/keep_both"
-                android:textColor="@android:color/black"
-                android:textSize="16sp" />
-
-        </LinearLayout>
-
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/continue_download"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        android:focusable="true"
-        android:background="?attr/selectableItemBackground"
-        android:orientation="horizontal"
-        android:paddingLeft="10dp"
-        android:paddingTop="8dp"
-        android:paddingRight="10dp"
-        android:paddingBottom="8dp">
-
-        <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginEnd="32dp"
-            android:src="@android:drawable/ic_menu_save"
-            android:tint="#737373" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:drawableStart="@drawable/ic_file_24dp"
+            android:drawablePadding="24dp"
+            android:fontFamily="sans-serif"
+            android:paddingStart="24dp"
+            android:paddingTop="24dp"
+            android:paddingEnd="24dp"
+            android:paddingBottom="17dp"
             android:text="@string/fireContinue"
-            android:textColor="@android:color/black"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/cancel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        android:focusable="true"
-        android:background="?attr/selectableItemBackground"
-        android:orientation="horizontal"
-        android:paddingLeft="10dp"
-        android:paddingTop="8dp"
-        android:paddingRight="10dp"
-        android:paddingBottom="8dp">
-
-        <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginEnd="32dp"
-            android:src="@android:drawable/ic_menu_close_clear_cancel"
-            android:tint="#737373" />
+            android:textColor="@color/brownishGray"
+            android:textSize="16sp"
+            android:textStyle="normal" />
 
         <TextView
-            android:layout_width="wrap_content"
+            android:id="@+id/cancel"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:background="?attr/selectableItemBackground"
+            android:drawableStart="@drawable/ic_cancel_24dp"
+            android:drawablePadding="24dp"
+            android:fontFamily="sans-serif"
+            android:paddingStart="24dp"
+            android:paddingTop="17dp"
+            android:paddingEnd="24dp"
+            android:paddingBottom="24dp"
             android:text="@string/fireCancel"
-            android:textColor="@android:color/black"
-            android:textSize="16sp" />
-
+            android:textColor="@color/brownishGray"
+            android:textSize="16sp"
+            android:textStyle="normal"
+            tools:ignore="UnusedAttribute" />
     </LinearLayout>
 
-
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sheet_fire_clear_data.xml b/app/src/main/res/layout/sheet_fire_clear_data.xml
index 5fab0b53f10b..6091d4e5d4db 100644
--- a/app/src/main/res/layout/sheet_fire_clear_data.xml
+++ b/app/src/main/res/layout/sheet_fire_clear_data.xml
@@ -48,7 +48,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
-        android:drawableStart="@drawable/ic_clear_browsnish_24dp"
+        android:drawableStart="@drawable/ic_cancel_24dp"
         android:drawablePadding="24dp"
         android:fontFamily="sans-serif"
         android:paddingStart="24dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ef0100b410e8..c09c31f0192c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -149,11 +149,11 @@
     <string name="fireClearAll">Clear All Tabs and Data</string>
     <string name="fireCancel">Cancel</string>
     <string name="fireContinue">Continue</string>
-    <string name="download_filename">Save %1$s ?</string>
+    <string name="download_filename">Save %1$s</string>
     <string name="keep_both">Keep both</string>
     <string name="replace">Replace</string>
-    <string name="open_with">Open with…</string>
-    <string name="file_already_downloaded">File already downloaded</string>
+    <string name="open_with">Open</string>
+    <string name="file_already_downloaded">File %1$s already downloaded</string>
     <string name="fireDataCleared">Data cleared</string>
     <string name="fireProcessName" translatable="false">:fire</string>
 

From bf9abb9aebd2f1d17ca9cdab4f392dec1b1ddaf0 Mon Sep 17 00:00:00 2001
From: Prateek Jain <prateek.jain23995@yahoo.com>
Date: Sat, 15 Feb 2020 16:33:55 +0530
Subject: [PATCH 07/10] Adding implicit import which got missed because of
 merge

---
 .../main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
index 289bc3ac2bc0..23979360de4e 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -109,6 +109,7 @@ import com.duckduckgo.app.cta.ui.DaxDialogCta
 import com.duckduckgo.app.cta.ui.HomePanelCta
 import com.duckduckgo.app.global.ViewModelFactory
 import com.duckduckgo.app.global.device.DeviceInfo
+import com.duckduckgo.app.global.view.DaxDialog
 import com.duckduckgo.app.global.view.NonDismissibleBehavior
 import com.duckduckgo.app.global.view.TextChangedWatcher
 import com.duckduckgo.app.global.view.gone

From abe780bbd124650cc26db05955a025d9f633aa7f Mon Sep 17 00:00:00 2001
From: Prateek Jain <prateek.jain23995@yahoo.com>
Date: Fri, 13 Mar 2020 17:43:50 +0530
Subject: [PATCH 08/10] incorporating feedbacks and following code conventions

---
 .../browser/DownloadConfirmationFragment.kt   | 56 +++++++++----------
 ...l_24dp.xml => ic_cancel_brownish_24dp.xml} |  0
 ...ile_24dp.xml => ic_file_brownish_24dp.xml} |  2 +-
 ...24dp.xml => ic_keepboth_brownish_24dp.xml} |  2 +-
 ...pen_24dp.xml => ic_open_brownish_24dp.xml} |  2 +-
 ..._24dp.xml => ic_replace_brownish_24dp.xml} |  2 +-
 .../main/res/layout/download_confirmation.xml | 14 ++---
 .../main/res/layout/sheet_fire_clear_data.xml |  2 +-
 .../main/res/values/string-untranslated.xml   |  6 ++
 app/src/main/res/values/strings.xml           |  6 --
 10 files changed, 43 insertions(+), 49 deletions(-)
 rename app/src/main/res/drawable/{ic_cancel_24dp.xml => ic_cancel_brownish_24dp.xml} (100%)
 rename app/src/main/res/drawable/{ic_file_24dp.xml => ic_file_brownish_24dp.xml} (95%)
 rename app/src/main/res/drawable/{ic_keepboth_24dp.xml => ic_keepboth_brownish_24dp.xml} (96%)
 rename app/src/main/res/drawable/{ic_open_24dp.xml => ic_open_brownish_24dp.xml} (96%)
 rename app/src/main/res/drawable/{ic_replace_24dp.xml => ic_replace_brownish_24dp.xml} (96%)

diff --git a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
index a0d4817a893f..0c9bcc5be328 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
@@ -16,11 +16,12 @@
 
 package com.duckduckgo.app.browser
 
-import android.annotation.SuppressLint
-import android.app.Dialog
+import android.content.Context
 import android.content.Intent
+import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.content.FileProvider.getUriForFile
 import com.duckduckgo.app.browser.downloader.NetworkFileDownloadManager.DownloadFileData
@@ -37,17 +38,14 @@ class DownloadConfirmationFragment(
     private val userDownloadAction: UserDownloadAction
 ) : BottomSheetDialogFragment() {
 
-    @SuppressLint("RestrictedApi")
-    override fun setupDialog(dialog: Dialog, style: Int) {
-        super.setupDialog(dialog, style)
-        val view = LayoutInflater.from(context).inflate(R.layout.download_confirmation, null)
-        dialog.setContentView(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val view = inflater.inflate(R.layout.download_confirmation, container, false)
         setupViews(view)
+        return view
     }
 
     private fun setupViews(view: View) {
-        view.download_message.text =
-            getString(getMessageResource(), downloadFileData.file.name)
+        view.download_message.text = getString(R.string.downloadConfirmationSaveFileTitle, downloadFileData.file.name)
         view.open_with.setOnClickListener {
             openFile()
             dismiss()
@@ -68,39 +66,35 @@ class DownloadConfirmationFragment(
         if (downloadFileData.alreadyDownloaded) {
             view.open_with.show()
             view.replace.show()
-            view.continue_download.text = getString(R.string.keep_both)
-            view.continue_download.leftDrawable(R.drawable.ic_keepboth_24dp)
+            view.continue_download.text = getString(R.string.downloadConfirmationKeepBothFilesText)
+            view.continue_download.leftDrawable(R.drawable.ic_keepboth_brownish_24dp)
         } else {
             view.open_with.gone()
             view.replace.gone()
-            view.continue_download.text = getString(R.string.fireContinue)
-            view.continue_download.leftDrawable(R.drawable.ic_file_24dp)
+            view.continue_download.text = getString(R.string.downloadConfirmationContinue)
+            view.continue_download.leftDrawable(R.drawable.ic_file_brownish_24dp)
 
         }
     }
 
-    private fun getMessageResource() =
-        if (downloadFileData.alreadyDownloaded) R.string.file_already_downloaded
-        else R.string.download_filename
+    private fun openFile() {
+        val intent = context?.let { createIntentToOpenFile(it) }
+        activity?.packageManager?.let { packageManager ->
+            if (intent?.resolveActivity(packageManager) != null) {
+                startActivity(intent)
+            } else {
+                Timber.e("No suitable activity found")
+                Toast.makeText(activity, "Can't open file", Toast.LENGTH_SHORT).show()
 
+            }
+        }
+    }
 
-    private fun openFile() {
-        val uri = getUriForFile(
-            context!!,
-            "${BuildConfig.APPLICATION_ID}.provider",
-            downloadFileData.file
-        )
+    private fun createIntentToOpenFile(context: Context): Intent {
+        val uri = getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", downloadFileData.file)
         val mime = activity?.contentResolver?.getType(uri)
-
         val intent = Intent(Intent.ACTION_VIEW)
         intent.setDataAndType(uri, mime)
-        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-        if (intent.resolveActivity(activity?.packageManager!!) != null) {
-            startActivity(intent)
-        } else {
-            Timber.e("No suitable activity found")
-            Toast.makeText(activity, "Can't open file", Toast.LENGTH_SHORT).show()
-
-        }
+        return intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_cancel_24dp.xml b/app/src/main/res/drawable/ic_cancel_brownish_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_cancel_24dp.xml
rename to app/src/main/res/drawable/ic_cancel_brownish_24dp.xml
diff --git a/app/src/main/res/drawable/ic_file_24dp.xml b/app/src/main/res/drawable/ic_file_brownish_24dp.xml
similarity index 95%
rename from app/src/main/res/drawable/ic_file_24dp.xml
rename to app/src/main/res/drawable/ic_file_brownish_24dp.xml
index 4cba662ac5e8..fdcb43a7ebc1 100644
--- a/app/src/main/res/drawable/ic_file_24dp.xml
+++ b/app/src/main/res/drawable/ic_file_brownish_24dp.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/brownishGray"
         android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8.83c0,-0.53 -0.21,-1.04 -0.59,-1.41l-4.83,-4.83c-0.37,-0.38 -0.88,-0.59 -1.41,-0.59L6,2zM13,8L13,3.5L18.5,9L14,9c-0.55,0 -1,-0.45 -1,-1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_keepboth_24dp.xml b/app/src/main/res/drawable/ic_keepboth_brownish_24dp.xml
similarity index 96%
rename from app/src/main/res/drawable/ic_keepboth_24dp.xml
rename to app/src/main/res/drawable/ic_keepboth_brownish_24dp.xml
index c24250c5f783..3aa857f93576 100644
--- a/app/src/main/res/drawable/ic_keepboth_24dp.xml
+++ b/app/src/main/res/drawable/ic_keepboth_brownish_24dp.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/brownishGray"
         android:pathData="M14.59,2.59c-0.38,-0.38 -0.89,-0.59 -1.42,-0.59L6,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8.83c0,-0.53 -0.21,-1.04 -0.59,-1.41l-4.82,-4.83zM15,16h-2v2c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1v-2L9,16c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h2v-2c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v2h2c0.55,0 1,0.45 1,1s-0.45,1 -1,1zM13,8L13,3.5L18.5,9L14,9c-0.55,0 -1,-0.45 -1,-1z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_open_24dp.xml b/app/src/main/res/drawable/ic_open_brownish_24dp.xml
similarity index 96%
rename from app/src/main/res/drawable/ic_open_24dp.xml
rename to app/src/main/res/drawable/ic_open_brownish_24dp.xml
index 3bc816b19c57..49896c1d7c28 100644
--- a/app/src/main/res/drawable/ic_open_24dp.xml
+++ b/app/src/main/res/drawable/ic_open_brownish_24dp.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/brownishGray"
         android:pathData="M18,19H6c-0.55,0 -1,-0.45 -1,-1V6c0,-0.55 0.45,-1 1,-1h5c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-6c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v5c0,0.55 -0.45,1 -1,1zM14,4c0,0.55 0.45,1 1,1h2.59l-9.13,9.13c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L19,6.41V9c0,0.55 0.45,1 1,1s1,-0.45 1,-1V3h-6c-0.55,0 -1,0.45 -1,1z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_replace_24dp.xml b/app/src/main/res/drawable/ic_replace_brownish_24dp.xml
similarity index 96%
rename from app/src/main/res/drawable/ic_replace_24dp.xml
rename to app/src/main/res/drawable/ic_replace_brownish_24dp.xml
index 3d38c55642db..5b01ce51ce43 100644
--- a/app/src/main/res/drawable/ic_replace_24dp.xml
+++ b/app/src/main/res/drawable/ic_replace_brownish_24dp.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/brownishGray"
         android:pathData="M15,1L4,1c-1.1,0 -2,0.9 -2,2v13c0,0.55 0.45,1 1,1s1,-0.45 1,-1L4,4c0,-0.55 0.45,-1 1,-1h10c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1zM15.59,5.59l4.83,4.83c0.37,0.37 0.58,0.88 0.58,1.41L21,21c0,1.1 -0.9,2 -2,2L7.99,23C6.89,23 6,22.1 6,21l0.01,-14c0,-1.1 0.89,-2 1.99,-2h6.17c0.53,0 1.04,0.21 1.42,0.59zM15,12h4.5L14,6.5L14,11c0,0.55 0.45,1 1,1z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_confirmation.xml b/app/src/main/res/layout/download_confirmation.xml
index a33af92c558c..6595c56c76d0 100644
--- a/app/src/main/res/layout/download_confirmation.xml
+++ b/app/src/main/res/layout/download_confirmation.xml
@@ -51,14 +51,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:drawableStart="@drawable/ic_open_24dp"
+            android:drawableStart="@drawable/ic_open_brownish_24dp"
             android:drawablePadding="24dp"
             android:fontFamily="sans-serif"
             android:paddingStart="24dp"
             android:paddingTop="24dp"
             android:paddingEnd="24dp"
             android:paddingBottom="17dp"
-            android:text="@string/open_with"
+            android:text="@string/downloadConfirmationOpenFileText"
             android:textColor="@color/brownishGray"
             android:textSize="16sp"
             android:textStyle="normal"
@@ -69,14 +69,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:drawableStart="@drawable/ic_replace_24dp"
+            android:drawableStart="@drawable/ic_replace_brownish_24dp"
             android:drawablePadding="24dp"
             android:fontFamily="sans-serif"
             android:paddingStart="24dp"
             android:paddingTop="24dp"
             android:paddingEnd="24dp"
             android:paddingBottom="17dp"
-            android:text="@string/replace"
+            android:text="@string/downloadConfirmationReplaceOldFileText"
             android:textColor="@color/brownishGray"
             android:textSize="16sp"
             android:textStyle="normal"
@@ -87,14 +87,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:drawableStart="@drawable/ic_file_24dp"
+            android:drawableStart="@drawable/ic_file_brownish_24dp"
             android:drawablePadding="24dp"
             android:fontFamily="sans-serif"
             android:paddingStart="24dp"
             android:paddingTop="24dp"
             android:paddingEnd="24dp"
             android:paddingBottom="17dp"
-            android:text="@string/fireContinue"
+            android:text="@string/downloadConfirmationContinue"
             android:textColor="@color/brownishGray"
             android:textSize="16sp"
             android:textStyle="normal" />
@@ -104,7 +104,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:drawableStart="@drawable/ic_cancel_24dp"
+            android:drawableStart="@drawable/ic_cancel_brownish_24dp"
             android:drawablePadding="24dp"
             android:fontFamily="sans-serif"
             android:paddingStart="24dp"
diff --git a/app/src/main/res/layout/sheet_fire_clear_data.xml b/app/src/main/res/layout/sheet_fire_clear_data.xml
index 6091d4e5d4db..862a7c1da0bf 100644
--- a/app/src/main/res/layout/sheet_fire_clear_data.xml
+++ b/app/src/main/res/layout/sheet_fire_clear_data.xml
@@ -48,7 +48,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
-        android:drawableStart="@drawable/ic_cancel_24dp"
+        android:drawableStart="@drawable/ic_cancel_brownish_24dp"
         android:drawablePadding="24dp"
         android:fontFamily="sans-serif"
         android:paddingStart="24dp"
diff --git a/app/src/main/res/values/string-untranslated.xml b/app/src/main/res/values/string-untranslated.xml
index 3138505bdb81..526877be0ffc 100644
--- a/app/src/main/res/values/string-untranslated.xml
+++ b/app/src/main/res/values/string-untranslated.xml
@@ -59,4 +59,10 @@
     <string name="hideTipsText">There are only a few, and we tried to make them informative.</string>
     <string name="hideTipsButton">Hide tips forever</string>
 
+    <string name="downloadConfirmationContinue">Continue</string>
+    <string name="downloadConfirmationSaveFileTitle">Save %1$s</string>
+    <string name="downloadConfirmationKeepBothFilesText">Keep both</string>
+    <string name="downloadConfirmationReplaceOldFileText">Replace</string>
+    <string name="downloadConfirmationOpenFileText">Open</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c09c31f0192c..afe9846610c7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -148,12 +148,6 @@
     <string name="fireMenu">Clear Data</string>
     <string name="fireClearAll">Clear All Tabs and Data</string>
     <string name="fireCancel">Cancel</string>
-    <string name="fireContinue">Continue</string>
-    <string name="download_filename">Save %1$s</string>
-    <string name="keep_both">Keep both</string>
-    <string name="replace">Replace</string>
-    <string name="open_with">Open</string>
-    <string name="file_already_downloaded">File %1$s already downloaded</string>
     <string name="fireDataCleared">Data cleared</string>
     <string name="fireProcessName" translatable="false">:fire</string>
 

From 3df0809844bd1b43451d1a33f1fb0af2f532bfb4 Mon Sep 17 00:00:00 2001
From: Prateek Jain <prateek.jain23995@yahoo.com>
Date: Sat, 21 Mar 2020 01:12:21 +0800
Subject: [PATCH 09/10] Triggering build again


From 8dc1e87c502e15082712a5eb2ef254bbd20a0a5d Mon Sep 17 00:00:00 2001
From: Prateek Jain <prateek.jain23995@yahoo.com>
Date: Wed, 25 Mar 2020 22:59:59 +0800
Subject: [PATCH 10/10] Removing redundant code and incorporating feedbacks
 based on code style

---
 .../app/browser/BrowserTabFragment.kt         |  8 ++-----
 .../browser/DownloadConfirmationFragment.kt   | 22 +++++++++----------
 .../downloader/NetworkFileDownloadManager.kt  | 10 +--------
 .../downloader/NetworkFileDownloader.kt       |  2 +-
 .../main/res/layout/download_confirmation.xml | 10 ++++-----
 .../main/res/values/string-untranslated.xml   |  1 +
 6 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
index 9ca5721912e6..dda212a2f6c0 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -1143,12 +1143,8 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
         pendingFileDownload = null
         thread {
             fileDownloader.download(pendingDownload, object : FileDownloader.FileDownloadListener {
-                override fun confirmDownload(
-                    downloadFileData: DownloadFileData,
-                    userDownloadAction: UserDownloadAction
-                ) {
-                    val downloadConfirmationFragment =
-                        DownloadConfirmationFragment(downloadFileData, userDownloadAction)
+                override fun confirmDownload(downloadFileData: DownloadFileData, userDownloadAction: UserDownloadAction) {
+                    val downloadConfirmationFragment = DownloadConfirmationFragment(downloadFileData, userDownloadAction)
                     fragmentManager?.let {
                         downloadConfirmationFragment.show(it, DOWNLAOD_CONFIRM_TAG)
                     }
diff --git a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
index 0c9bcc5be328..036b20a7eabd 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt
@@ -45,8 +45,8 @@ class DownloadConfirmationFragment(
     }
 
     private fun setupViews(view: View) {
-        view.download_message.text = getString(R.string.downloadConfirmationSaveFileTitle, downloadFileData.file.name)
-        view.open_with.setOnClickListener {
+        view.downloadMessage.text = getString(R.string.downloadConfirmationSaveFileTitle, downloadFileData.file.name)
+        view.openWith.setOnClickListener {
             openFile()
             dismiss()
         }
@@ -54,7 +54,7 @@ class DownloadConfirmationFragment(
             userDownloadAction.acceptAndReplace()
             dismiss()
         }
-        view.continue_download.setOnClickListener {
+        view.continueDownload.setOnClickListener {
             userDownloadAction.accept()
             dismiss()
         }
@@ -64,16 +64,15 @@ class DownloadConfirmationFragment(
         }
 
         if (downloadFileData.alreadyDownloaded) {
-            view.open_with.show()
+            view.openWith.show()
             view.replace.show()
-            view.continue_download.text = getString(R.string.downloadConfirmationKeepBothFilesText)
-            view.continue_download.leftDrawable(R.drawable.ic_keepboth_brownish_24dp)
+            view.continueDownload.text = getString(R.string.downloadConfirmationKeepBothFilesText)
+            view.continueDownload.leftDrawable(R.drawable.ic_keepboth_brownish_24dp)
         } else {
-            view.open_with.gone()
+            view.openWith.gone()
             view.replace.gone()
-            view.continue_download.text = getString(R.string.downloadConfirmationContinue)
-            view.continue_download.leftDrawable(R.drawable.ic_file_brownish_24dp)
-
+            view.continueDownload.text = getString(R.string.downloadConfirmationContinue)
+            view.continueDownload.leftDrawable(R.drawable.ic_file_brownish_24dp)
         }
     }
 
@@ -84,8 +83,7 @@ class DownloadConfirmationFragment(
                 startActivity(intent)
             } else {
                 Timber.e("No suitable activity found")
-                Toast.makeText(activity, "Can't open file", Toast.LENGTH_SHORT).show()
-
+                Toast.makeText(activity, R.string.downloadConfirmationUnableToOpenFileText, Toast.LENGTH_SHORT).show()
             }
         }
     }
diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloadManager.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloadManager.kt
index 03776cae862f..750a23815ea7 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloadManager.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloadManager.kt
@@ -16,7 +16,6 @@
 
 package com.duckduckgo.app.browser.downloader
 
-import android.webkit.URLUtil
 import timber.log.Timber
 import java.io.File
 import javax.inject.Inject
@@ -28,7 +27,7 @@ class NetworkFileDownloadManager @Inject constructor(private val networkDownload
         pendingDownload: FileDownloader.PendingFileDownload,
         callback: FileDownloader.FileDownloadListener
     ) {
-        val guessedFileName = guessFileName(pendingDownload)
+        val guessedFileName = networkDownloader.guessFileName(pendingDownload)
         val fileToDownload = File(pendingDownload.directory, guessedFileName)
         val alreadyDownloaded = fileToDownload.exists()
         callback.confirmDownload(
@@ -49,13 +48,6 @@ class NetworkFileDownloadManager @Inject constructor(private val networkDownload
             })
     }
 
-    private fun guessFileName(pending: FileDownloader.PendingFileDownload): String {
-        val guessedFileName =
-            URLUtil.guessFileName(pending.url, pending.contentDisposition, pending.mimeType)
-        Timber.i("Guessed filename of $guessedFileName for url ${pending.url}")
-        return guessedFileName
-    }
-
     interface UserDownloadAction {
         fun accept()
         fun acceptAndReplace()
diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
index 8d698db84797..861e448a8ac1 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt
@@ -41,7 +41,7 @@ class NetworkFileDownloader @Inject constructor(private val context: Context) {
         manager?.enqueue(request)
     }
 
-    private fun guessFileName(pending: FileDownloader.PendingFileDownload): String? {
+    fun guessFileName(pending: FileDownloader.PendingFileDownload): String? {
         val guessedFileName = URLUtil.guessFileName(pending.url, pending.contentDisposition, pending.mimeType)
         Timber.i("Guessed filename of $guessedFileName for url ${pending.url}")
         return guessedFileName
diff --git a/app/src/main/res/layout/download_confirmation.xml b/app/src/main/res/layout/download_confirmation.xml
index 6595c56c76d0..508c3d3a6bb1 100644
--- a/app/src/main/res/layout/download_confirmation.xml
+++ b/app/src/main/res/layout/download_confirmation.xml
@@ -24,7 +24,7 @@
 
 
     <TextView
-        android:id="@+id/download_message"
+        android:id="@+id/downloadMessage"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif"
@@ -40,14 +40,14 @@
 
 
     <LinearLayout
-        android:id="@+id/download_actions"
+        android:id="@+id/downloadActions"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintTop_toBottomOf="@id/download_message">
+        app:layout_constraintTop_toBottomOf="@id/downloadMessage">
 
         <TextView
-            android:id="@+id/open_with"
+            android:id="@+id/openWith"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
@@ -83,7 +83,7 @@
             android:visibility="gone" />
 
         <TextView
-            android:id="@+id/continue_download"
+            android:id="@+id/continueDownload"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
diff --git a/app/src/main/res/values/string-untranslated.xml b/app/src/main/res/values/string-untranslated.xml
index e9228a80b531..557719e21c5c 100644
--- a/app/src/main/res/values/string-untranslated.xml
+++ b/app/src/main/res/values/string-untranslated.xml
@@ -44,6 +44,7 @@
     <string name="downloadConfirmationKeepBothFilesText">Keep both</string>
     <string name="downloadConfirmationReplaceOldFileText">Replace</string>
     <string name="downloadConfirmationOpenFileText">Open</string>
+    <string name="downloadConfirmationUnableToOpenFileText">Can\'t open file</string>
 
     <string name="search">Search</string>