From 2681e4a6e6797094a96b438fc54343738858c8ff Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Wed, 19 Dec 2018 22:17:51 +0800
Subject: [PATCH] Check FingerprintManager null

---
 .../main/java/com/hippo/ehviewer/ui/SetSecurityActivity.java    | 2 +-
 .../main/java/com/hippo/ehviewer/ui/scene/SecurityScene.java    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/SetSecurityActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/SetSecurityActivity.java
index e17ca11a0..ddc39c957 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/SetSecurityActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/SetSecurityActivity.java
@@ -62,7 +62,7 @@ public class SetSecurityActivity extends ToolbarActivity implements View.OnClick
             FingerprintManager fingerprintManager = getSystemService(FingerprintManager.class);
             // The line below prevents the false positive inspection from Android Studio
             // noinspection ResourceType
-            if (fingerprintManager.hasEnrolledFingerprints()) {
+            if (fingerprintManager != null && fingerprintManager.hasEnrolledFingerprints()) {
                 mFingerprint.setVisibility(View.VISIBLE);
                 mFingerprint.setChecked(Settings.getEnableFingerprint());
             }
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.java
index 389dce774..eb554f287 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.java
@@ -55,6 +55,7 @@ public class SecurityScene extends SolidScene implements
     private SensorManager mSensorManager;
     private Sensor mAccelerometer;
     private ShakeDetector mShakeDetector;
+    @Nullable
     private FingerprintManager mFingerprintManager;
 
     private CancellationSignal mFingerprintCancellationSignal;