Merge branch 'release/5.22.1'

subsymbolic · subsymbolic · commit bde06b2f655e · 2019-04-26T23:59:31.000+01:00
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -796,6 +796,7 @@ class BrowserTabFragment : Fragment(), FindListener {
     }
 
     fun onBackPressed(): Boolean {
+        if (!isAdded) return false
         return viewModel.onUserPressedBack()
     }
 
diff --git a/app/version/version.properties b/app/version/version.properties
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-VERSION=5.22.0
+VERSION=5.22.1

Original file line number	Diff line number	Diff line change
`@@ -796,6 +796,7 @@ class BrowserTabFragment : Fragment(), FindListener {`
`796`	`796`	`}`
`797`	`797`
`798`	`798`	`fun onBackPressed(): Boolean {`
	`799`	`+ if (!isAdded) return false`
`799`	`800`	`return viewModel.onUserPressedBack()`
`800`	`801`	`}`
`801`	`802`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`	`16`
`17`		`-VERSION=5.22.0`
	`17`	`+VERSION=5.22.1`