Merge remote-tracking branch 'origin/master'

# Conflicts: # changelog/v7.2.1+130.md
jiangtian616 · Jun 18, 2023 · d56bad2 · d56bad2
2 parents c053293 + 97ea819
commit d56bad2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/changelog/v7.2.1+130.md b/changelog/v7.2.1+130.md
@@ -1,9 +1,11 @@
 1. 支持本地标签屏蔽
 2. 优化画廊扫描速度，现在本地画廊路径默认为`{JHentai}/local_gallery`
 3. 修复部分加载失败的场景下无法重试的bug
+4. 修复安全认证的bug
 
 ------------------------------------------------------------------------------------------
 
 1. Support filtering tags locally
 2. Optimize gallery scanning speed, now the default local gallery path is `{JHentai}/local_gallery`
-3. Fix the bug that some loading failures cannot be retried
+3. Fix the bug that some loading failures cannot be retried
+4. Fix bug with security authentication
diff --git a/lib/src/pages/setting/security/setting_security_page.dart b/lib/src/pages/setting/security/setting_security_page.dart
@@ -19,7 +19,7 @@ class SettingSecurityPage extends StatelessWidget {
             if (GetPlatform.isMobile) _buildEnableBlurBackgroundApp(),
             _buildEnablePasswordAuth(),
             if (SecuritySetting.supportBiometricAuth) _buildEnableBiometricAuth(),
-            if (SecuritySetting.supportBiometricAuth) _buildEnableAuthOnResume(),
+            if (GetPlatform.isMobile) _buildEnableAuthOnResume(),
           ],
         ).withListTileTheme(context),
       ),

diff --git a/lib/src/setting/security_setting.dart b/lib/src/setting/security_setting.dart
@@ -27,7 +27,7 @@ class SecuritySetting {
 
     if (GetPlatform.isMobile) {
       List<BiometricType> types = await LocalAuthentication().getAvailableBiometrics();
-      supportBiometricAuth = types.contains(BiometricType.fingerprint) || types.contains(BiometricType.face);
+      supportBiometricAuth = types.isNotEmpty;
       Log.debug('supportBiometricAuth:$supportBiometricAuth');
     }
   }