From b05ed99c74ee666d4032e3c34676620e3a506c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 8 Oct 2015 17:05:51 +0200 Subject: [PATCH] Make F-Droid obey the easy checkstyle rules --- F-Droid/src/org/fdroid/fdroid/AppDetails.java | 1 - F-Droid/src/org/fdroid/fdroid/data/AppProvider.java | 2 +- F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java | 4 ++-- F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java | 4 ++-- F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java | 2 -- F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java | 2 +- F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java | 4 ++-- .../src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java | 2 +- 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java index 627d49e8b..03fadc0d3 100644 --- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java +++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java @@ -98,7 +98,6 @@ import org.fdroid.fdroid.net.Downloader; import java.io.File; import java.security.NoSuchAlgorithmException; -import java.text.DecimalFormat; import java.util.Iterator; import java.util.List; diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java index f8bcb087a..d170214b1 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java @@ -868,7 +868,7 @@ public class AppProvider extends FDroidProvider { final String app = DBHelper.TABLE_APP; final boolean unstableUpdates = Preferences.get().getUnstableUpdates(); - String restrictToStable = unstableUpdates ? "" : ( apk + ".vercode <= " + app + ".upstreamVercode AND " ); + String restrictToStable = unstableUpdates ? "" : (apk + ".vercode <= " + app + ".upstreamVercode AND "); String updateSql = "UPDATE " + app + " SET suggestedVercode = ( " + diff --git a/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java b/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java index 07aa5e5b6..9cfbde07b 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java @@ -286,7 +286,7 @@ public class RepoProvider extends FDroidProvider { break; case CODE_SINGLE: - selection = ( selection == null ? "" : selection + " AND " ) + + selection = (selection == null ? "" : selection + " AND ") + DataColumns._ID + " = " + uri.getLastPathSegment(); break; @@ -351,7 +351,7 @@ public class RepoProvider extends FDroidProvider { return 0; case CODE_SINGLE: - where = ( where == null ? "" : where + " AND " ) + + where = (where == null ? "" : where + " AND ") + "_ID = " + uri.getLastPathSegment(); break; diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java index 1b46d65ee..d33330976 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java @@ -379,8 +379,8 @@ public class SwapService extends Service { // ============================================================= private void persistPreferredSwapTypes() { - Utils.debugLog(TAG, "Remembering that Bluetooth swap " + ( bluetoothSwap.isConnected() ? "IS" : "is NOT" ) + - " connected and WiFi swap " + (wifiSwap.isConnected() ? "IS" : "is NOT" ) + " connected."); + Utils.debugLog(TAG, "Remembering that Bluetooth swap " + (bluetoothSwap.isConnected() ? "IS" : "is NOT") + + " connected and WiFi swap " + (wifiSwap.isConnected() ? "IS" : "is NOT") + " connected."); persistence().edit() .putBoolean(KEY_BLUETOOTH_ENABLED, bluetoothSwap.isConnected()) .putBoolean(KEY_WIFI_ENABLED, wifiSwap.isConnected()) diff --git a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java index a62d265c1..6e62ee4f9 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java +++ b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java @@ -3,8 +3,6 @@ package org.fdroid.fdroid.net; import android.content.Context; import android.util.Log; -import com.nostra13.universalimageloader.core.download.BaseImageDownloader; - import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Utils; diff --git a/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java b/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java index ce5768249..af3c8eb11 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java +++ b/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java @@ -107,7 +107,7 @@ public class LocalHTTPD extends NanoHTTPD { switch (uri.getPath()) { case "/request-swap": if (!session.getParms().containsKey("repo")) { - Log.e(TAG, "Malformed /request-swap request to local repo HTTP server. Should have posted a 'repo' parameter." ); + Log.e(TAG, "Malformed /request-swap request to local repo HTTP server. Should have posted a 'repo' parameter."); return new Response(Response.Status.BAD_REQUEST, MIME_PLAINTEXT, "Requires 'repo' parameter to be posted."); } requestSwap(session.getParms().get("repo")); diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java index 0b4ca87e7..3a3d29f27 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java +++ b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java @@ -187,10 +187,10 @@ public class WifiStateChangeService extends Service { @TargetApi(9) public void setIpInfoFromNetworkInterface() { try { - for (Enumeration networkInterfaces = NetworkInterface.getNetworkInterfaces(); networkInterfaces.hasMoreElements(); ) { + for (Enumeration networkInterfaces = NetworkInterface.getNetworkInterfaces(); networkInterfaces.hasMoreElements();) { NetworkInterface netIf = networkInterfaces.nextElement(); - for (Enumeration inetAddresses = netIf.getInetAddresses(); inetAddresses.hasMoreElements(); ) { + for (Enumeration inetAddresses = netIf.getInetAddresses(); inetAddresses.hasMoreElements();) { InetAddress inetAddress = inetAddresses.nextElement(); if (inetAddress.isLoopbackAddress() || inetAddress instanceof Inet6Address) { continue; 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 2ba6cd6e1..3248e4d13 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 @@ -63,7 +63,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); }