Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make F-Droid obey the easy checkstyle rules

Browse Source
This commit is contained in:
Daniel Martí 2015-10-08 17:05:51 +02:00
parent 42b7687cf9
commit b05ed99c74
8 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
F-Droid/src/org/fdroid/fdroid/AppDetails.java
View File

@ -98,7 +98,6 @@ import org.fdroid.fdroid.net.Downloader;
import java.io.File; import java.io.File;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.text.DecimalFormat;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;

2
F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
View File

@ -868,7 +868,7 @@ public class AppProvider extends FDroidProvider {
final String app = DBHelper.TABLE_APP; final String app = DBHelper.TABLE_APP;
final boolean unstableUpdates = Preferences.get().getUnstableUpdates(); final boolean unstableUpdates = Preferences.get().getUnstableUpdates();
String restrictToStable = unstableUpdates ? "" : ( apk + ".vercode <= " + app + ".upstreamVercode AND " ); String restrictToStable = unstableUpdates ? "" : (apk + ".vercode <= " + app + ".upstreamVercode AND ");
String updateSql = String updateSql =
"UPDATE " + app + "UPDATE " + app +
" SET suggestedVercode = ( " + " SET suggestedVercode = ( " +

4
F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java
View File

@ -286,7 +286,7 @@ public class RepoProvider extends FDroidProvider {
break; break;
case CODE_SINGLE: case CODE_SINGLE:
selection = ( selection == null ? "" : selection + " AND " ) + selection = (selection == null ? "" : selection + " AND ") +
DataColumns._ID + " = " + uri.getLastPathSegment(); DataColumns._ID + " = " + uri.getLastPathSegment();
break; break;
@ -351,7 +351,7 @@ public class RepoProvider extends FDroidProvider {
return 0; return 0;
case CODE_SINGLE: case CODE_SINGLE:
where = ( where == null ? "" : where + " AND " ) + where = (where == null ? "" : where + " AND ") +
"_ID = " + uri.getLastPathSegment(); "_ID = " + uri.getLastPathSegment();
break; break;

4
F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
View File

@ -379,8 +379,8 @@ public class SwapService extends Service {
// ============================================================= // =============================================================
private void persistPreferredSwapTypes() { private void persistPreferredSwapTypes() {
Utils.debugLog(TAG, "Remembering that Bluetooth swap " + ( bluetoothSwap.isConnected() ? "IS" : "is NOT" ) + Utils.debugLog(TAG, "Remembering that Bluetooth swap " + (bluetoothSwap.isConnected() ? "IS" : "is NOT") +
" connected and WiFi swap " + (wifiSwap.isConnected() ? "IS" : "is NOT" ) + " connected."); " connected and WiFi swap " + (wifiSwap.isConnected() ? "IS" : "is NOT") + " connected.");
persistence().edit() persistence().edit()
.putBoolean(KEY_BLUETOOTH_ENABLED, bluetoothSwap.isConnected()) .putBoolean(KEY_BLUETOOTH_ENABLED, bluetoothSwap.isConnected())
.putBoolean(KEY_WIFI_ENABLED, wifiSwap.isConnected()) .putBoolean(KEY_WIFI_ENABLED, wifiSwap.isConnected())

2
F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java
View File

@ -3,8 +3,6 @@ package org.fdroid.fdroid.net;
import android.content.Context; import android.content.Context;
import android.util.Log; import android.util.Log;
import com.nostra13.universalimageloader.core.download.BaseImageDownloader;
import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.FDroidApp;
import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;

2
F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java
View File

@ -107,7 +107,7 @@ public class LocalHTTPD extends NanoHTTPD {
switch (uri.getPath()) { switch (uri.getPath()) {
case "/request-swap": case "/request-swap":
if (!session.getParms().containsKey("repo")) { 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."); return new Response(Response.Status.BAD_REQUEST, MIME_PLAINTEXT, "Requires 'repo' parameter to be posted.");
} }
requestSwap(session.getParms().get("repo")); requestSwap(session.getParms().get("repo"));

4
F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
View File

@ -187,10 +187,10 @@ public class WifiStateChangeService extends Service {
@TargetApi(9) @TargetApi(9)
public void setIpInfoFromNetworkInterface() { public void setIpInfoFromNetworkInterface() {
try { try {
for (Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces(); networkInterfaces.hasMoreElements(); ) { for (Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces(); networkInterfaces.hasMoreElements();) {
NetworkInterface netIf = networkInterfaces.nextElement(); NetworkInterface netIf = networkInterfaces.nextElement();
for (Enumeration<InetAddress> inetAddresses = netIf.getInetAddresses(); inetAddresses.hasMoreElements(); ) { for (Enumeration<InetAddress> inetAddresses = netIf.getInetAddresses(); inetAddresses.hasMoreElements();) {
InetAddress inetAddress = inetAddresses.nextElement(); InetAddress inetAddress = inetAddresses.nextElement();
if (inetAddress.isLoopbackAddress() || inetAddress instanceof Inet6Address) { if (inetAddress.isLoopbackAddress() || inetAddress instanceof Inet6Address) {
continue; continue;

2
F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java
View File

@ -63,7 +63,7 @@ public class Response {
this.contentStream = contentStream; this.contentStream = contentStream;
} }
public void addHeader (String key, String value) { public void addHeader(String key, String value) {
headers.put(key, value); headers.put(key, value);
} }