Harden Android shared vault imports

2026-04-06 17:11:07 -07:00
parent fe9f3ae112
commit f1ac24efb9
2 changed files with 10 additions and 1 deletions
@@ -26,6 +26,15 @@ public final class SharedVaultImportActivity extends Activity {
        finish();
    }

+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        handleIntent(intent);
+        launchMainActivity();
+        finish();
+    }
+
    private void handleIntent(Intent intent) {
        Uri uri = resolveSharedUri(intent);
        if (uri == null) {
@@ -35,7 +44,7 @@ public final class SharedVaultImportActivity extends Activity {
        try {
            persistPendingImport(uri);
            Log.i(TAG, "queued shared vault import from " + uri);
-        } catch (IOException err) {
+        } catch (IOException | RuntimeException err) {
            Log.e(TAG, "failed to queue shared vault import", err);
        }
    }