Make remote verification more prominent

Moves the enable remote verification button out to the main screen
GrapheneOS · Sep 7, 2024 · c9c9614 · c9c9614
1 parent 7d7f01d
commit c9c9614
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/app/src/main/java/app/attestation/auditor/AttestationActivity.java b/app/src/main/java/app/attestation/auditor/AttestationActivity.java
@@ -281,6 +281,21 @@ public void handleOnBackPressed() {
         RemoteVerifyJob.restore(this);
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        final boolean isRemoteVerifyEnabled = RemoteVerifyJob.isEnabled(this);
+        int visibility = View.VISIBLE;
+        if (isRemoteVerifyEnabled) {
+            visibility = View.GONE;
+        }
+        binding.content.remoteVerify.setVisibility(visibility);
+        binding.content.remoteVerify.setOnClickListener(view -> {
+            stage = Stage.EnableRemoteVerify;
+            startQrScanner();
+        });
+    }
+
     @Override
     public void onSaveInstanceState(@NonNull final Bundle savedInstanceState) {
         super.onSaveInstanceState(savedInstanceState);
@@ -477,8 +492,6 @@ public boolean onCreateOptionsMenu(final Menu menu) {
     @Override
     public boolean onPrepareOptionsMenu(final Menu menu) {
         final boolean isRemoteVerifyEnabled = RemoteVerifyJob.isEnabled(this);
-        menu.findItem(R.id.action_enable_remote_verify)
-                .setEnabled(isSupportedAuditee && !isRemoteVerifyEnabled);
         menu.findItem(R.id.action_disable_remote_verify).setEnabled(isRemoteVerifyEnabled);
         menu.findItem(R.id.action_submit_sample).setEnabled(canSubmitSample &&
                 !SubmitSampleJob.isScheduled(this));
@@ -518,10 +531,6 @@ public boolean onOptionsItemSelected(final MenuItem item) {
                     .setNegativeButton(R.string.cancel, null)
                     .show();
             return true;
-        } else if (itemId == R.id.action_enable_remote_verify) {
-            stage = Stage.EnableRemoteVerify;
-            startQrScanner();
-            return true;
         } else if (itemId == R.id.action_disable_remote_verify) {
             new MaterialAlertDialogBuilder(this)
                     .setMessage(getString(R.string.action_disable_remote_verify) + "?")
@@ -548,6 +557,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
 
                             snackbar.setText(R.string.disable_remote_verify_success).show();
                         });
+                        binding.content.remoteVerify.setVisibility(View.VISIBLE);
                     })
                     .setNegativeButton(R.string.cancel, null)
                     .show();

diff --git a/app/src/main/res/layout/content_attestation.xml b/app/src/main/res/layout/content_attestation.xml
@@ -49,6 +49,13 @@
                 android:text="@string/auditor_button"
                 android:textAllCaps="false" />
 
+            <Button
+                android:id="@+id/remote_verify"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="16dp"
+                android:text="@string/action_enable_remote_verify" />
+
         </LinearLayout>
 
     </ScrollView>

diff --git a/app/src/main/res/menu/menu_attestation.xml b/app/src/main/res/menu/menu_attestation.xml
@@ -8,9 +8,6 @@
     <item android:id="@+id/action_clear_auditor"
             android:title="@string/action_clear_auditor"
             app:showAsAction="never" />
-    <item android:id="@+id/action_enable_remote_verify"
-            android:title="@string/action_enable_remote_verify"
-            app:showAsAction="never" />
     <item android:id="@+id/action_disable_remote_verify"
             android:title="@string/action_disable_remote_verify"
             app:showAsAction="never" />