From bc98fd69b1845fe3698be4d269e9dd3e75f43573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Fri, 1 May 2015 00:30:49 +0200 Subject: [PATCH] Apply a few android studio fixes --- F-Droid/src/org/fdroid/fdroid/compat/Compatibility.java | 6 +++--- .../org/fdroid/fdroid/compat/SupportedArchitectures.java | 2 +- F-Droid/src/org/fdroid/fdroid/data/App.java | 3 --- F-Droid/src/org/fdroid/fdroid/installer/RootInstaller.java | 4 +--- .../src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java | 3 +-- .../src/org/fdroid/fdroid/updater/SignedRepoUpdater.java | 6 +++--- .../fdroid/views/fragments/SelectLocalAppsFragment.java | 3 +-- .../fdroid/views/swap/ConfirmReceiveSwapFragment.java | 1 - 8 files changed, 10 insertions(+), 18 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/compat/Compatibility.java b/F-Droid/src/org/fdroid/fdroid/compat/Compatibility.java index 4474d6386..388c7e085 100644 --- a/F-Droid/src/org/fdroid/fdroid/compat/Compatibility.java +++ b/F-Droid/src/org/fdroid/fdroid/compat/Compatibility.java @@ -5,16 +5,16 @@ import android.os.Build; public abstract class Compatibility { // like minSdkVersion - protected static final boolean hasApi(int apiLevel) { + protected static boolean hasApi(int apiLevel) { return getApi() >= apiLevel; } // like maxSdkVersion - protected static final boolean upToApi(int apiLevel) { + protected static boolean upToApi(int apiLevel) { return (apiLevel < 1 || getApi() <= apiLevel); } - protected static final int getApi() { + protected static int getApi() { return Build.VERSION.SDK_INT; } diff --git a/F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java b/F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java index 2b31289dc..1a1c0a741 100644 --- a/F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java +++ b/F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java @@ -1,6 +1,5 @@ package org.fdroid.fdroid.compat; -import android.annotation.TargetApi; import android.os.Build; public class SupportedArchitectures extends Compatibility { @@ -8,6 +7,7 @@ public class SupportedArchitectures extends Compatibility { /** * The most preferred ABI is the first element in the list. */ + @TargetApi(Build.VERSION_CODES.LOLLIPOP) @SuppressWarnings("deprecation") public static String[] getAbis() { if (hasApi(21)) { diff --git a/F-Droid/src/org/fdroid/fdroid/data/App.java b/F-Droid/src/org/fdroid/fdroid/data/App.java index 2ed4f3f87..73690a623 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/App.java +++ b/F-Droid/src/org/fdroid/fdroid/data/App.java @@ -21,10 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; -import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarFile; diff --git a/F-Droid/src/org/fdroid/fdroid/installer/RootInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/RootInstaller.java index f54ceb2f5..ffc4e9f01 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/RootInstaller.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/RootInstaller.java @@ -47,13 +47,11 @@ public class RootInstaller extends Installer { } private Shell.Builder createShellBuilder() { - Shell.Builder shellBuilder = new Shell.Builder() + return new Shell.Builder() .useSU() .setWantSTDERR(true) .setWatchdogTimeout(30) .setMinimalLogging(false); - - return shellBuilder; } @Override diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java index 75268e707..ba1b0a826 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java @@ -272,8 +272,7 @@ public class LocalRepoKeyStore { private KeyPair generateRandomKeypair() throws NoSuchAlgorithmException { KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(DEFAULT_KEY_ALGO); keyPairGenerator.initialize(DEFAULT_KEY_BITS); - KeyPair keyPair = keyPairGenerator.generateKeyPair(); - return keyPair; + return keyPairGenerator.generateKeyPair(); } private Certificate generateSelfSignedCertChain(KeyPair kp, X500Name subject) diff --git a/F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java b/F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java index 4601f39a1..8fbe3dee3 100644 --- a/F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java +++ b/F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java @@ -119,12 +119,12 @@ public class SignedRepoUpdater extends RepoUpdater { @Override protected File getIndexFromFile(File downloadedFile) throws UpdateException { - Date updateTime = new Date(System.currentTimeMillis()); + final Date updateTime = new Date(System.currentTimeMillis()); Log.d(TAG, "Getting signed index from " + repo.address + " at " + Utils.formatLogDate(updateTime)); - File indexJar = downloadedFile; - File indexXml = null; + final File indexJar = downloadedFile; + File indexXml = null; // Don't worry about checking the status code for 200. If it was a // successful download, then we will have a file ready to use: diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/SelectLocalAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/SelectLocalAppsFragment.java index c4f0fd834..5f492a8a5 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/SelectLocalAppsFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/SelectLocalAppsFragment.java @@ -141,14 +141,13 @@ public class SelectLocalAppsFragment extends ListFragment } else { baseUri = InstalledAppProvider.getSearchUri(mCurrentFilterString); } - CursorLoader loader = new CursorLoader( + return new CursorLoader( this.getActivity(), baseUri, InstalledAppProvider.DataColumns.ALL, null, null, InstalledAppProvider.DataColumns.APPLICATION_LABEL); - return loader; } @Override diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java index c763debf0..d4326b6e3 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java @@ -88,7 +88,6 @@ public class ConfirmReceiveSwapFragment extends Fragment implements ProgressList } } - @NonNull private Repo ensureRepoExists() { if (!newRepoConfig.isValidRepo()) { return null;