Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Catch errors when getting FingerprintManager #38

Merged
merged 3 commits into from
Feb 8, 2017
Merged

Catch errors when getting FingerprintManager #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a59591f
catch potential exceptions when getting FingerprintManager
Mauin Feb 8, 2017
30b4c42
API => SDK
Mauin Feb 8, 2017
ca336c8
add tests for fingerprintmanager error cases
Mauin Feb 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions rxfingerprint/src/main/java/com/mtramin/rxfingerprint/RxFingerprint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
import android.os.Build;
import android.security.keystore.KeyPermanentlyInvalidatedException;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import android.util.Log;

import com.mtramin.rxfingerprint.data.FingerprintAuthenticationResult;
import com.mtramin.rxfingerprint.data.FingerprintDecryptionResult;
Expand Down Expand Up @@ -211,7 +213,12 @@ public static boolean isHardwareDetected(@NonNull Context context) {
return false;
}

return fingerprintPermissionGranted(context) && getFingerprintManager(context).isHardwareDetected();
FingerprintManager fingerprintManager = getFingerprintManager(context);
if (fingerprintManager == null) {
return false;
}

return fingerprintPermissionGranted(context) && fingerprintManager.isHardwareDetected();
}

/**
Expand All @@ -228,17 +235,28 @@ public static boolean hasEnrolledFingerprints(@NonNull Context context) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
return false;
}
return fingerprintPermissionGranted(context) && getFingerprintManager(context).hasEnrolledFingerprints();

FingerprintManager fingerprintManager = getFingerprintManager(context);
if (fingerprintManager == null) {
return false;
}
return fingerprintPermissionGranted(context) && fingerprintManager.hasEnrolledFingerprints();
}

@RequiresApi(Build.VERSION_CODES.M)
private static boolean fingerprintPermissionGranted(Context context) {
return context.checkSelfPermission(USE_FINGERPRINT) == PackageManager.PERMISSION_GRANTED;
}

@Nullable
@RequiresApi(Build.VERSION_CODES.M)
static FingerprintManager getFingerprintManager(Context context) {
return (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
try {
return (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
} catch (Exception | NoClassDefFoundError e) {
Log.e("RxFingerprint", "Device with SDK >=23 doesn't provide Fingerprint APIs", e);
}
return null;
}

/**
Expand Down
24 changes: 20 additions & 4 deletions rxfingerprint/src/test/java/com/mtramin/rxfingerprint/RxFingerprintTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import android.content.Context;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Build;
import android.security.keystore.KeyPermanentlyInvalidatedException;
import android.util.Log;

import org.junit.Before;
import org.junit.Test;
Expand All @@ -14,6 +14,7 @@
import org.powermock.modules.junit4.PowerMockRunner;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks;
Expand All @@ -23,7 +24,7 @@
*/
@SuppressWarnings({"NewApi", "MissingPermission"})
@RunWith(PowerMockRunner.class)
@PrepareForTest({FingerprintManager.class})
@PrepareForTest({FingerprintManager.class, Log.class})
public class RxFingerprintTest {

@Mock
Expand All @@ -37,6 +38,7 @@ public void setUp() throws Exception {
initMocks(this);
TestHelper.setSdkLevel(23);
PowerMockito.mockStatic(FingerprintManager.class);
PowerMockito.mockStatic(Log.class);
}

@Test
Expand Down Expand Up @@ -106,14 +108,28 @@ public void fingerprintUnavailable() throws Exception {
when(mockContext.getSystemService(Context.FINGERPRINT_SERVICE)).thenReturn(mockFingerprintManager);
when(mockFingerprintManager.hasEnrolledFingerprints()).thenReturn(false);

assertFalse("Fingerprint should be unavailable", RxFingerprint.hasEnrolledFingerprints(mockContext));
assertFalse("Fingerprint should not be unavailable", RxFingerprint.hasEnrolledFingerprints(mockContext));
}

@Test
public void hardwareUnavailable() throws Exception {
when(mockContext.getSystemService(Context.FINGERPRINT_SERVICE)).thenReturn(mockFingerprintManager);
when(mockFingerprintManager.isHardwareDetected()).thenReturn(false);

assertFalse("Hardware should be available", RxFingerprint.isHardwareDetected(mockContext));
assertFalse("Hardware should not be available", RxFingerprint.isHardwareDetected(mockContext));
}

@Test
public void apisUnavailable() throws Exception {
when(mockContext.getSystemService(Context.FINGERPRINT_SERVICE)).thenThrow(new NoClassDefFoundError());

assertNull("FingerprintManager should be null", RxFingerprint.getFingerprintManager(mockContext));
assertFalse("RxFingerprint should be unavailable", RxFingerprint.isAvailable(mockContext));
}

@Test
public void sdkNotSupported() throws Exception {
TestHelper.setSdkLevel(21);
assertFalse("RxFingerprint should be unavailable", RxFingerprint.isAvailable(mockContext));
}
}