review changes

Author: zarakik

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

@@ -553,7 +553,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
         else if (itemId == R.id.action_remote_verify_now) {
             if (checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
                 requestPermissions(new String[]{Manifest.permission.POST_NOTIFICATIONS},
-                        PERMISSIONS_REQUEST_POST_NOTIFICATIONS_SUBMIT_SAMPLE);
+                        PERMISSIONS_REQUEST_POST_NOTIFICATIONS_REMOTE_VERIFY);
             } else {
                 RemoteVerifyJob.schedule(this, -1);
                 snackbar.setText(R.string.remote_verify_now).show();

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

@@ -39,6 +39,8 @@ public class RemoteVerifyJob extends JobService {
     private static final String TAG = "RemoteVerifyJob";
     private static final int PERIODIC_JOB_ID = 0;
     private static final int FIRST_RUN_JOB_ID = 1;
+
+    private static final int FIRE_ONCE_JOB_ID = 2;
     static final String DOMAIN = "attestation.app";
     private static final String CHALLENGE_URL = "https://" + DOMAIN + "/challenge";
     private static final String VERIFY_URL = "https://" + DOMAIN + "/verify";
@@ -117,13 +119,14 @@ static void schedule(final Context context, int interval) {
                 throw new RuntimeException("job schedule failed");
             }
         }
-        final JobInfo.Builder builder = new JobInfo.Builder(PERIODIC_JOB_ID, serviceName)
+        final JobInfo.Builder builder = scheduleNow ?
+                new JobInfo.Builder(FIRE_ONCE_JOB_ID, serviceName)
+                        .setPersisted(true)
+                        .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                : new JobInfo.Builder(PERIODIC_JOB_ID, serviceName)
                 .setPersisted(true)
-                .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY);
-
-        if(!scheduleNow) {
-            builder.setPeriodic(intervalMillis, flexMillis);
-        }
+                .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                .setPeriodic(intervalMillis, flexMillis);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             builder.setEstimatedNetworkBytes(ESTIMATED_DOWNLOAD_BYTES, ESTIMATED_UPLOAD_BYTES);