moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

Cleanup for style

Browse Source 
Some nitpicks were had. Also, change the null UUID to a constant.
This commit is contained in:
Morgan Gangwere 2015-03-03 08:47:16 -07:00
parent 73a1ceb732
commit ba5eb3543e
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
View File

@ -53,7 +53,7 @@ import java.util.concurrent.ConcurrentHashMap;
public abstract class OperationResult implements Parcelable { public abstract class OperationResult implements Parcelable {
public static final String EXTRA_RESULT = "operation_result"; public static final String EXTRA_RESULT = "operation_result";
public static final UUID NULL_UUID = new UUID(0,0);
/** /**
* A HashMap of UUID:OperationLog which contains logs that we don't need * A HashMap of UUID:OperationLog which contains logs that we don't need
@ -76,7 +76,7 @@ public abstract class OperationResult implements Parcelable {
*/ */
private static UUID dehydrateLog(OperationLog log) { private static UUID dehydrateLog(OperationLog log) {
if(log == null) { if(log == null) {
return new UUID(0,0); return NULL_UUID;
} }
else { else {
UUID ticket = UUID.randomUUID(); UUID ticket = UUID.randomUUID();
@ -93,21 +93,14 @@ public abstract class OperationResult implements Parcelable {
* @return An OperationLog. * @return An OperationLog.
*/ */
private static OperationLog rehydrateLog(UUID ticket) { private static OperationLog rehydrateLog(UUID ticket) {
if(ticket.getMostSignificantBits() == 0 && ticket.getLeastSignificantBits() == 0) { // UUID.equals isn't well documented; we use compareTo instead.
if( NULL_UUID.compareTo(ticket) == 0 ) {
return null; return null;
} }
else else {
{
OperationLog log = dehydratedLogs.get(ticket); OperationLog log = dehydratedLogs.get(ticket);
invalidateDehydrateTicket(ticket);
return log;
}
}
private static void invalidateDehydrateTicket(UUID ticket) {
if(ticket.getLeastSignificantBits() != 0 && ticket.getMostSignificantBits() != 0
&& dehydratedLogs.containsKey(ticket))
{
dehydratedLogs.remove(ticket); dehydratedLogs.remove(ticket);
return log;
} }
} }