From 7f2efc7267e5bf8d7f983a3ea0025e9a30cebf85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Fri, 23 Oct 2015 13:06:23 +0200 Subject: [PATCH] Take some declaration access suggestions from AS --- F-Droid/src/org/fdroid/fdroid/AppDetails.java | 10 +++++----- F-Droid/src/org/fdroid/fdroid/FDroid.java | 8 ++++---- F-Droid/src/org/fdroid/fdroid/Utils.java | 2 +- .../fdroid/fdroid/installer/PrivilegedInstaller.java | 2 +- .../fdroid/fdroid/net/AsyncDownloaderFromAndroid.java | 2 +- .../fdroid/views/fragments/AvailableAppsFragment.java | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java index 1a5347eed..29f4995d1 100644 --- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java +++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java @@ -126,7 +126,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A private static final String TAG = "AppDetails"; - public static final int REQUEST_ENABLE_BLUETOOTH = 2; + private static final int REQUEST_ENABLE_BLUETOOTH = 2; public static final String EXTRA_APPID = "appid"; public static final String EXTRA_FROM = "from"; @@ -147,7 +147,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A } // observer to update view when package has been installed/deleted - AppObserver myAppObserver; + private AppObserver myAppObserver; class AppObserver extends ContentObserver { @@ -548,7 +548,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A supportInvalidateOptionsMenu(); } - public void setIgnoreUpdates(String appId, boolean ignoreAll, int ignoreVersionCode) { + private void setIgnoreUpdates(String appId, boolean ignoreAll, int ignoreVersionCode) { Uri uri = AppProvider.getContentUri(appId); @@ -756,7 +756,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A } - protected void navigateUp() { + private void navigateUp() { NavUtils.navigateUpFromSameTask(this); } @@ -908,7 +908,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A } } - final Installer.InstallerCallback myInstallerCallback = new Installer.InstallerCallback() { + private final Installer.InstallerCallback myInstallerCallback = new Installer.InstallerCallback() { @Override public void onSuccess(final int operation) { diff --git a/F-Droid/src/org/fdroid/fdroid/FDroid.java b/F-Droid/src/org/fdroid/fdroid/FDroid.java index 8ae734c1c..566fb00b2 100644 --- a/F-Droid/src/org/fdroid/fdroid/FDroid.java +++ b/F-Droid/src/org/fdroid/fdroid/FDroid.java @@ -52,9 +52,9 @@ public class FDroid extends ActionBarActivity { private static final String TAG = "FDroid"; - public static final int REQUEST_PREFS = 1; - public static final int REQUEST_ENABLE_BLUETOOTH = 2; - public static final int REQUEST_SWAP = 3; + private static final int REQUEST_PREFS = 1; + private static final int REQUEST_ENABLE_BLUETOOTH = 2; + private static final int REQUEST_SWAP = 3; public static final String EXTRA_TAB_UPDATE = "extraTab"; @@ -347,7 +347,7 @@ public class FDroid extends ActionBarActivity { return tabManager; } - public void refreshUpdateTabLabel() { + private void refreshUpdateTabLabel() { getTabManager().refreshTabLabel(TabManager.INDEX_CAN_UPDATE); } diff --git a/F-Droid/src/org/fdroid/fdroid/Utils.java b/F-Droid/src/org/fdroid/fdroid/Utils.java index c2b01aee3..d0792d15e 100644 --- a/F-Droid/src/org/fdroid/fdroid/Utils.java +++ b/F-Droid/src/org/fdroid/fdroid/Utils.java @@ -72,7 +72,7 @@ public final class Utils { @SuppressWarnings("UnusedDeclaration") private static final String TAG = "Utils"; - public static final int BUFFER_SIZE = 4096; + private static final int BUFFER_SIZE = 4096; // The date format used for storing dates (e.g. lastupdated, added) in the // database. diff --git a/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java index bda833ffa..86c0ce2e6 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java @@ -79,7 +79,7 @@ public class PrivilegedInstaller extends Installer { private Activity mActivity; - public static final int REQUEST_CONFIRM_PERMS = 0; + private static final int REQUEST_CONFIRM_PERMS = 0; public static final int IS_EXTENSION_INSTALLED_NO = 0; public static final int IS_EXTENSION_INSTALLED_YES = 1; diff --git a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java index e2a009269..2f19a02b8 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java +++ b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java @@ -371,7 +371,7 @@ public class AsyncDownloaderFromAndroid implements AsyncDownloader { /** * Broadcast receiver to listen for ACTION_DOWNLOAD_COMPLETE broadcasts */ - final BroadcastReceiver receiver = new BroadcastReceiver() { + private final BroadcastReceiver receiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(intent.getAction())) { diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java index ac8690ab1..88e7e35a5 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java @@ -36,9 +36,9 @@ public class AvailableAppsFragment extends AppListFragment implements private static final String TAG = "AvailableAppsFragment"; - public static final String PREFERENCES_FILE = "CategorySpinnerPosition"; - public static final String CATEGORY_KEY = "Selection"; - public static String defaultCategory; + private static final String PREFERENCES_FILE = "CategorySpinnerPosition"; + private static final String CATEGORY_KEY = "Selection"; + private static String defaultCategory; private List categories; private Spinner categorySpinner;