From d415ceae159822345b18576d0d57f014bee34fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 10 Sep 2015 19:02:25 -0700 Subject: [PATCH] Block formatting fixes --- .../fdroid/fdroid/localrepo/type/BluetoothSwap.java | 5 ++--- .../org/fdroid/fdroid/localrepo/type/SwapType.java | 3 +-- .../org/fdroid/fdroid/net/BluetoothDownloader.java | 3 +-- F-Droid/src/org/fdroid/fdroid/net/Downloader.java | 3 +-- F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java | 11 ++++------- F-Droid/src/org/fdroid/fdroid/net/IconDownloader.java | 3 +-- F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java | 4 ++-- .../fdroid/fdroid/net/bluetooth/BluetoothServer.java | 4 ++-- .../fdroid/fdroid/net/bluetooth/httpish/Request.java | 6 ++---- .../fdroid/fdroid/net/bluetooth/httpish/Response.java | 3 +-- .../fdroid/views/fragments/ThemeableListFragment.java | 3 +-- .../fdroid/views/swap/SwapWorkflowActivity.java | 2 +- 12 files changed, 19 insertions(+), 31 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java b/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java index d2f1254d2..22e4f917c 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java @@ -50,7 +50,7 @@ public class BluetoothSwap extends SwapType { } @Override - public boolean isDiscoverable () { + public boolean isDiscoverable() { return isDiscoverable; } @@ -120,8 +120,7 @@ public class BluetoothSwap extends SwapType { } } - if (adapter.isEnabled()) - { + if (adapter.isEnabled()) { setConnected(true); } else { Log.i(TAG, "Didn't start Bluetooth swapping server, because Bluetooth is disabled and couldn't be enabled."); diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/type/SwapType.java b/F-Droid/src/org/fdroid/fdroid/localrepo/type/SwapType.java index 89e03a041..90d186161 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/type/SwapType.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/type/SwapType.java @@ -33,8 +33,7 @@ public abstract class SwapType { abstract protected String getBroadcastAction(); - public boolean isDiscoverable () - { + public boolean isDiscoverable() { return isConnected(); } diff --git a/F-Droid/src/org/fdroid/fdroid/net/BluetoothDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/BluetoothDownloader.java index 498b69214..a119b5524 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/BluetoothDownloader.java +++ b/F-Droid/src/org/fdroid/fdroid/net/BluetoothDownloader.java @@ -97,8 +97,7 @@ public class BluetoothDownloader extends Downloader { } @Override - public void close () - { + public void close() { if (connection != null) connection.closeQuietly(); } diff --git a/F-Droid/src/org/fdroid/fdroid/net/Downloader.java b/F-Droid/src/org/fdroid/fdroid/net/Downloader.java index 81028239f..ac8569e94 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/Downloader.java +++ b/F-Droid/src/org/fdroid/fdroid/net/Downloader.java @@ -166,8 +166,7 @@ public abstract class Downloader { int readLength = Math.min(input.available(), buffer.length); count = input.read(buffer, 0, readLength); - } - else { + } else { count = input.read(buffer); } diff --git a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java index 3258f4ac0..3fdd205e5 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java +++ b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java @@ -48,8 +48,7 @@ public class HttpDownloader extends Downloader { * only stream the file through the {@link HttpDownloader#getInputStream()} * @return */ - public HttpDownloader streamDontDownload() - { + public HttpDownloader streamDontDownload() { onlyStream = true; return this; } @@ -69,8 +68,7 @@ public class HttpDownloader extends Downloader { return stream; } - public BufferedReader getBufferedReader () throws IOException - { + public BufferedReader getBufferedReader() throws IOException { return new BufferedReader(new InputStreamReader(getInputStream())); } @@ -169,14 +167,13 @@ public class HttpDownloader extends Downloader { return statusCode; } - public void close () - { + public void close() { try { if (stream != null) stream.close(); } catch (IOException e) {} - + connection.disconnect(); } } diff --git a/F-Droid/src/org/fdroid/fdroid/net/IconDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/IconDownloader.java index 3a20304e1..87af82f8c 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/IconDownloader.java +++ b/F-Droid/src/org/fdroid/fdroid/net/IconDownloader.java @@ -33,8 +33,7 @@ public class IconDownloader extends BaseImageDownloader { } //bluetooth isn't a scheme in the Scheme. library, so we can add a check here - if (imageUri.toLowerCase().startsWith("bluetooth")) - { + if (imageUri.toLowerCase().startsWith("bluetooth")) { Downloader downloader = DownloaderFactory.create(context, imageUri); ByteArrayOutputStream baos = new ByteArrayOutputStream(); diff --git a/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java b/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java index 79b149061..4d9f7b0c1 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java +++ b/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java @@ -276,9 +276,9 @@ public class LocalHTTPD extends NanoHTTPD { res.addHeader("ETag", etag); } } else { - if (etag.equals(header.get("if-none-match"))) + if (etag.equals(header.get("if-none-match"))) { res = createResponse(Response.Status.NOT_MODIFIED, mime, ""); - else { + } else { res = createResponse(Response.Status.OK, mime, new FileInputStream(file)); res.addHeader("Content-Length", "" + fileLen); res.addHeader("ETag", etag); diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java index 71a8b0bab..0944ea01d 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java +++ b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java @@ -311,9 +311,9 @@ public class BluetoothServer extends Thread { res.addHeader("ETag", etag); } } else { - if (etag.equals(header.get("if-none-match"))) + if (etag.equals(header.get("if-none-match"))) { res = createResponse(NanoHTTPD.Response.Status.NOT_MODIFIED, mime, ""); - else { + } else { res = createResponse(NanoHTTPD.Response.Status.OK, mime, new FileInputStream(file)); res.addHeader("Content-Length", "" + fileLen); res.addHeader("ETag", etag); diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java index ec55f7591..b61e84b63 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java +++ b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java @@ -44,8 +44,7 @@ public class Request { input = connection.getInputStream(); } - public static Request createHEAD(String path, BluetoothConnection connection) - { + public static Request createHEAD(String path, BluetoothConnection connection) { return new Request(Methods.HEAD, path, connection); } @@ -141,8 +140,7 @@ public class Request { return Integer.parseInt(status); } - private String readLine () throws IOException - { + private String readLine() throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); String line = null; diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java index 2a6ef90bb..b7ff660c4 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java +++ b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java @@ -62,8 +62,7 @@ public class Response { this.contentStream = contentStream; } - public void addHeader (String key, String value) - { + public void addHeader (String key, String value) { headers.put(key, value); } diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java index f2bb8c786..1f2b77838 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java @@ -38,8 +38,7 @@ public abstract class ThemeableListFragment extends ListFragment { } } - private LayoutInflater getThemedInflater(Context context) - { + private LayoutInflater getThemedInflater(Context context) { Context c = (getThemeStyle() == 0) ? context : new ContextThemeWrapper(context, getThemeStyle()); return (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE); } diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java index 729d995e9..96cdd520c 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java @@ -751,7 +751,7 @@ public class SwapWorkflowActivity extends AppCompatActivity { String bluetooth = service.getBluetoothSwap().isConnected() ? "Y" : " N"; String wifi = service.getWifiSwap().isConnected() ? "Y" : " N"; String mdns = service.getWifiSwap().getBonjour().isConnected() ? "Y" : " N"; - message += "Swap { BT: " + bluetooth + ", WiFi: " + wifi + ", mDNS: " + mdns + "}, "; + message += "Swap { BT: " + bluetooth + ", WiFi: " + wifi + ", mDNS: " + mdns + "}, "; } {