1 files changed, 10 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceAwareFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceAwareFragment.kt
index 648215527c..4bbff22a59 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceAwareFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceAwareFragment.kt
@@ -7,6 +7,8 @@ import net.mullvad.mullvadvpn.util.JobTracker
 abstract class ServiceAwareFragment : Fragment() {
     val jobTracker = JobTracker()
 
+    open val isSecureScreen = false
+
     lateinit var parentActivity: MainActivity
         private set
 
@@ -18,6 +20,10 @@ abstract class ServiceAwareFragment : Fragment() {
 
         parentActivity = context as MainActivity
 
+        if (isSecureScreen) {
+            parentActivity.enterSecureScreen(this)
+        }
+
         parentActivity.serviceNotifier.subscribe(this) { connection ->
             configureServiceConnection(connection)
         }
@@ -32,6 +38,10 @@ abstract class ServiceAwareFragment : Fragment() {
     override fun onDetach() {
         parentActivity.serviceNotifier.unsubscribe(this)
 
+        if (isSecureScreen) {
+            parentActivity.leaveSecureScreen(this)
+        }
+
         super.onDetach()
     }