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
680
Issues
680
List
Boards
Labels
Service Desk
Milestones
Merge Requests
11
Merge Requests
11
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
cc3486df
Verified
Commit
cc3486df
authored
Apr 26, 2019
by
akwizgran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move UnsupportedVersionException to bramble.api package.
parent
cd24be7e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
3 deletions
+21
-3
bramble-api/src/main/java/org/briarproject/bramble/api/UnsupportedVersionException.java
...briarproject/bramble/api/UnsupportedVersionException.java
+18
-0
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java
.../briarproject/bramble/keyagreement/PayloadParserImpl.java
+1
-1
bramble-core/src/test/java/org/briarproject/bramble/keyagreement/PayloadParserImplTest.java
...arproject/bramble/keyagreement/PayloadParserImplTest.java
+1
-1
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java
...ject/briar/android/keyagreement/KeyAgreementFragment.java
+1
-1
No files found.
bramble-api/src/main/java/org/briarproject/bramble/api/
keyagreement/
UnsupportedVersionException.java
→
bramble-api/src/main/java/org/briarproject/bramble/api/UnsupportedVersionException.java
View file @
cc3486df
package
org.briarproject.bramble.api.keyagreement
;
import
java.io.IOException
;
package
org.briarproject.bramble.api
;
/**
* Thrown when
a QR code that has been scanned uses a protocol version that is
*
not
supported.
* Thrown when
data being parsed uses a protocol or format version that is not
* supported.
*/
public
class
UnsupportedVersionException
extends
IO
Exception
{
public
class
UnsupportedVersionException
extends
Format
Exception
{
private
final
boolean
tooOld
;
...
...
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java
View file @
cc3486df
package
org.briarproject.bramble.keyagreement
;
import
org.briarproject.bramble.api.FormatException
;
import
org.briarproject.bramble.api.UnsupportedVersionException
;
import
org.briarproject.bramble.api.data.BdfList
;
import
org.briarproject.bramble.api.data.BdfReader
;
import
org.briarproject.bramble.api.data.BdfReaderFactory
;
import
org.briarproject.bramble.api.keyagreement.Payload
;
import
org.briarproject.bramble.api.keyagreement.PayloadParser
;
import
org.briarproject.bramble.api.keyagreement.TransportDescriptor
;
import
org.briarproject.bramble.api.keyagreement.UnsupportedVersionException
;
import
org.briarproject.bramble.api.nullsafety.NotNullByDefault
;
import
org.briarproject.bramble.api.plugin.BluetoothConstants
;
import
org.briarproject.bramble.api.plugin.LanTcpConstants
;
...
...
bramble-core/src/test/java/org/briarproject/bramble/keyagreement/PayloadParserImplTest.java
View file @
cc3486df
...
...
@@ -2,11 +2,11 @@ package org.briarproject.bramble.keyagreement;
import
org.briarproject.bramble.api.Bytes
;
import
org.briarproject.bramble.api.FormatException
;
import
org.briarproject.bramble.api.UnsupportedVersionException
;
import
org.briarproject.bramble.api.data.BdfList
;
import
org.briarproject.bramble.api.data.BdfReader
;
import
org.briarproject.bramble.api.data.BdfReaderFactory
;
import
org.briarproject.bramble.api.keyagreement.Payload
;
import
org.briarproject.bramble.api.keyagreement.UnsupportedVersionException
;
import
org.briarproject.bramble.test.BrambleMockTestCase
;
import
org.jmock.Expectations
;
import
org.junit.Test
;
...
...
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java
View file @
cc3486df
...
...
@@ -15,6 +15,7 @@ import android.widget.Toast;
import
com.google.zxing.Result
;
import
org.briarproject.bramble.api.UnsupportedVersionException
;
import
org.briarproject.bramble.api.event.Event
;
import
org.briarproject.bramble.api.event.EventBus
;
import
org.briarproject.bramble.api.keyagreement.KeyAgreementResult
;
...
...
@@ -22,7 +23,6 @@ import org.briarproject.bramble.api.keyagreement.KeyAgreementTask;
import
org.briarproject.bramble.api.keyagreement.Payload
;
import
org.briarproject.bramble.api.keyagreement.PayloadEncoder
;
import
org.briarproject.bramble.api.keyagreement.PayloadParser
;
import
org.briarproject.bramble.api.keyagreement.UnsupportedVersionException
;
import
org.briarproject.bramble.api.keyagreement.event.KeyAgreementAbortedEvent
;
import
org.briarproject.bramble.api.keyagreement.event.KeyAgreementFailedEvent
;
import
org.briarproject.bramble.api.keyagreement.event.KeyAgreementFinishedEvent
;
...
...
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