Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
681
Issues
681
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
briar
briar
Commits
56fb20f2
Verified
Commit
56fb20f2
authored
Apr 18, 2019
by
akwizgran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small code cleanups.
parent
f8229452
Pipeline
#3211
passed with stage
in 9 minutes and 50 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
16 deletions
+11
-16
bramble-core/src/test/java/org/briarproject/bramble/transport/KeyManagerImplTest.java
...rg/briarproject/bramble/transport/KeyManagerImplTest.java
+1
-1
briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsControllerImpl.java
...oid/privategroup/reveal/RevealContactsControllerImpl.java
+2
-4
briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java
...rproject/briar/introduction/IntroduceeProtocolEngine.java
+7
-9
briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java
...java/org/briarproject/briar/blog/BlogManagerImplTest.java
+1
-2
No files found.
bramble-core/src/test/java/org/briarproject/bramble/transport/KeyManagerImplTest.java
View file @
56fb20f2
...
...
@@ -141,7 +141,7 @@ public class KeyManagerImplTest extends BrambleMockTestCase {
public
void
testContactRemovedEvent
()
{
ContactRemovedEvent
event
=
new
ContactRemovedEvent
(
contactId
);
context
.
checking
(
new
Db
Expectations
()
{{
context
.
checking
(
new
Expectations
()
{{
oneOf
(
transportKeyManager
).
removeContact
(
contactId
);
}});
...
...
briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsControllerImpl.java
View file @
56fb20f2
...
...
@@ -75,10 +75,8 @@ class RevealContactsControllerImpl extends DbControllerImpl
@DatabaseExecutor
private
Collection
<
RevealableContactItem
>
getItems
(
GroupId
g
,
Collection
<
ContactId
>
selection
)
throws
DbException
{
Collection
<
GroupMember
>
members
=
groupManager
.
getMembers
(
g
);
Collection
<
Contact
>
contacts
=
contactManager
.
getContacts
();
Collection
<
GroupMember
>
members
=
groupManager
.
getMembers
(
g
);
Collection
<
Contact
>
contacts
=
contactManager
.
getContacts
();
Collection
<
RevealableContactItem
>
items
=
new
ArrayList
<>(
members
.
size
());
for
(
GroupMember
m
:
members
)
{
...
...
briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java
View file @
56fb20f2
...
...
@@ -432,22 +432,20 @@ class IntroduceeProtocolEngine
Map
<
TransportId
,
TransportKeySetId
>
keys
=
null
;
try
{
contactManager
.
addContact
(
txn
,
s
.
getRemote
().
author
,
localAuthor
.
getId
(),
false
);
contactManager
.
addContact
(
txn
,
s
.
getRemote
().
author
,
localAuthor
.
getId
(),
false
);
// Only add transport properties and keys when the contact was added
// This will be changed once we have a way to reset state for peers
// that were contacts already at some point in the past.
Contact
c
=
contactManager
.
getContact
(
txn
,
s
.
getRemote
().
author
.
getId
(),
localAuthor
.
getId
());
Contact
c
=
contactManager
.
getContact
(
txn
,
s
.
getRemote
().
author
.
getId
(),
localAuthor
.
getId
());
// add the keys to the new contact
//noinspection ConstantConditions
keys
=
keyManager
.
addContact
(
txn
,
c
.
getId
(),
new
SecretKey
(
s
.
getMasterKey
())
,
timestamp
,
s
.
getLocal
().
alice
,
false
);
keys
=
keyManager
.
addContact
(
txn
,
c
.
getId
(),
new
SecretKey
(
s
.
getMasterKey
()),
timestamp
,
s
.
getLocal
().
alice
,
false
);
// add signed transport properties for the contact
//noinspection ConstantConditions
...
...
briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java
View file @
56fb20f2
...
...
@@ -91,8 +91,7 @@ public class BlogManagerImplTest extends BriarTestCase {
public
BlogManagerImplTest
()
{
MetadataParser
metadataParser
=
context
.
mock
(
MetadataParser
.
class
);
blogManager
=
new
BlogManagerImpl
(
db
,
contactManager
,
identityManager
,
clientHelper
,
metadataParser
,
blogFactory
,
blogPostFactory
);
clientHelper
,
metadataParser
,
blogFactory
,
blogPostFactory
);
localAuthor1
=
getLocalAuthor
();
localAuthor2
=
getLocalAuthor
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment