From 8ac32ee988d13e161f40a03cd5a8b6d7a30515d2 Mon Sep 17 00:00:00 2001
From: Christian Sadilek <christian.sadilek@gmail.com>
Date: Mon, 28 Jan 2019 16:26:28 -0500
Subject: [PATCH] Closes #266 - Integrate feature-downloads component

---
 app/build.gradle                              |  1 +
 app/src/main/AndroidManifest.xml              |  3 +++
 .../mozilla/fenix/browser/BrowserFragment.kt  | 26 +++++++++++++++++++
 buildSrc/src/main/java/Dependencies.kt        |  2 +-
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index ff14564bd..55995c585 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -94,6 +94,7 @@ dependencies {
     implementation Deps.mozilla_browser_toolbar
 
     implementation Deps.mozilla_feature_awesomebar
+    implementation Deps.mozilla_feature_downloads
     implementation Deps.mozilla_feature_intent
     implementation Deps.mozilla_feature_session
     implementation Deps.mozilla_feature_toolbar
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a22812142..b160fc6e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.mozilla.fenix">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index 32e0e9dad..0c5c00406 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -12,6 +12,7 @@ import android.view.ViewGroup
 import android.view.accessibility.AccessibilityManager
 import androidx.fragment.app.Fragment
 import kotlinx.android.synthetic.main.fragment_browser.*
+import mozilla.components.feature.downloads.DownloadsFeature
 import mozilla.components.feature.session.SessionFeature
 import mozilla.components.feature.session.SessionUseCases
 import mozilla.components.support.ktx.android.arch.lifecycle.addObservers
@@ -22,6 +23,7 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 
 class BrowserFragment : Fragment() {
 
+    private lateinit var downloadsFeature: DownloadsFeature
     private lateinit var sessionFeature: SessionFeature
 
     override fun onCreateView(
@@ -42,6 +44,15 @@ class BrowserFragment : Fragment() {
 
         val sessionManager = requireComponents.core.sessionManager
 
+        downloadsFeature = DownloadsFeature(
+            requireContext(),
+            sessionManager = sessionManager,
+            fragmentManager = childFragmentManager,
+            onNeedToRequestPermissions = { permissions ->
+                requestPermissions(permissions, REQUEST_CODE_DOWNLOAD_PERMISSIONS)
+            }
+        )
+
         sessionFeature = SessionFeature(
             sessionManager,
             SessionUseCases(sessionManager),
@@ -65,5 +76,20 @@ class BrowserFragment : Fragment() {
             val layoutParams = toolbar.layoutParams as CoordinatorLayout.LayoutParams
             layoutParams.behavior = null
         }
+
+        lifecycle.addObservers(
+            downloadsFeature,
+            sessionFeature
+        )
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+        when (requestCode) {
+            REQUEST_CODE_DOWNLOAD_PERMISSIONS -> downloadsFeature.onPermissionsResult(permissions, grantResults)
+        }
+    }
+
+    companion object {
+        private const val REQUEST_CODE_DOWNLOAD_PERMISSIONS = 1
     }
 }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index a3d1e9bc6..934d6b97e 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -13,7 +13,7 @@ private object Versions {
     const val androidx_appcompat = "1.0.2"
     const val androidx_constraint_layout = "2.0.0-alpha3"
 
-    const val mozilla_android_components = "0.40.0-SNAPSHOT"
+    const val mozilla_android_components = "0.41.0-SNAPSHOT"
 
     const val junit = "4.12"
     const val test_tools = "1.0.2"