mozilla-mobile · liuche · Apr 23, 2018 · Apr 12, 2018 · Apr 13, 2018 · Apr 13, 2018
diff --git a/app/src/amazonWebview/java/org/mozilla/focus/webview/FocusWebViewClient.java b/app/src/amazonWebview/java/org/mozilla/focus/webview/FocusWebViewClient.java
@@ -23,6 +23,11 @@
 import org.mozilla.focus.utils.UrlUtils;
 import org.mozilla.focus.iwebview.IWebView;
 
+import java.io.ByteArrayInputStream;
+
+import static org.mozilla.focus.browser.BrowserFragment.APP_URL_HOME;
+import static org.mozilla.focus.browser.BrowserFragment.APP_URL_PREFIX;
+
 /**
  * WebViewClient layer that handles browser specific WebViewClient functionality, such as error pages
  * and external URL handling.
@@ -109,9 +114,24 @@ public void onLoadResource(AmazonWebView view, String url) {
     // WebResourceRequest was added in API21 and there is no equivalent AmazonWebResourceRequest
     @Override
     public AmazonWebResourceResponse shouldInterceptRequest(AmazonWebView view, String request) {
+        if (request != null && request.startsWith(APP_URL_PREFIX)) {
+            switch (request) {
+                case APP_URL_HOME:
+                    // Home screen should show a blank webview behind the overlay, but keep the url.
+                    callback.onShouldInterceptRequest(request);
+                    final ByteArrayInputStream homeDataStream = getBlankPageStream();
+                    return new AmazonWebResourceResponse("text/html", "utf-8", homeDataStream);
+            }
+        }
+
         return super.shouldInterceptRequest(view, request);
     }
 
+    private ByteArrayInputStream getBlankPageStream() {
+        // ByteArrayInputStream doesn't need to be closed.
+        return new ByteArrayInputStream("<html></html>".getBytes());
+    }
+
 //    @Override
 //    public AmazonWebResourceResponse shouldInterceptRequest(AmazonWebView view, final AmazonWebResourceRequest request) {
 //        // Only update the user visible URL if:

diff --git a/app/src/main/java/org/mozilla/focus/MainActivity.kt b/app/src/main/java/org/mozilla/focus/MainActivity.kt
@@ -16,8 +16,8 @@ import com.amazon.android.webkit.AmazonWebKitFactory
 import kotlinx.android.synthetic.main.activity_main.*
 import org.mozilla.focus.architecture.NonNullObserver
 import org.mozilla.focus.browser.BrowserFragment
+import org.mozilla.focus.browser.BrowserFragment.Companion.APP_URL_HOME
 import org.mozilla.focus.ext.toSafeIntent
-import org.mozilla.focus.home.HomeFragment
 import org.mozilla.focus.iwebview.IWebView
 import org.mozilla.focus.iwebview.WebViewProvider
 import org.mozilla.focus.locale.LocaleAwareAppCompatActivity
@@ -54,9 +54,8 @@ class MainActivity : LocaleAwareAppCompatActivity(), OnUrlEnteredListener {
         sessionManager.sessions.observe(this, object : NonNullObserver<List<Session>>() {
             public override fun onValueChanged(sessions: List<Session>) {
                 if (sessions.isEmpty()) {
-                    // There's no active session. Show the URL input screen so that the user can
-                    // start a new session.
-                    ScreenController.showHomeScreen(supportFragmentManager, this@MainActivity)
+                    // There's no active session. Start a new session with "homepage".
+                    ScreenController.showBrowserScreenForUrl(supportFragmentManager, APP_URL_HOME, Source.NONE)
                 } else {
                     ScreenController.showBrowserScreenForCurrentSession(supportFragmentManager, sessionManager)
                 }
@@ -153,12 +152,9 @@ class MainActivity : LocaleAwareAppCompatActivity(), OnUrlEnteredListener {
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
         val fragmentManager = supportFragmentManager
         val browserFragment = fragmentManager.findFragmentByTag(BrowserFragment.FRAGMENT_TAG) as BrowserFragment?
-        val homeFragment = fragmentManager.findFragmentByTag(HomeFragment.FRAGMENT_TAG) as HomeFragment?
 
         return if (browserFragment != null && browserFragment.isVisible) {
             browserFragment.dispatchKeyEvent(event) || super.dispatchKeyEvent(event)
-        } else if (homeFragment != null && homeFragment.isVisible) {
-            homeFragment.dispatchKeyEvent(event) || super.dispatchKeyEvent(event)
         } else {
             super.dispatchKeyEvent(event)
         }

diff --git a/app/src/main/java/org/mozilla/focus/ScreenController.kt b/app/src/main/java/org/mozilla/focus/ScreenController.kt
@@ -9,12 +9,10 @@ import android.content.Context
 import android.support.v4.app.FragmentManager
 import android.text.TextUtils
 import org.mozilla.focus.browser.BrowserFragment
-import org.mozilla.focus.home.HomeFragment
 import org.mozilla.focus.session.SessionManager
 import org.mozilla.focus.session.Source
 import org.mozilla.focus.telemetry.TelemetryWrapper
 import org.mozilla.focus.telemetry.UrlTextInputLocation
-import org.mozilla.focus.utils.OnUrlEnteredListener
 import org.mozilla.focus.utils.UrlUtils
 import org.mozilla.focus.widget.InlineAutocompleteEditText
 
@@ -48,25 +46,6 @@ object ScreenController {
         }
     }
 
-    fun showHomeScreen(fragmentManager: FragmentManager, onUrlEnteredListener: OnUrlEnteredListener) {
-        val homeFragment = fragmentManager.findFragmentByTag(HomeFragment.FRAGMENT_TAG) as HomeFragment?
-        if (homeFragment != null && homeFragment.isVisible) {
-            // This is already at the top of the stack - do nothing.
-            return
-        }
-
-        // We don't want to be able to go back from the back stack, so clear the whole fragment back stack.
-        fragmentManager.popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
-
-        // Show the home screen.
-        val newHomeFragment = HomeFragment.create()
-        newHomeFragment.onSettingsPressed = { showSettingsScreen(fragmentManager) }
-        newHomeFragment.onUrlEnteredListener = onUrlEnteredListener
-        fragmentManager.beginTransaction()
-                .replace(R.id.container, newHomeFragment, HomeFragment.FRAGMENT_TAG)
-                .commit()
-    }
-
     fun showSettingsScreen(fragmentManager: FragmentManager) {
         val settingsFragment = SettingsFragment.create()
         fragmentManager.beginTransaction()

diff --git a/app/src/main/java/org/mozilla/focus/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/focus/browser/BrowserFragment.kt
@@ -15,10 +15,13 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import kotlinx.android.synthetic.main.fragment_browser.*
 import kotlinx.android.synthetic.main.fragment_browser.view.*
+import kotlinx.coroutines.experimental.android.UI
+import kotlinx.coroutines.experimental.launch
 import org.mozilla.focus.MainActivity
 import org.mozilla.focus.R
 import org.mozilla.focus.ScreenController
 import org.mozilla.focus.architecture.NonNullObserver
+import org.mozilla.focus.browser.BrowserFragment.Companion.APP_URL_HOME
 import org.mozilla.focus.browser.cursor.CursorController
 import org.mozilla.focus.ext.isVisible
 import org.mozilla.focus.ext.toUri
@@ -32,7 +35,6 @@ import org.mozilla.focus.session.SessionCallbackProxy
 import org.mozilla.focus.session.SessionManager
 import org.mozilla.focus.telemetry.TelemetryWrapper
 import org.mozilla.focus.telemetry.UrlTextInputLocation
-import org.mozilla.focus.utils.OnUrlEnteredListener
 import org.mozilla.focus.utils.ViewUtils.showCenteredTopToast
 import org.mozilla.focus.widget.InlineAutocompleteEditText
 
@@ -46,6 +48,8 @@ private const val TOAST_Y_OFFSET = 200
 class BrowserFragment : IWebViewLifecycleFragment() {
     companion object {
         const val FRAGMENT_TAG = "browser"
+        const val APP_URL_PREFIX = "firefox:"
+        const val APP_URL_HOME = "${APP_URL_PREFIX}home"
 
         @JvmStatic
         fun createForSession(session: Session) = BrowserFragment().apply {
@@ -68,6 +72,8 @@ class BrowserFragment : IWebViewLifecycleFragment() {
     var url: String? = null
         private set
 
+    val isUrlEqualToHomepage: Boolean get() = url == APP_URL_HOME
+
     private val sessionManager = SessionManager.getInstance()
 
     /**
@@ -111,15 +117,14 @@ class BrowserFragment : IWebViewLifecycleFragment() {
             NavigationEvent.BACK -> if (webView?.canGoBack() ?: false) webView?.goBack()
             NavigationEvent.FORWARD -> if (webView?.canGoForward() ?: false) webView?.goForward()
             NavigationEvent.TURBO, NavigationEvent.RELOAD -> webView?.reload()
-            NavigationEvent.HOME -> ScreenController.showHomeScreen(fragmentManager, activity as OnUrlEnteredListener)
             NavigationEvent.SETTINGS -> ScreenController.showSettingsScreen(fragmentManager)
             NavigationEvent.LOAD_URL -> {
                 (activity as MainActivity).onTextInputUrlEntered(value!!, autocompleteResult!!, UrlTextInputLocation.MENU)
-                setOverlayVisibileByUser(false)
+                setOverlayVisibleByUser(false)
             }
             NavigationEvent.LOAD_TILE -> {
                 (activity as MainActivity).onNonTextInputUrlEntered(value!!)
-                setOverlayVisibileByUser(false)
+                setOverlayVisibleByUser(false)
             }
             NavigationEvent.PIN_ACTION -> {
                 this@BrowserFragment.url?.let { url ->
@@ -185,7 +190,7 @@ class BrowserFragment : IWebViewLifecycleFragment() {
                 webView?.goBack()
                 TelemetryWrapper.browserBackControllerEvent()
             }
-            browserOverlay.isVisible -> setOverlayVisibileByUser(false)
+            browserOverlay.isVisible -> setOverlayVisibleByUser(false)
             else -> {
                 fragmentManager.popBackStack()
                 SessionManager.getInstance().removeCurrentSession()
@@ -219,10 +224,10 @@ class BrowserFragment : IWebViewLifecycleFragment() {
         val actionIsDown = event.action == KeyEvent.ACTION_DOWN
         val isOverlayToggleKey = (keyCodeIsMenu || (keyCodeIsBack && browserOverlay.isVisible))
 
-        if (isOverlayToggleKey) {
+        if (isOverlayToggleKey && !isUrlEqualToHomepage) {
             if (actionIsDown) {
                 val toShow = !browserOverlay.isVisible
-                setOverlayVisibileByUser(toShow)
+                setOverlayVisibleByUser(toShow)
                 // Fix this youtube focus hack in #393
                 if (!toShow && webView!!.isYoutubeTV) {
                     webView?.requestFocus()
@@ -247,7 +252,7 @@ class BrowserFragment : IWebViewLifecycleFragment() {
      * It's important this is only called for user actions because our Telemetry
      * is dependent on it.
      */
-    private fun setOverlayVisibileByUser(toShow: Boolean) {
+    private fun setOverlayVisibleByUser(toShow: Boolean) {
         browserOverlay.visibility = if (toShow) View.VISIBLE else View.GONE
         if (toShow) cursor?.onPause() else cursor?.onResume()
         cursor?.setEnabledForCurrentState()
@@ -282,6 +287,14 @@ private class BrowserIWebViewCallback(
     override fun onBlockingStateChanged(isBlockingEnabled: Boolean) {}
 
     override fun onLongPress(hitTarget: IWebView.HitTarget) {}
+    override fun onShouldInterceptRequest(url: String) {
+        // This might not be called from the UI thread but needs to be, so we use launch.
+        launch(UI) {
+            when (url) {
+                APP_URL_HOME -> browserFragment.browserOverlay?.visibility = View.VISIBLE
+            }
+        }
+    }
 
     override fun onEnterFullScreen(callback: IWebView.FullscreenCallback, view: View?) {
         fullscreenCallback = callback

diff --git a/app/src/main/java/org/mozilla/focus/browser/BrowserNavigationOverlay.kt b/app/src/main/java/org/mozilla/focus/browser/BrowserNavigationOverlay.kt
@@ -30,14 +30,13 @@ private const val NAVIGATION_BUTTON_DISABLED_ALPHA = 0.3f
 private const val COL_COUNT = 5
 
 enum class NavigationEvent {
-    HOME, SETTINGS, BACK, FORWARD, RELOAD, LOAD_URL, LOAD_TILE, TURBO, PIN_ACTION;
+    SETTINGS, BACK, FORWARD, RELOAD, LOAD_URL, LOAD_TILE, TURBO, PIN_ACTION;
 
     companion object {
         fun fromViewClick(viewId: Int?) = when (viewId) {
             R.id.navButtonBack -> BACK
             R.id.navButtonForward -> FORWARD
             R.id.navButtonReload -> RELOAD
-            R.id.navButtonHome -> HOME
             R.id.navButtonSettings -> SETTINGS
             R.id.turboButton -> TURBO
             R.id.pinButton -> PIN_ACTION
@@ -83,7 +82,7 @@ class BrowserNavigationOverlay @JvmOverloads constructor(
     init {
         LayoutInflater.from(context)
                 .inflate(R.layout.browser_overlay, this, true)
-        listOf(navButtonBack, navButtonForward, navButtonReload, navButtonHome, navButtonSettings,
+        listOf(navButtonBack, navButtonForward, navButtonReload, navButtonSettings,
                 turboButton, pinButton)
                 .forEach {
                     it.setOnClickListener(this)

diff --git a/app/src/main/java/org/mozilla/focus/browser/HomeTileRecyclerView.kt b/app/src/main/java/org/mozilla/focus/browser/HomeTileRecyclerView.kt
@@ -90,13 +90,6 @@ class HomeTileAdapter(
         iconView.layoutParams = layoutMarginParams
     }
 
-    fun getItemAtPosition(position: Int): HomeTile? {
-        if (position > -1 && position < itemCount) {
-            return tiles[position]
-        }
-        return null
-    }
-
     /**
      * takes in the home tiles cache and updates the adapter's data source
      * and UI accordingly, assuming only one new tile is added

diff --git a/app/src/main/java/org/mozilla/focus/browser/InfoFragment.java b/app/src/main/java/org/mozilla/focus/browser/InfoFragment.java
@@ -84,6 +84,9 @@ public void onProgress(int progress) {
             @Override
             public void onLongPress(IWebView.HitTarget hitTarget) {}
 
+            @Override
+            public void onShouldInterceptRequest(String url) {}
+
             @Override
             public void onURLChanged(String url) {}
 

diff --git a/app/src/main/java/org/mozilla/focus/home/HomeFragment.kt b/app/src/main/java/org/mozilla/focus/home/HomeFragment.kt