From b4dd9c857e548d653228ea13fe1f6bb1398d632f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 31 Mar 2016 12:37:37 +0100 Subject: [PATCH] Get closer to obeying PMD's unused code rules --- .../main/java/org/fdroid/fdroid/Preferences.java | 6 ++---- .../fdroid/fdroid/ProgressBufferedInputStream.java | 1 - .../org/fdroid/fdroid/localrepo/SwapService.java | 7 +++++-- .../fdroid/localrepo/peers/BluetoothPeer.java | 1 - .../org/fdroid/fdroid/net/DownloaderFactory.java | 5 ----- .../main/java/org/fdroid/fdroid/net/LocalHTTPD.java | 4 ++-- .../privileged/views/AppSecurityPermissions.java | 13 +++---------- .../fdroid/views/swap/InitialLoadingView.java | 4 ---- .../fdroid/fdroid/views/swap/SelectAppsView.java | 3 --- 9 files changed, 12 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/Preferences.java b/app/src/main/java/org/fdroid/fdroid/Preferences.java index d9243712a..93d6d3d28 100644 --- a/app/src/main/java/org/fdroid/fdroid/Preferences.java +++ b/app/src/main/java/org/fdroid/fdroid/Preferences.java @@ -30,11 +30,9 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh private static final String TAG = "Preferences"; - private final Context context; private final SharedPreferences preferences; private Preferences(Context context) { - this.context = context; preferences = PreferenceManager.getDefaultSharedPreferences(context); preferences.registerOnSharedPreferenceChangeListener(this); if (preferences.getString(PREF_LOCAL_REPO_NAME, null) == null) { @@ -72,10 +70,10 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh private static final boolean DEFAULT_ROOTED = true; private static final int DEFAULT_UPD_HISTORY = 14; private static final boolean DEFAULT_PRIVILEGED_INSTALLER = false; - private static final boolean DEFAULT_LOCAL_REPO_BONJOUR = true; + //private static final boolean DEFAULT_LOCAL_REPO_BONJOUR = true; private static final boolean DEFAULT_CACHE_APK = false; private static final boolean DEFAULT_UNSTABLE_UPDATES = false; - private static final boolean DEFAULT_LOCAL_REPO_HTTPS = false; + //private static final boolean DEFAULT_LOCAL_REPO_HTTPS = false; private static final boolean DEFAULT_INCOMP_VER = false; private static final boolean DEFAULT_EXPERT = false; private static final boolean DEFAULT_ENABLE_PROXY = false; diff --git a/app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java b/app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java index 6327a14ee..ee5d5f0aa 100644 --- a/app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java +++ b/app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java @@ -9,7 +9,6 @@ import java.io.IOException; import java.io.InputStream; public class ProgressBufferedInputStream extends BufferedInputStream { - private static final String TAG = "ProgressBufferedInputSt"; private final ProgressListener progressListener; private final Bundle data; diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java b/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java index a9dcebeab..818b26725 100644 --- a/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java +++ b/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java @@ -404,9 +404,11 @@ public class SwapService extends Service { .commit(); } + /* private boolean wasBluetoothEnabled() { return persistence().getBoolean(KEY_BLUETOOTH_ENABLED, false); } + */ private boolean wasWifiEnabled() { return persistence().getBoolean(KEY_WIFI_ENABLED, false); @@ -537,11 +539,12 @@ public class SwapService extends Service { filter.addAction(WIFI_STATE_CHANGE); LocalBroadcastManager.getInstance(this).registerReceiver(receiveSwapStatusChanged, filter); - /** + /* if (wasBluetoothEnabled()) { Utils.debugLog(TAG, "Previously the user enabled Bluetooth swap, so enabling again automatically."); bluetoothSwap.startInBackground(); - }*/ + } + */ if (wasWifiEnabled()) { Utils.debugLog(TAG, "Previously the user enabled WiFi swap, so enabling again automatically."); diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java index 7ea27bec2..2ff605da2 100644 --- a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java +++ b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java @@ -7,7 +7,6 @@ import org.fdroid.fdroid.R; import org.fdroid.fdroid.localrepo.type.BluetoothSwap; public class BluetoothPeer implements Peer { - private static final String TAG = "BluetoothPeer"; private final BluetoothDevice device; diff --git a/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java b/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java index d50896a43..4a159e3f6 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java +++ b/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java @@ -11,7 +11,6 @@ import java.io.IOException; import java.net.URL; public class DownloaderFactory { - private static final String TAG = "DownloaderFactory"; private static LocalBroadcastManager localBroadcastManager; @@ -69,8 +68,4 @@ public class DownloaderFactory { URL url = new URL(urlString); return new AsyncDownloadWrapper(create(context, url, destFile, credentials), listener); } - - private static boolean isOnionAddress(URL url) { - return url.getHost().endsWith(".onion"); - } } diff --git a/app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java b/app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java index 8517e1189..0a97ab8ee 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java +++ b/app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java @@ -206,7 +206,7 @@ public class LocalHTTPD extends NanoHTTPD { } } - Response response = serveFile(uri, headers, f, getMimeTypeForFile(uri)); + Response response = serveFile(headers, f, getMimeTypeForFile(uri)); return response != null ? response : createResponse(Response.Status.NOT_FOUND, NanoHTTPD.MIME_PLAINTEXT, "Error 404, file not found."); @@ -216,7 +216,7 @@ public class LocalHTTPD extends NanoHTTPD { * Serves file from homeDir and its' subdirectories (only). Uses only URI, * ignores all headers and HTTP parameters. */ - private Response serveFile(String uri, Map header, File file, String mime) { + private Response serveFile(Map header, File file, String mime) { Response res; try { // Calculate etag diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java index 13b7801c3..f751080ed 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java +++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java @@ -122,11 +122,6 @@ public class AppSecurityPermissions { private static class MyPermissionInfo extends PermissionInfo { CharSequence mLabel; - /** - * PackageInfo.requestedPermissionsFlags for the new package being installed. - */ - int mNewReqFlags; - /** * PackageInfo.requestedPermissionsFlags for the currently installed * package, if it is installed. @@ -298,7 +293,7 @@ public class AppSecurityPermissions { final int[] instFlagsList = getRequestedPermissionFlags(installedPkgInfo); existingFlags = instFlagsList[existingIndex]; } - if (!isDisplayablePermission(tmpPermInfo, flagsList[i], existingFlags)) { + if (!isDisplayablePermission(tmpPermInfo, existingFlags)) { // This is not a permission that is interesting for the user // to see, so skip it. continue; @@ -333,7 +328,6 @@ public class AppSecurityPermissions { final boolean newPerm = installedPkgInfo != null && (existingFlags & PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0; MyPermissionInfo myPerm = new MyPermissionInfo(tmpPermInfo); - myPerm.mNewReqFlags = flagsList[i]; myPerm.mExistingReqFlags = existingFlags; // This is a new permission if the app is already installed and // doesn't currently hold this permission. @@ -424,8 +418,7 @@ public class AppSecurityPermissions { } @TargetApi(Build.VERSION_CODES.JELLY_BEAN) - private boolean isDisplayablePermission(PermissionInfo pInfo, int newReqFlags, - int existingReqFlags) { + private boolean isDisplayablePermission(PermissionInfo pInfo, int existingReqFlags) { final int base = pInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE; final boolean isNormal = base == PermissionInfo.PROTECTION_NORMAL; final boolean isDangerous = base == PermissionInfo.PROTECTION_DANGEROUS; @@ -492,7 +485,7 @@ public class AppSecurityPermissions { if (permList != null) { // First pass to group permissions for (MyPermissionInfo pInfo : permList) { - if (!isDisplayablePermission(pInfo, pInfo.mNewReqFlags, pInfo.mExistingReqFlags)) { + if (!isDisplayablePermission(pInfo, pInfo.mExistingReqFlags)) { continue; } MyPermissionGroupInfo group = mPermGroups.get(pInfo.group); diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java index 1ae6963e9..ea2f6136e 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java @@ -32,10 +32,6 @@ public class InitialLoadingView extends RelativeLayout implements SwapWorkflowAc super(context, attrs, defStyleAttr, defStyleRes); } - private SwapWorkflowActivity getActivity() { - return (SwapWorkflowActivity) getContext(); - } - @Override public boolean buildMenu(Menu menu, @NonNull MenuInflater inflater) { return true; diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SelectAppsView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SelectAppsView.java index ce2fc9686..935e688a9 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/SelectAppsView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SelectAppsView.java @@ -211,9 +211,6 @@ public class SelectAppsView extends ListView implements private class AppListAdapter extends CursorAdapter { - @SuppressWarnings("UnusedDeclaration") - private static final String TAG = "AppListAdapter"; - @Nullable private LayoutInflater inflater;