Merge branch 'release/5.0.1'

Author: subsymbolic

app/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt'
 apply from: '../versioning.gradle'
 
 ext {
-    VERSION_NAME = "5.0.0"
+    VERSION_NAME = "5.0.1"
     USE_ORCHESTRATOR = project.hasProperty('orchestrator') ? project.property('orchestrator') : false
 }
 

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

@@ -78,10 +78,9 @@ class BrowserActivity : DuckDuckGoActivity() {
     }
 
     private fun openNewTab(tabId: String, userQuery: String? = null) {
-        val previousFragment = supportFragmentManager.findFragmentById(R.id.fragmentContainer) as? BrowserTabFragment
         val fragment = BrowserTabFragment.newInstance(tabId, userQuery)
         val transaction = supportFragmentManager.beginTransaction()
-        if (previousFragment == null) {
+        if (currentTab == null) {
             transaction.replace(R.id.fragmentContainer, fragment, tabId)
         } else {
             transaction.hide(currentTab)

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

@@ -22,6 +22,7 @@ import android.arch.lifecycle.Observer
 import android.arch.lifecycle.ViewModelProviders
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
 import android.net.Uri
 import android.os.Bundle
 import android.support.annotation.StringRes
@@ -280,7 +281,11 @@ class BrowserTabFragment : Fragment(), FindListener {
             omnibarTextInput.setText(viewState.omnibarText)
 
             // ensures caret sits at the end of the query
-            omnibarTextInput.post { omnibarTextInput?.setSelection(omnibarTextInput.text.length) }
+            omnibarTextInput.post {
+                omnibarTextInput?.let {
+                    it.setSelection(it.text.length)
+                }
+            }
             appBarLayout.setExpanded(true, true)
         }
 
@@ -406,7 +411,7 @@ class BrowserTabFragment : Fragment(), FindListener {
                     return@setOnMenuItemClickListener true
                 }
                 R.id.browserPopup -> {
-                    hideKeyboard()
+                    hideKeyboardImmediately()
                     launchPopupMenu()
                     return@setOnMenuItemClickListener true
                 }
@@ -564,6 +569,14 @@ class BrowserTabFragment : Fragment(), FindListener {
         addTextChangedListener(textWatcher)
     }
 
+    private fun hideKeyboardImmediately() {
+        if (!isHidden) {
+            Timber.v("Keyboard now hiding")
+            omnibarTextInput.hideKeyboard()
+            focusDummy.requestFocus()
+        }
+    }
+
     private fun hideKeyboard() {
         if (!isHidden) {
             Timber.v("Keyboard now hiding")
@@ -591,11 +604,22 @@ class BrowserTabFragment : Fragment(), FindListener {
 
     override fun onHiddenChanged(hidden: Boolean) {
         super.onHiddenChanged(hidden)
-        if (!hidden) {
+        if (hidden) {
+            webView?.onPause()
+        } else {
+            webView?.onResume()
             viewModel.onViewVisible()
         }
     }
 
+    /**
+     * We don't destroy the activity on config changes like orientation, so we need to ensure we update resources which might change based on config
+     */
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        ddgLogo.setImageResource(R.drawable.full_logo)
+    }
+
     private fun resetTabState() {
         omnibarTextInput.text.clear()
         viewModel.resetView()