handle invalid intervals gracefully

GrapheneOS · Jun 8, 2019 · 750a313 · 750a313
1 parent 23a6b33
commit 750a313
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/app/src/main/java/app/attestation/auditor/AttestationActivity.java b/app/src/main/java/app/attestation/auditor/AttestationActivity.java
@@ -410,7 +410,7 @@ public void onActivityResult(final int requestCode, final int resultCode, final
                     try {
                         RemoteVerifyJob.schedule(this, Integer.parseInt(values[3]));
                         snackbar.setText(R.string.enable_remote_verify).show();
-                    } catch (final RemoteVerifyJob.InvalidInterval | NumberFormatException e) {
+                    } catch (final NumberFormatException e) {
                         snackbar.setText(R.string.scanned_invalid_account_qr_code).show();
                     }
                 } else {

diff --git a/app/src/main/java/app/attestation/auditor/RemoteVerifyJob.java b/app/src/main/java/app/attestation/auditor/RemoteVerifyJob.java
@@ -60,23 +60,17 @@ static boolean isScheduled(final Context context) {
     static void restore(final Context context) {
         if (isEnabled(context) && !isScheduled(context)) {
             Log.d(TAG, "remote attestation is enabled but job was not scheduled, rescheduling it");
-            try {
-                schedule(context, DEFAULT_INTERVAL);
-            } catch (final InvalidInterval e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    static class InvalidInterval extends Exception {
-        InvalidInterval() {
-            super("invalid interval");
+            schedule(context, DEFAULT_INTERVAL);
         }
     }
 
-    static void schedule(final Context context, final int interval) throws InvalidInterval {
-        if (interval < MIN_INTERVAL || interval > MAX_INTERVAL) {
-            throw new InvalidInterval();
+    static void schedule(final Context context, int interval) {
+        if (interval < MIN_INTERVAL) {
+            interval = MIN_INTERVAL;
+            Log.e(TAG, "invalid interval " + interval + " clamped to MIN_INTERVAL " + MIN_INTERVAL);
+        } else if (interval > MAX_INTERVAL) {
+            interval = MAX_INTERVAL;
+            Log.e(TAG, "invalid interval " + interval + " clamped to MAX_INTERVAL " + MAX_INTERVAL);
         }
         final JobScheduler scheduler = context.getSystemService(JobScheduler.class);
         final JobInfo jobInfo = scheduler.getPendingJob(PERIODIC_JOB_ID);
@@ -184,8 +178,7 @@ protected Boolean doInBackground(final Void... params) {
                     }
                     throw new IOException("response code: " + responseCode);
                 }
-            } catch (final GeneralSecurityException | IOException | InvalidInterval |
-                    NumberFormatException e) {
+            } catch (final GeneralSecurityException | IOException | NumberFormatException e) {
                 Log.e(TAG, "remote verify failure", e);
                 failure = true;
             } finally {