From a1bf8b4fba3c61e63e5a062d09e0eb019b8d2e99 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 2 May 2021 19:03:59 +0530 Subject: [PATCH 1/3] extern/openpgp-api-lib: bump to latest revision Signed-off-by: Harsh Shandilya --- extern/openpgp-api-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib index 89dd28164..8bc98b412 160000 --- a/extern/openpgp-api-lib +++ b/extern/openpgp-api-lib @@ -1 +1 @@ -Subproject commit 89dd28164af4ad48069977e53deaca49b7d0e291 +Subproject commit 8bc98b412bd7cd546b33eac1ced1c1cb302906ca From 6408bac2453656eff2e4d2633872cc707cb8786e Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 2 May 2021 19:04:20 +0530 Subject: [PATCH 2/3] OpenKeychain: add a test for TLD-less email Signed-off-by: Harsh Shandilya --- .../keychain/pgp/SplitUserIdTest.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java index 8f8ca1337..015efde43 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java @@ -130,4 +130,12 @@ public class SplitUserIdTest { Assert.assertEquals("this is a comment", info.comment); } -} \ No newline at end of file + @Test + public void splitUserIdWithInvalidEmailShouldReturnEmail() { + OpenPgpUtils.UserId info = KeyRing.splitUserId("Name@LooksLike.Email "); + Assert.assertEquals("Name@LooksLike.Email", info.name); + Assert.assertEquals("Name@LooksLikeEmail", info.email); + Assert.assertNull(info.comment); + } + +} From 6b3368acb26a25d4fe4e30a88c447c64fb4e2bdb Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 2 May 2021 19:23:02 +0530 Subject: [PATCH 3/3] Update SplitUserIdTest.java --- .../sufficientlysecure/keychain/pgp/SplitUserIdTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java index 015efde43..335be9825 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java @@ -131,10 +131,10 @@ public class SplitUserIdTest { } @Test - public void splitUserIdWithInvalidEmailShouldReturnEmail() { - OpenPgpUtils.UserId info = KeyRing.splitUserId("Name@LooksLike.Email "); - Assert.assertEquals("Name@LooksLike.Email", info.name); - Assert.assertEquals("Name@LooksLikeEmail", info.email); + public void splitUserIdWithEmailWithoutTldShouldReturnNameAndEmail() { + OpenPgpUtils.UserId info = KeyRing.splitUserId("Max Mustermann "); + Assert.assertEquals("Max Mustermann", info.name); + Assert.assertEquals("max@localhost", info.email); Assert.assertNull(info.comment); }