Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
briar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julian Dehm
briar
Commits
7ac7fae3
Commit
7ac7fae3
authored
8 years ago
by
str4d
Browse files
Options
Downloads
Patches
Plain Diff
Update comments
parent
d3b83a50
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
briar-android-tests/src/test/java/org/briarproject/ForumManagerTest.java
+1
-1
1 addition, 1 deletion
...ests/src/test/java/org/briarproject/ForumManagerTest.java
briar-core/src/org/briarproject/db/Database.java
+6
-4
6 additions, 4 deletions
briar-core/src/org/briarproject/db/Database.java
with
7 additions
and
5 deletions
briar-android-tests/src/test/java/org/briarproject/ForumManagerTest.java
+
1
−
1
View file @
7ac7fae3
...
...
@@ -354,7 +354,7 @@ public class ForumManagerTest {
author0
.
getId
(),
master
,
clock
.
currentTimeMillis
(),
true
,
true
);
// invitee adds sharer
s
back
// invitee adds sharer back
contactId0
=
contactManager1
.
addContact
(
author0
,
author1
.
getId
(),
master
,
clock
.
currentTimeMillis
(),
true
,
true
...
...
This diff is collapsed.
Click to expand it.
briar-core/src/org/briarproject/db/Database.java
+
6
−
4
View file @
7ac7fae3
...
...
@@ -329,7 +329,9 @@ interface Database<T> {
/**
* Returns the dependencies of the given message.
* This method makes sure that dependencies in different groups
* are returned as {@link ValidationManager.State.INVALID}.
* are returned as {@link ValidationManager.State.INVALID}. Note that this
* is not set on the dependencies themselves; the returned states should
* only be taken in the context of the given message.
* <p/>
* Read-only.
*/
...
...
@@ -468,14 +470,14 @@ interface Database<T> {
void
lowerRequestedFlag
(
T
txn
,
ContactId
c
,
Collection
<
MessageId
>
requested
)
throws
DbException
;
/*
/*
*
* Merges the given metadata with the existing metadata for the given
* group.
*/
void
mergeGroupMetadata
(
T
txn
,
GroupId
g
,
Metadata
meta
)
throws
DbException
;
/*
/*
*
* Merges the given metadata with the existing metadata for the given
* message.
*/
...
...
@@ -577,7 +579,7 @@ interface Database<T> {
void
setMessageState
(
T
txn
,
MessageId
m
,
State
state
)
throws
DbException
;
/*
/*
*
* Adds a dependency between two MessageIds
*/
void
addMessageDependency
(
T
txn
,
MessageId
dependentId
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment