TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 08:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary pre-19 code branches.

Browse Source 
Now that our minSdk is 19, we can remove a lot of old code paths that
only ran pre-19.
This commit is contained in:
Greyson Parrelli
2019-03-20 15:09:27 -07:00
parent a52c295a38
commit 8caaf057e8
42 changed files with 125 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
View File

@@ -262,13 +262,13 @@ public class PassphrasePromptActivity extends PassphraseActivity {
assert keyguardManager != null;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN && !keyguardManager.isKeyguardSecure()) {
if (!keyguardManager.isKeyguardSecure()) {
Log.w(TAG ,"Keyguard not secure...");
handleAuthenticated();
return;
}
if (Build.VERSION.SDK_INT >= 16 && fingerprintManager.isHardwareDetected() && fingerprintManager.hasEnrolledFingerprints()) {
if (fingerprintManager.isHardwareDetected() && fingerprintManager.hasEnrolledFingerprints()) {
Log.i(TAG, "Listening for fingerprints...");
fingerprintCancellationSignal = new CancellationSignal();
fingerprintManager.authenticate(null, 0, fingerprintCancellationSignal, fingerprintListener, null);
@@ -283,7 +283,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
}
private void pauseScreenLock() {
if (Build.VERSION.SDK_INT >= 16 && fingerprintCancellationSignal != null) {
if (fingerprintCancellationSignal != null) {
fingerprintCancellationSignal.cancel();
}
}