From ab93779369a6dbe718036666bf4b8013f5f4064f Mon Sep 17 00:00:00 2001
From: ekager <emilykager@gmail.com>
Date: Fri, 15 Nov 2019 13:50:35 -0800
Subject: [PATCH] For #6621 - Add Secure Flag to Window in Logins Fragments

---
 .../org/mozilla/fenix/logins/SavedLoginSiteInfoFragment.kt  | 6 ++++++
 .../java/org/mozilla/fenix/logins/SavedLoginsFragment.kt    | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/app/src/main/java/org/mozilla/fenix/logins/SavedLoginSiteInfoFragment.kt b/app/src/main/java/org/mozilla/fenix/logins/SavedLoginSiteInfoFragment.kt
index 8344106ba..0cd7cd482 100644
--- a/app/src/main/java/org/mozilla/fenix/logins/SavedLoginSiteInfoFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/logins/SavedLoginSiteInfoFragment.kt
@@ -7,6 +7,7 @@ package org.mozilla.fenix.logins
 import android.os.Bundle
 import android.text.InputType
 import android.view.View
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
@@ -29,6 +30,7 @@ class SavedLoginSiteInfoFragment : Fragment(R.layout.fragment_saved_login_site_i
     override fun onPause() {
         // If we pause this fragment, we want to pop users back to reauth
         if (findNavController().currentDestination?.id != R.id.savedLoginsFragment) {
+            activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
             findNavController().popBackStack(R.id.loginsFragment, false)
         }
         super.onPause()
@@ -91,6 +93,10 @@ class SavedLoginSiteInfoFragment : Fragment(R.layout.fragment_saved_login_site_i
 
     override fun onResume() {
         super.onResume()
+        activity?.window?.setFlags(
+            WindowManager.LayoutParams.FLAG_SECURE,
+            WindowManager.LayoutParams.FLAG_SECURE
+        )
         activity?.title = savedLoginItem.url
         (activity as AppCompatActivity).supportActionBar?.show()
     }
diff --git a/app/src/main/java/org/mozilla/fenix/logins/SavedLoginsFragment.kt b/app/src/main/java/org/mozilla/fenix/logins/SavedLoginsFragment.kt
index caac2effc..020c6dcf4 100644
--- a/app/src/main/java/org/mozilla/fenix/logins/SavedLoginsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/logins/SavedLoginsFragment.kt
@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
@@ -32,6 +33,10 @@ class SavedLoginsFragment : Fragment() {
 
     override fun onResume() {
         super.onResume()
+        activity?.window?.setFlags(
+            WindowManager.LayoutParams.FLAG_SECURE,
+            WindowManager.LayoutParams.FLAG_SECURE
+        )
         activity?.title = getString(R.string.preferences_passwords_saved_logins)
         (activity as AppCompatActivity).supportActionBar?.show()
     }
@@ -67,6 +72,7 @@ class SavedLoginsFragment : Fragment() {
     override fun onPause() {
         // If we pause this fragment, we want to pop users back to reauth
         if (findNavController().currentDestination?.id != R.id.savedLoginSiteInfoFragment) {
+            activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
             findNavController().popBackStack(R.id.loginsFragment, false)
         }
         super.onPause()