From 2ca2356ecc8efa911872d425e91f9eb31f038611 Mon Sep 17 00:00:00 2001 From: akwizgran <akwizgran@users.sourceforge.net> Date: Tue, 15 Dec 2015 14:49:50 +0000 Subject: [PATCH] Moved MessageHeader to sync package. --- .../android/contact/ContactListActivity.java | 2 +- .../android/contact/ContactListItem.java | 2 +- .../android/contact/ConversationActivity.java | 4 +-- .../android/contact/ConversationAdapter.java | 31 +++++++++---------- .../android/contact/ConversationItem.java | 4 +-- .../android/forum/ForumActivity.java | 2 +- .../android/forum/ForumAdapter.java | 2 +- .../briarproject/android/forum/ForumItem.java | 2 +- .../android/forum/ForumListActivity.java | 2 +- .../android/forum/ForumListItem.java | 2 +- .../api/db/DatabaseComponent.java | 4 +-- .../api/{db => sync}/MessageHeader.java | 4 +-- .../src/org/briarproject/db/Database.java | 2 +- .../db/DatabaseComponentImpl.java | 2 +- .../src/org/briarproject/db/JdbcDatabase.java | 4 +-- .../org/briarproject/db/H2DatabaseTest.java | 4 +-- 16 files changed, 35 insertions(+), 38 deletions(-) rename briar-api/src/org/briarproject/api/{db => sync}/MessageHeader.java (94%) diff --git a/briar-android/src/org/briarproject/android/contact/ContactListActivity.java b/briar-android/src/org/briarproject/android/contact/ContactListActivity.java index 094de1133c..02a244c23c 100644 --- a/briar-android/src/org/briarproject/android/contact/ContactListActivity.java +++ b/briar-android/src/org/briarproject/android/contact/ContactListActivity.java @@ -28,7 +28,6 @@ import org.briarproject.api.Contact; import org.briarproject.api.ContactId; import org.briarproject.api.db.DatabaseComponent; import org.briarproject.api.db.DbException; -import org.briarproject.api.db.MessageHeader; import org.briarproject.api.db.NoSuchContactException; import org.briarproject.api.event.ContactAddedEvent; import org.briarproject.api.event.ContactConnectedEvent; @@ -41,6 +40,7 @@ import org.briarproject.api.event.MessageAddedEvent; import org.briarproject.api.event.MessageExpiredEvent; import org.briarproject.api.plugins.ConnectionRegistry; import org.briarproject.api.sync.GroupId; +import org.briarproject.api.sync.MessageHeader; import java.util.Collection; import java.util.logging.Logger; diff --git a/briar-android/src/org/briarproject/android/contact/ContactListItem.java b/briar-android/src/org/briarproject/android/contact/ContactListItem.java index 19cec75cc0..0e2cca813d 100644 --- a/briar-android/src/org/briarproject/android/contact/ContactListItem.java +++ b/briar-android/src/org/briarproject/android/contact/ContactListItem.java @@ -1,8 +1,8 @@ package org.briarproject.android.contact; import org.briarproject.api.Contact; -import org.briarproject.api.db.MessageHeader; import org.briarproject.api.sync.GroupId; +import org.briarproject.api.sync.MessageHeader; import java.util.Collection; diff --git a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java index 76cc95310d..017cbfa0df 100644 --- a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java +++ b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java @@ -27,8 +27,6 @@ import org.briarproject.api.android.AndroidNotificationManager; import org.briarproject.api.crypto.CryptoExecutor; import org.briarproject.api.db.DatabaseComponent; import org.briarproject.api.db.DbException; -import org.briarproject.api.db.MessageHeader; -import org.briarproject.api.db.MessageHeader.State; import org.briarproject.api.db.NoSuchContactException; import org.briarproject.api.db.NoSuchMessageException; import org.briarproject.api.db.NoSuchSubscriptionException; @@ -44,6 +42,8 @@ import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; import org.briarproject.api.sync.MessageFactory; +import org.briarproject.api.sync.MessageHeader; +import org.briarproject.api.sync.MessageHeader.State; import org.briarproject.api.sync.MessageId; import org.briarproject.util.StringUtils; diff --git a/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java b/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java index f78f4bb682..240bdea4dd 100644 --- a/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java +++ b/briar-android/src/org/briarproject/android/contact/ConversationAdapter.java @@ -1,21 +1,5 @@ package org.briarproject.android.contact; -import static android.view.Gravity.BOTTOM; -import static android.view.Gravity.LEFT; -import static android.view.View.INVISIBLE; -import static android.widget.LinearLayout.HORIZONTAL; -import static android.widget.LinearLayout.VERTICAL; -import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP; - -import java.util.ArrayList; - -import org.briarproject.R; -import org.briarproject.android.util.ElasticHorizontalSpace; -import org.briarproject.android.util.LayoutUtils; -import org.briarproject.api.db.MessageHeader; -import org.briarproject.api.db.MessageHeader.State; -import org.briarproject.util.StringUtils; - import android.content.Context; import android.content.res.Resources; import android.text.format.DateUtils; @@ -27,6 +11,21 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import org.briarproject.R; +import org.briarproject.android.util.ElasticHorizontalSpace; +import org.briarproject.android.util.LayoutUtils; +import org.briarproject.api.sync.MessageHeader; +import org.briarproject.api.sync.MessageHeader.State; +import org.briarproject.util.StringUtils; + +import java.util.ArrayList; + +import static android.view.Gravity.BOTTOM; +import static android.view.Gravity.LEFT; +import static android.widget.LinearLayout.HORIZONTAL; +import static android.widget.LinearLayout.VERTICAL; +import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP; + class ConversationAdapter extends ArrayAdapter<ConversationItem> { private final int pad; diff --git a/briar-android/src/org/briarproject/android/contact/ConversationItem.java b/briar-android/src/org/briarproject/android/contact/ConversationItem.java index ac5637e164..292bd4a713 100644 --- a/briar-android/src/org/briarproject/android/contact/ConversationItem.java +++ b/briar-android/src/org/briarproject/android/contact/ConversationItem.java @@ -1,7 +1,7 @@ package org.briarproject.android.contact; -import org.briarproject.api.db.MessageHeader; -import org.briarproject.api.db.MessageHeader.State; +import org.briarproject.api.sync.MessageHeader; +import org.briarproject.api.sync.MessageHeader.State; // This class is not thread-safe class ConversationItem { diff --git a/briar-android/src/org/briarproject/android/forum/ForumActivity.java b/briar-android/src/org/briarproject/android/forum/ForumActivity.java index e17719ece3..3c4b5a2674 100644 --- a/briar-android/src/org/briarproject/android/forum/ForumActivity.java +++ b/briar-android/src/org/briarproject/android/forum/ForumActivity.java @@ -21,7 +21,6 @@ import org.briarproject.api.Author; import org.briarproject.api.android.AndroidNotificationManager; import org.briarproject.api.db.DatabaseComponent; import org.briarproject.api.db.DbException; -import org.briarproject.api.db.MessageHeader; import org.briarproject.api.db.NoSuchMessageException; import org.briarproject.api.db.NoSuchSubscriptionException; import org.briarproject.api.event.Event; @@ -32,6 +31,7 @@ import org.briarproject.api.event.MessageExpiredEvent; import org.briarproject.api.event.SubscriptionRemovedEvent; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; +import org.briarproject.api.sync.MessageHeader; import org.briarproject.api.sync.MessageId; import java.util.ArrayList; diff --git a/briar-android/src/org/briarproject/android/forum/ForumAdapter.java b/briar-android/src/org/briarproject/android/forum/ForumAdapter.java index cc8db894db..8660f43814 100644 --- a/briar-android/src/org/briarproject/android/forum/ForumAdapter.java +++ b/briar-android/src/org/briarproject/android/forum/ForumAdapter.java @@ -14,7 +14,7 @@ import org.briarproject.R; import org.briarproject.android.util.AuthorView; import org.briarproject.android.util.LayoutUtils; import org.briarproject.api.Author; -import org.briarproject.api.db.MessageHeader; +import org.briarproject.api.sync.MessageHeader; import org.briarproject.util.StringUtils; import java.util.ArrayList; diff --git a/briar-android/src/org/briarproject/android/forum/ForumItem.java b/briar-android/src/org/briarproject/android/forum/ForumItem.java index ca42d7e9a6..ec87cbf034 100644 --- a/briar-android/src/org/briarproject/android/forum/ForumItem.java +++ b/briar-android/src/org/briarproject/android/forum/ForumItem.java @@ -1,6 +1,6 @@ package org.briarproject.android.forum; -import org.briarproject.api.db.MessageHeader; +import org.briarproject.api.sync.MessageHeader; // This class is not thread-safe class ForumItem { diff --git a/briar-android/src/org/briarproject/android/forum/ForumListActivity.java b/briar-android/src/org/briarproject/android/forum/ForumListActivity.java index 1b061f44ab..38f1d43561 100644 --- a/briar-android/src/org/briarproject/android/forum/ForumListActivity.java +++ b/briar-android/src/org/briarproject/android/forum/ForumListActivity.java @@ -25,7 +25,6 @@ import org.briarproject.android.util.LayoutUtils; import org.briarproject.android.util.ListLoadingProgressBar; import org.briarproject.api.db.DatabaseComponent; import org.briarproject.api.db.DbException; -import org.briarproject.api.db.MessageHeader; import org.briarproject.api.db.NoSuchSubscriptionException; import org.briarproject.api.event.Event; import org.briarproject.api.event.EventBus; @@ -37,6 +36,7 @@ import org.briarproject.api.event.SubscriptionAddedEvent; import org.briarproject.api.event.SubscriptionRemovedEvent; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; +import org.briarproject.api.sync.MessageHeader; import java.util.Collection; import java.util.Map; diff --git a/briar-android/src/org/briarproject/android/forum/ForumListItem.java b/briar-android/src/org/briarproject/android/forum/ForumListItem.java index a41ae98f3a..3eef6c4361 100644 --- a/briar-android/src/org/briarproject/android/forum/ForumListItem.java +++ b/briar-android/src/org/briarproject/android/forum/ForumListItem.java @@ -1,7 +1,7 @@ package org.briarproject.android.forum; -import org.briarproject.api.db.MessageHeader; import org.briarproject.api.sync.Group; +import org.briarproject.api.sync.MessageHeader; import java.util.Collection; diff --git a/briar-api/src/org/briarproject/api/db/DatabaseComponent.java b/briar-api/src/org/briarproject/api/db/DatabaseComponent.java index c76a155d92..9aff24206c 100644 --- a/briar-api/src/org/briarproject/api/db/DatabaseComponent.java +++ b/briar-api/src/org/briarproject/api/db/DatabaseComponent.java @@ -179,7 +179,7 @@ public interface DatabaseComponent { * Returns the headers of all messages in the inbox group for the given * contact, or null if no inbox group has been set. */ - Collection<MessageHeader> getInboxMessageHeaders(ContactId c) + Collection<org.briarproject.api.sync.MessageHeader> getInboxMessageHeaders(ContactId c) throws DbException; /** Returns the local pseudonym with the given ID. */ @@ -199,7 +199,7 @@ public interface DatabaseComponent { byte[] getMessageBody(MessageId m) throws DbException; /** Returns the headers of all messages in the given group. */ - Collection<MessageHeader> getMessageHeaders(GroupId g) + Collection<org.briarproject.api.sync.MessageHeader> getMessageHeaders(GroupId g) throws DbException; /** Returns true if the given message is marked as read. */ diff --git a/briar-api/src/org/briarproject/api/db/MessageHeader.java b/briar-api/src/org/briarproject/api/sync/MessageHeader.java similarity index 94% rename from briar-api/src/org/briarproject/api/db/MessageHeader.java rename to briar-api/src/org/briarproject/api/sync/MessageHeader.java index 7ba4eaaf1c..e70e1fef16 100644 --- a/briar-api/src/org/briarproject/api/db/MessageHeader.java +++ b/briar-api/src/org/briarproject/api/sync/MessageHeader.java @@ -1,8 +1,6 @@ -package org.briarproject.api.db; +package org.briarproject.api.sync; import org.briarproject.api.Author; -import org.briarproject.api.sync.GroupId; -import org.briarproject.api.sync.MessageId; public class MessageHeader { diff --git a/briar-core/src/org/briarproject/db/Database.java b/briar-core/src/org/briarproject/db/Database.java index feeb4381b0..9e0e8045c3 100644 --- a/briar-core/src/org/briarproject/db/Database.java +++ b/briar-core/src/org/briarproject/db/Database.java @@ -10,10 +10,10 @@ import org.briarproject.api.TransportConfig; import org.briarproject.api.TransportId; import org.briarproject.api.TransportProperties; import org.briarproject.api.db.DbException; -import org.briarproject.api.db.MessageHeader; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; +import org.briarproject.api.sync.MessageHeader; import org.briarproject.api.sync.MessageId; import org.briarproject.api.sync.RetentionAck; import org.briarproject.api.sync.RetentionUpdate; diff --git a/briar-core/src/org/briarproject/db/DatabaseComponentImpl.java b/briar-core/src/org/briarproject/db/DatabaseComponentImpl.java index caa88847d2..280dda05b9 100644 --- a/briar-core/src/org/briarproject/db/DatabaseComponentImpl.java +++ b/briar-core/src/org/briarproject/db/DatabaseComponentImpl.java @@ -13,7 +13,6 @@ import org.briarproject.api.db.ContactExistsException; import org.briarproject.api.db.DatabaseComponent; import org.briarproject.api.db.DbException; import org.briarproject.api.db.LocalAuthorExistsException; -import org.briarproject.api.db.MessageHeader; import org.briarproject.api.db.NoSuchContactException; import org.briarproject.api.db.NoSuchLocalAuthorException; import org.briarproject.api.db.NoSuchMessageException; @@ -46,6 +45,7 @@ import org.briarproject.api.sync.Ack; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; +import org.briarproject.api.sync.MessageHeader; import org.briarproject.api.sync.MessageId; import org.briarproject.api.sync.Offer; import org.briarproject.api.sync.Request; diff --git a/briar-core/src/org/briarproject/db/JdbcDatabase.java b/briar-core/src/org/briarproject/db/JdbcDatabase.java index f0dd8c5324..f51f4e192e 100644 --- a/briar-core/src/org/briarproject/db/JdbcDatabase.java +++ b/briar-core/src/org/briarproject/db/JdbcDatabase.java @@ -12,11 +12,11 @@ import org.briarproject.api.TransportProperties; import org.briarproject.api.crypto.SecretKey; import org.briarproject.api.db.DbClosedException; import org.briarproject.api.db.DbException; -import org.briarproject.api.db.MessageHeader; -import org.briarproject.api.db.MessageHeader.State; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; +import org.briarproject.api.sync.MessageHeader; +import org.briarproject.api.sync.MessageHeader.State; import org.briarproject.api.sync.MessageId; import org.briarproject.api.sync.RetentionAck; import org.briarproject.api.sync.RetentionUpdate; diff --git a/briar-tests/src/org/briarproject/db/H2DatabaseTest.java b/briar-tests/src/org/briarproject/db/H2DatabaseTest.java index 4c0b0b6e2e..686789f687 100644 --- a/briar-tests/src/org/briarproject/db/H2DatabaseTest.java +++ b/briar-tests/src/org/briarproject/db/H2DatabaseTest.java @@ -13,10 +13,10 @@ import org.briarproject.api.TransportId; import org.briarproject.api.TransportProperties; import org.briarproject.api.crypto.SecretKey; import org.briarproject.api.db.DbException; -import org.briarproject.api.db.MessageHeader; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; +import org.briarproject.api.sync.MessageHeader; import org.briarproject.api.sync.MessageId; import org.briarproject.api.transport.IncomingKeys; import org.briarproject.api.transport.OutgoingKeys; @@ -43,7 +43,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import static java.util.concurrent.TimeUnit.SECONDS; import static org.briarproject.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH; -import static org.briarproject.api.db.MessageHeader.State.STORED; +import static org.briarproject.api.sync.MessageHeader.State.STORED; import static org.briarproject.api.sync.MessagingConstants.GROUP_SALT_LENGTH; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -- GitLab