From 5a145c9eb2b138ce98233c0290b60ea86a3fd91f Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 3 Aug 2018 11:13:35 +0100 Subject: [PATCH] Replace assert statements with AssertionErrors. --- .../bramble/network/AndroidNetworkManager.java | 2 +- .../bramble/plugin/tcp/AndroidLanTcpPlugin.java | 2 +- .../briarproject/bramble/sync/SyncRecordReaderImpl.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkManager.java b/bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkManager.java index 490f8b4ec..af0e9a881 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkManager.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkManager.java @@ -91,7 +91,7 @@ class AndroidNetworkManager implements NetworkManager, Service { public NetworkStatus getNetworkStatus() { ConnectivityManager cm = (ConnectivityManager) appContext.getSystemService(CONNECTIVITY_SERVICE); - assert cm != null; + if (cm == null) throw new AssertionError(); NetworkInfo net = cm.getActiveNetworkInfo(); boolean connected = net != null && net.isConnected(); boolean wifi = connected && net.getType() == TYPE_WIFI; diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java index aa2591e8a..b3c3a98ae 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java @@ -68,7 +68,7 @@ class AndroidLanTcpPlugin extends LanTcpPlugin implements EventListener { new PoliteExecutor("AndroidLanTcpPlugin", ioExecutor, 1); ConnectivityManager connectivityManager = (ConnectivityManager) appContext.getSystemService(CONNECTIVITY_SERVICE); - assert connectivityManager != null; + if (connectivityManager == null) throw new AssertionError(); this.connectivityManager = connectivityManager; wifiManager = (WifiManager) appContext.getApplicationContext() .getSystemService(WIFI_SERVICE); diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordReaderImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordReaderImpl.java index 3a7c6d057..d4763a521 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordReaderImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordReaderImpl.java @@ -46,7 +46,7 @@ class SyncRecordReaderImpl implements SyncRecordReader { } private void readRecord() throws IOException { - assert nextRecord == null; + if (nextRecord != null) throw new AssertionError(); while (true) { nextRecord = reader.readRecord(); // Check the protocol version @@ -62,7 +62,7 @@ class SyncRecordReaderImpl implements SyncRecordReader { } private byte getNextRecordType() { - assert nextRecord != null; + if (nextRecord == null) throw new AssertionError(); return nextRecord.getRecordType(); } @@ -100,7 +100,7 @@ class SyncRecordReaderImpl implements SyncRecordReader { } private List readMessageIds() throws IOException { - assert nextRecord != null; + if (nextRecord == null) throw new AssertionError(); byte[] payload = nextRecord.getPayload(); if (payload.length == 0) throw new FormatException(); if (payload.length % UniqueId.LENGTH != 0) throw new FormatException(); @@ -122,7 +122,7 @@ class SyncRecordReaderImpl implements SyncRecordReader { @Override public Message readMessage() throws IOException { if (!hasMessage()) throw new FormatException(); - assert nextRecord != null; + if (nextRecord == null) throw new AssertionError(); byte[] payload = nextRecord.getPayload(); if (payload.length < MESSAGE_HEADER_LENGTH) throw new FormatException(); // Validate timestamp