소스 검색

Fixed crashes when OEM removes Fingerprintmanager from system

Flole 8 년 전
부모
커밋
674b20364a
1개의 변경된 파일18개의 추가작업 그리고 10개의 파일을 삭제
  1. 18 10
      src/com/owncloud/android/ui/activity/FingerprintActivity.java

+ 18 - 10
src/com/owncloud/android/ui/activity/FingerprintActivity.java

@@ -254,26 +254,34 @@ public class FingerprintActivity extends AppCompatActivity {
 
 
     final static public boolean isFingerprintCapable(Context context) {
-        FingerprintManager fingerprintManager = (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
+        try {
+            FingerprintManager fingerprintManager = (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
 
-        if (ActivityCompat.checkSelfPermission(context, Manifest.permission.USE_FINGERPRINT) != PackageManager.PERMISSION_GRANTED) {
+            if (ActivityCompat.checkSelfPermission(context, Manifest.permission.USE_FINGERPRINT) != PackageManager.PERMISSION_GRANTED) {
+                return false;
+            }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                return fingerprintManager.isHardwareDetected();
+            }
+        } catch(Exception e) {
             return false;
         }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            return fingerprintManager.isHardwareDetected();
-        }
         return false;
     }
 
     final static public boolean isFingerprintReady(Context context) {
-        FingerprintManager fingerprintManager = (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
+        try {
+            FingerprintManager fingerprintManager = (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
 
-        if (ActivityCompat.checkSelfPermission(context, Manifest.permission.USE_FINGERPRINT) != PackageManager.PERMISSION_GRANTED) {
+            if (ActivityCompat.checkSelfPermission(context, Manifest.permission.USE_FINGERPRINT) != PackageManager.PERMISSION_GRANTED) {
+                return false;
+            }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                return fingerprintManager.isHardwareDetected() && fingerprintManager.hasEnrolledFingerprints();
+            }
+        } catch(Exception e) {
             return false;
         }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            return fingerprintManager.isHardwareDetected() && fingerprintManager.hasEnrolledFingerprints();
-        }
         return false;
     }