Merge branch '900-remove-error-state' into 'master' (15ba7327) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

15ba7327

Commit 15ba7327 authored 7 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '900-remove-error-state' into 'master'

Remove error state and reset session on error instead

Closes #900

See merge request !484

parents 0ae55404 720dda78

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

briar-core/src/main/java/org/briarproject/briar/sharing/BlogProtocolEngineImpl.java 2 additions, 3 deletions

...rg/briarproject/briar/sharing/BlogProtocolEngineImpl.java
briar-core/src/main/java/org/briarproject/briar/sharing/ForumProtocolEngineImpl.java 2 additions, 3 deletions

...g/briarproject/briar/sharing/ForumProtocolEngineImpl.java
briar-core/src/main/java/org/briarproject/briar/sharing/ProtocolEngineImpl.java 56 additions, 59 deletions

...va/org/briarproject/briar/sharing/ProtocolEngineImpl.java
briar-core/src/main/java/org/briarproject/briar/sharing/State.java 1 addition, 1 deletion

...e/src/main/java/org/briarproject/briar/sharing/State.java
briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java 73 additions, 0 deletions

...iarproject/briar/sharing/ForumSharingIntegrationTest.java
briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java 3 additions, 0 deletions

...ava/org/briarproject/briar/test/BriarIntegrationTest.java
briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java 0 additions, 3 deletions

...riarproject/briar/test/BriarIntegrationTestComponent.java

with 137 additions and 69 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment