From cc3486df94061cf5c8cafcc495ee7f2751368403 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 26 Apr 2019 10:58:22 +0100 Subject: [PATCH] Move UnsupportedVersionException to bramble.api package. --- .../api/UnsupportedVersionException.java | 18 +++++++++++++++++ .../UnsupportedVersionException.java | 20 ------------------- .../keyagreement/PayloadParserImpl.java | 2 +- .../keyagreement/PayloadParserImplTest.java | 2 +- .../keyagreement/KeyAgreementFragment.java | 2 +- 5 files changed, 21 insertions(+), 23 deletions(-) create mode 100644 bramble-api/src/main/java/org/briarproject/bramble/api/UnsupportedVersionException.java delete mode 100644 bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/UnsupportedVersionException.java diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/UnsupportedVersionException.java b/bramble-api/src/main/java/org/briarproject/bramble/api/UnsupportedVersionException.java new file mode 100644 index 000000000..827f33e16 --- /dev/null +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/UnsupportedVersionException.java @@ -0,0 +1,18 @@ +package org.briarproject.bramble.api; + +/** + * Thrown when data being parsed uses a protocol or format version that is not + * supported. + */ +public class UnsupportedVersionException extends FormatException { + + private final boolean tooOld; + + public UnsupportedVersionException(boolean tooOld) { + this.tooOld = tooOld; + } + + public boolean isTooOld() { + return tooOld; + } +} diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/UnsupportedVersionException.java b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/UnsupportedVersionException.java deleted file mode 100644 index 3f861d83b..000000000 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/UnsupportedVersionException.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.briarproject.bramble.api.keyagreement; - -import java.io.IOException; - -/** - * Thrown when a QR code that has been scanned uses a protocol version that is - * not supported. - */ -public class UnsupportedVersionException extends IOException { - - private final boolean tooOld; - - public UnsupportedVersionException(boolean tooOld) { - this.tooOld = tooOld; - } - - public boolean isTooOld() { - return tooOld; - } -} diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java index 2f6096760..f574360a7 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java @@ -1,13 +1,13 @@ 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; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/keyagreement/PayloadParserImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/keyagreement/PayloadParserImplTest.java index 3b072547f..f9d74e081 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/keyagreement/PayloadParserImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/keyagreement/PayloadParserImplTest.java @@ -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; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java index 168708367..e2b449126 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java @@ -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; -- 2.24.1