Compare commits
5 commits
a1bf8b4fba
...
8f9728cd60
Author | SHA1 | Date | |
---|---|---|---|
Peter Cai | 8f9728cd60 | ||
6f38af1582 | |||
fdd7c00a80 | |||
6b3368acb2 | |||
6408bac245 |
|
@ -331,12 +331,18 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenActivity {
|
|||
protected Void doInBackground(Void... params) {
|
||||
// check all 200ms if Security Token has been taken away
|
||||
while (true) {
|
||||
if (stConnection.isConnected()) {
|
||||
try {
|
||||
try {
|
||||
if (stConnection.isConnected()) {
|
||||
Thread.sleep(200);
|
||||
} catch (InterruptedException ignored) {
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
} else {
|
||||
} catch (InterruptedException ignored) {
|
||||
// Sleep interrupted; ignore
|
||||
} catch (SecurityException ignored) {
|
||||
// In newer version of Android, isConnected() can throw an SecurityException
|
||||
// when the Tag object becomes "stale"; this simply means the tag has been removed
|
||||
// (and possibly rediscovered), so we can safely break from here.
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -130,4 +130,12 @@ public class SplitUserIdTest {
|
|||
Assert.assertEquals("this is a comment", info.comment);
|
||||
}
|
||||
|
||||
}
|
||||
@Test
|
||||
public void splitUserIdWithEmailWithoutTldShouldReturnNameAndEmail() {
|
||||
OpenPgpUtils.UserId info = KeyRing.splitUserId("Max Mustermann <max@localhost>");
|
||||
Assert.assertEquals("Max Mustermann", info.name);
|
||||
Assert.assertEquals("max@localhost", info.email);
|
||||
Assert.assertNull(info.comment);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
**WARNING: This software is no longer actively developed.**
|
||||
We will still apply security fixes where reported, and do basic maintenance work, but no new features or will be worked on.
|
||||
We will try to consider and merge contributions where possible.
|
||||
|
||||
# OpenKeychain (for Android)
|
||||
|
||||
OpenKeychain is an OpenPGP implementation for Android.
|
||||
|
|
Loading…
Reference in a new issue