Javadocs, and some minor refactoring.

This commit is contained in:
Moxie Marlinspike
2014-04-24 12:28:38 -07:00
parent af45e5d544
commit 5a3c19fe3e
18 changed files with 333 additions and 46 deletions

View File

@@ -26,7 +26,7 @@ public class SessionUtil {
return
sessionStore.contains(recipientId, deviceId) &&
!sessionStore.get(recipientId, deviceId).getSessionState().getNeedsRefresh();
!sessionStore.load(recipientId, deviceId).getSessionState().getNeedsRefresh();
}
}

View File

@@ -32,7 +32,7 @@ public class TextSecureSessionStore implements SessionStore {
}
@Override
public SessionRecord get(long recipientId, int deviceId) {
public SessionRecord load(long recipientId, int deviceId) {
synchronized (FILE_LOCK) {
try {
FileInputStream input = new FileInputStream(getSessionFile(recipientId, deviceId));
@@ -45,7 +45,7 @@ public class TextSecureSessionStore implements SessionStore {
}
@Override
public void put(long recipientId, int deviceId, SessionRecord record) {
public void store(long recipientId, int deviceId, SessionRecord record) {
try {
RandomAccessFile sessionFile = new RandomAccessFile(getSessionFile(recipientId, deviceId), "rw");
FileChannel out = sessionFile.getChannel();
@@ -63,7 +63,7 @@ public class TextSecureSessionStore implements SessionStore {
@Override
public boolean contains(long recipientId, int deviceId) {
return getSessionFile(recipientId, deviceId).exists() &&
get(recipientId, deviceId).getSessionState().hasSenderChain();
load(recipientId, deviceId).getSessionState().hasSenderChain();
}
@Override