Skip to content

Commit e051d2a

Browse files
committed
drop first API level check for sample submission
This is no longer relevant due to Android 8 being launched such a long time ago.
1 parent ca5eca4 commit e051d2a

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

app/src/main/java/app/attestation/auditor/AttestationActivity.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ private enum Stage {
9191
private byte[] auditeeSerializedAttestation;
9292
private byte[] auditorChallenge;
9393
private int backgroundResource;
94-
private boolean canSubmitSample;
9594

9695
final ActivityResultLauncher<Intent> QRScannerActivityLauncher = registerForActivityResult(
9796
new ActivityResultContracts.StartActivityForResult(),
@@ -179,15 +178,6 @@ private enum Stage {
179178
"SM-N970U",
180179
"SM-N975U").contains(Build.MODEL);
181180

182-
private static int getFirstApiLevel() {
183-
return Integer.parseInt(SystemProperties.get("ro.product.first_api_level",
184-
Integer.toString(Build.VERSION.SDK_INT)));
185-
}
186-
187-
private static boolean potentialSupportedAuditee() {
188-
return getFirstApiLevel() >= Build.VERSION_CODES.O;
189-
}
190-
191181
@Override
192182
protected void onCreate(Bundle savedInstanceState) {
193183
EdgeToEdge.enable(this);
@@ -485,16 +475,15 @@ public void onActivityResult(final int requestCode, final int resultCode, final
485475
public boolean onCreateOptionsMenu(final Menu menu) {
486476
getMenuInflater().inflate(R.menu.menu_attestation, menu);
487477
menu.findItem(R.id.action_clear_auditee).setEnabled(isSupportedAuditee);
488-
canSubmitSample = potentialSupportedAuditee() && !BuildConfig.DEBUG;
489-
menu.findItem(R.id.action_submit_sample).setEnabled(canSubmitSample);
478+
menu.findItem(R.id.action_submit_sample).setEnabled(!BuildConfig.DEBUG);
490479
return true;
491480
}
492481

493482
@Override
494483
public boolean onPrepareOptionsMenu(final Menu menu) {
495484
final boolean isRemoteVerifyEnabled = RemoteVerifyJob.isEnabled(this);
496485
menu.findItem(R.id.action_disable_remote_verify).setEnabled(isRemoteVerifyEnabled);
497-
menu.findItem(R.id.action_submit_sample).setEnabled(canSubmitSample &&
486+
menu.findItem(R.id.action_submit_sample).setEnabled(!BuildConfig.DEBUG &&
498487
!SubmitSampleJob.isScheduled(this));
499488
return true;
500489
}

0 commit comments

Comments
 (0)