Skip welcome screen-lock page on secured devices, use isDeviceSecure

Author: tobihagemann

presentation/src/main/java/org/cryptomator/presentation/presenter/VaultListPresenter.kt

@@ -141,7 +141,7 @@ class VaultListPresenter @Inject constructor( //
 
 		if (!sharedPreferencesHandler.isScreenLockDialogAlreadyShown) {
 			val keyguardManager = context().getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
-			if (!keyguardManager.isKeyguardSecure) {
+			if (!keyguardManager.isDeviceSecure) {
 				view?.showDialog(AskForLockScreenDialog.newInstance())
 			}
 			sharedPreferencesHandler.setScreenLockDialogAlreadyShown()

presentation/src/main/java/org/cryptomator/presentation/ui/activity/WelcomeActivity.kt

@@ -156,7 +156,9 @@ class WelcomeActivity : BaseActivity<ActivityWelcomeBinding>(ActivityWelcomeBind
 			pages.add(FragmentPage.License)
 		}
 		pages.add(FragmentPage.Notifications)
-		pages.add(FragmentPage.ScreenLock)
+		if (!keyguardManager.isDeviceSecure) {
+			pages.add(FragmentPage.ScreenLock)
+		}
 	}
 
 	private fun setupPager() {
@@ -219,7 +221,7 @@ class WelcomeActivity : BaseActivity<ActivityWelcomeBinding>(ActivityWelcomeBind
 		if (!this::pagerAdapter.isInitialized) {
 			return
 		}
-		pagerAdapter.screenLockFragment?.updateScreenLockState(keyguardManager.isKeyguardSecure)
+		pagerAdapter.screenLockFragment?.updateScreenLockState(keyguardManager.isDeviceSecure)
 	}
 
 	private fun completeWelcomeFlow() {