From ec317c29cad40cd8a6f505ba427e2493c1e4898a Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Mon, 19 Oct 2020 17:52:15 +0200 Subject: [PATCH] android: Throw an exception if UUID can't get parsed The parser is quite picky and e.g. doesn't accept UUIDs without dashes. Even without a specific error, this at least points the users into the right direction. Fixes #3583. --- .../org/strongswan/android/ui/VpnProfileImportActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java index a9c8b56de7..12e77eeb2c 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java @@ -463,8 +463,7 @@ public class VpnProfileImportActivity extends AppCompatActivity } catch (IllegalArgumentException e) { - e.printStackTrace(); - return null; + throw new JSONException(getString(R.string.profile_import_failed_value, "uuid")); } ParsedVpnProfile profile = new ParsedVpnProfile(); Integer flags = 0; -- 2.47.3