From 077efbbea1f126de59bc01e663815a4d71bb65f9 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Sun, 14 Apr 2013 19:34:50 +0100
Subject: [PATCH] Removed an unused database method.
---
.../sf/briar/api/db/DatabaseComponent.java | 4 --
briar-core/src/net/sf/briar/db/Database.java | 8 ----
.../sf/briar/db/DatabaseComponentImpl.java | 19 ---------
.../src/net/sf/briar/db/JdbcDatabase.java | 40 -------------------
4 files changed, 71 deletions(-)
diff --git a/briar-api/src/net/sf/briar/api/db/DatabaseComponent.java b/briar-api/src/net/sf/briar/api/db/DatabaseComponent.java
index 1b3e9bfd6e..722348bcf6 100644
--- a/briar-api/src/net/sf/briar/api/db/DatabaseComponent.java
+++ b/briar-api/src/net/sf/briar/api/db/DatabaseComponent.java
@@ -203,10 +203,6 @@ public interface DatabaseComponent {
Collection<GroupMessageHeader> getMessageHeaders(GroupId g)
throws DbException;
- /** Returns the headers of all private messages. */
- Collection<PrivateMessageHeader> getPrivateMessageHeaders()
- throws DbException;
-
/**
* Returns the headers of all private messages to or from the given
* contact.
diff --git a/briar-core/src/net/sf/briar/db/Database.java b/briar-core/src/net/sf/briar/db/Database.java
index 2c0987ef1a..f00b294a4e 100644
--- a/briar-core/src/net/sf/briar/db/Database.java
+++ b/briar-core/src/net/sf/briar/db/Database.java
@@ -341,14 +341,6 @@ interface Database<T> {
Collection<GroupMessageHeader> getMessageHeaders(T txn, GroupId g)
throws DbException;
- /**
- * Returns the headers of all private messages.
- * <p>
- * Locking: message read.
- */
- Collection<PrivateMessageHeader> getPrivateMessageHeaders(T txn)
- throws DbException;
-
/**
* Returns the headers of all private messages to or from the given
* contact.
diff --git a/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java b/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
index 4790da31fb..fcaff944b8 100644
--- a/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
+++ b/briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
@@ -1124,25 +1124,6 @@ DatabaseCleaner.Callback {
}
}
- public Collection<PrivateMessageHeader> getPrivateMessageHeaders()
- throws DbException {
- messageLock.readLock().lock();
- try {
- T txn = db.startTransaction();
- try {
- Collection<PrivateMessageHeader> headers =
- db.getPrivateMessageHeaders(txn);
- db.commitTransaction(txn);
- return headers;
- } catch(DbException e) {
- db.abortTransaction(txn);
- throw e;
- }
- } finally {
- messageLock.readLock().unlock();
- }
- }
-
public Collection<PrivateMessageHeader> getPrivateMessageHeaders(
ContactId c) throws DbException {
messageLock.readLock().lock();
diff --git a/briar-core/src/net/sf/briar/db/JdbcDatabase.java b/briar-core/src/net/sf/briar/db/JdbcDatabase.java
index a4ebf2ff73..797ea9a56b 100644
--- a/briar-core/src/net/sf/briar/db/JdbcDatabase.java
+++ b/briar-core/src/net/sf/briar/db/JdbcDatabase.java
@@ -1762,46 +1762,6 @@ abstract class JdbcDatabase implements Database<Connection> {
}
}
- public Collection<PrivateMessageHeader> getPrivateMessageHeaders(
- Connection txn) throws DbException {
- PreparedStatement ps = null;
- ResultSet rs = null;
- try {
- String sql = "SELECT m.messageId, parentId, contentType, subject,"
- + " timestamp, m.contactId, read, starred, seen"
- + " FROM messages AS m"
- + " JOIN statuses AS s"
- + " ON m.messageId = s.messageId"
- + " AND m.contactId = s.contactId"
- + " WHERE groupId IS NULL";
- ps = txn.prepareStatement(sql);
- rs = ps.executeQuery();
- List<PrivateMessageHeader> headers =
- new ArrayList<PrivateMessageHeader>();
- while(rs.next()) {
- MessageId id = new MessageId(rs.getBytes(1));
- byte[] b = rs.getBytes(2);
- MessageId parent = b == null ? null : new MessageId(b);
- String contentType = rs.getString(3);
- String subject = rs.getString(4);
- long timestamp = rs.getLong(5);
- ContactId contactId = new ContactId(rs.getInt(6));
- boolean read = rs.getBoolean(7);
- boolean starred = rs.getBoolean(8);
- boolean seen = rs.getBoolean(9);
- headers.add(new PrivateMessageHeader(id, parent, contentType,
- subject, timestamp, read, starred, contactId, seen));
- }
- rs.close();
- ps.close();
- return Collections.unmodifiableList(headers);
- } catch(SQLException e) {
- tryToClose(rs);
- tryToClose(ps);
- throw new DbException(e);
- }
- }
-
public Collection<PrivateMessageHeader> getPrivateMessageHeaders(
Connection txn, ContactId c) throws DbException {
PreparedStatement ps = null;
--
GitLab