From 17c731ef1d0f28d9362463acfc6ab3125fd8d513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 17 Feb 2016 12:09:53 +0000 Subject: [PATCH] checkstyle: obey ConstantName --- F-Droid/src/org/fdroid/fdroid/FDroidApp.java | 12 +++--- F-Droid/src/org/fdroid/fdroid/Utils.java | 8 ++-- .../org/fdroid/fdroid/compat/PRNGFixes.java | 16 +++---- .../org/fdroid/fdroid/data/ApkProvider.java | 24 +++++------ .../org/fdroid/fdroid/data/AppProvider.java | 42 +++++++++---------- .../fdroid/data/InstalledAppProvider.java | 16 +++---- .../org/fdroid/fdroid/data/RepoProvider.java | 14 +++---- .../fdroid/fdroid/data/TempApkProvider.java | 14 +++---- .../fdroid/fdroid/data/TempAppProvider.java | 12 +++--- .../fdroid/fdroid/localrepo/SwapService.java | 2 +- .../fdroid/localrepo/peers/BonjourFinder.java | 2 +- .../localrepo/type/BonjourBroadcast.java | 2 +- .../fdroid/net/WifiStateChangeService.java | 8 ++-- .../views/fragments/PreferencesFragment.java | 4 +- .../views/swap/SwapWorkflowActivity.java | 4 +- .../fdroid/fdroid/views/swap/WifiQrView.java | 4 +- config/checkstyle/checkstyle.xml | 4 +- 17 files changed, 95 insertions(+), 93 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java index b02d34cc2..969d4ff56 100644 --- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java +++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java @@ -81,16 +81,16 @@ public class FDroidApp extends Application { public static SubnetUtils.SubnetInfo subnetInfo; public static String ssid; public static String bssid; - public static final Repo repo = new Repo(); + public static final Repo REPO = new Repo(); // Leaving the fully qualified class name here to help clarify the difference between spongy/bouncy castle. - private static final org.spongycastle.jce.provider.BouncyCastleProvider spongyCastleProvider; + private static final org.spongycastle.jce.provider.BouncyCastleProvider SPONGYCASTLE_PROVIDER; @SuppressWarnings("unused") BluetoothAdapter bluetoothAdapter; static { - spongyCastleProvider = new org.spongycastle.jce.provider.BouncyCastleProvider(); + SPONGYCASTLE_PROVIDER = new org.spongycastle.jce.provider.BouncyCastleProvider(); enableSpongyCastle(); } @@ -127,18 +127,18 @@ public class FDroidApp extends Application { } public static void enableSpongyCastle() { - Security.addProvider(spongyCastleProvider); + Security.addProvider(SPONGYCASTLE_PROVIDER); } public static void enableSpongyCastleOnLollipop() { if (Build.VERSION.SDK_INT == 21) { - Security.addProvider(spongyCastleProvider); + Security.addProvider(SPONGYCASTLE_PROVIDER); } } public static void disableSpongyCastleOnLollipop() { if (Build.VERSION.SDK_INT == 21) { - Security.removeProvider(spongyCastleProvider.getName()); + Security.removeProvider(SPONGYCASTLE_PROVIDER.getName()); } } diff --git a/F-Droid/src/org/fdroid/fdroid/Utils.java b/F-Droid/src/org/fdroid/fdroid/Utils.java index ee5c7f8a2..1f66c3c05 100644 --- a/F-Droid/src/org/fdroid/fdroid/Utils.java +++ b/F-Droid/src/org/fdroid/fdroid/Utils.java @@ -202,7 +202,7 @@ public final class Utils { return String.format(FRIENDLY_SIZE_FORMAT[i], s); } - private static final String[] androidVersionNames = { + private static final String[] ANDROID_VERSION_NAMES = { "?", // 0, undefined "1.0", // 1 "1.1", // 2 @@ -231,12 +231,12 @@ public final class Utils { public static String getAndroidVersionName(int sdkLevel) { if (sdkLevel < 0) { - return androidVersionNames[0]; + return ANDROID_VERSION_NAMES[0]; } - if (sdkLevel >= androidVersionNames.length) { + if (sdkLevel >= ANDROID_VERSION_NAMES.length) { return String.format(Locale.ENGLISH, "v%d", sdkLevel); } - return androidVersionNames[sdkLevel]; + return ANDROID_VERSION_NAMES[sdkLevel]; } /* PackageManager doesn't give us the min and max sdk versions, so we have diff --git a/F-Droid/src/org/fdroid/fdroid/compat/PRNGFixes.java b/F-Droid/src/org/fdroid/fdroid/compat/PRNGFixes.java index 3083c18fc..b56989090 100644 --- a/F-Droid/src/org/fdroid/fdroid/compat/PRNGFixes.java +++ b/F-Droid/src/org/fdroid/fdroid/compat/PRNGFixes.java @@ -177,19 +177,19 @@ public final class PRNGFixes extends Compatibility { * Linux PRNG. * * Concurrency: Read requests to the underlying Linux PRNG are - * serialized (on sLock) to ensure that multiple threads do not get + * serialized (on S_LOCK) to ensure that multiple threads do not get * duplicated PRNG output. */ private static final File URANDOM_FILE = new File("/dev/urandom"); - private static final Object sLock = new Object(); + private static final Object S_LOCK = new Object(); /** * Input stream for reading from Linux PRNG or {@code null} if not yet * opened. * - * @GuardedBy("sLock") + * @GuardedBy("S_LOCK") */ private static DataInputStream sUrandomIn; @@ -197,7 +197,7 @@ public final class PRNGFixes extends Compatibility { * Output stream for writing to Linux PRNG or {@code null} if not yet * opened. * - * @GuardedBy("sLock") + * @GuardedBy("S_LOCK") */ private static OutputStream sUrandomOut; @@ -212,7 +212,7 @@ public final class PRNGFixes extends Compatibility { protected void engineSetSeed(byte[] bytes) { try { OutputStream out; - synchronized (sLock) { + synchronized (S_LOCK) { out = getUrandomOutputStream(); } out.write(bytes); @@ -235,7 +235,7 @@ public final class PRNGFixes extends Compatibility { try { DataInputStream in; - synchronized (sLock) { + synchronized (S_LOCK) { in = getUrandomInputStream(); } synchronized (in) { @@ -255,7 +255,7 @@ public final class PRNGFixes extends Compatibility { } private DataInputStream getUrandomInputStream() { - synchronized (sLock) { + synchronized (S_LOCK) { if (sUrandomIn == null) { // NOTE: Consider inserting a BufferedInputStream between // DataInputStream and FileInputStream if you need higher @@ -274,7 +274,7 @@ public final class PRNGFixes extends Compatibility { } private OutputStream getUrandomOutputStream() throws IOException { - synchronized (sLock) { + synchronized (S_LOCK) { if (sUrandomOut == null) { sUrandomOut = new FileOutputStream(URANDOM_FILE); } diff --git a/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java b/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java index 8e9cc4005..8a0d8c519 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java @@ -237,7 +237,7 @@ public class ApkProvider extends FDroidProvider { private static final String PATH_REPO_APPS = "repo-apps"; protected static final String PATH_REPO_APK = "repo-apk"; - private static final UriMatcher matcher = new UriMatcher(-1); + private static final UriMatcher MATCHER = new UriMatcher(-1); private static final Map REPO_FIELDS = new HashMap<>(); @@ -245,13 +245,13 @@ public class ApkProvider extends FDroidProvider { REPO_FIELDS.put(DataColumns.REPO_VERSION, RepoProvider.DataColumns.VERSION); REPO_FIELDS.put(DataColumns.REPO_ADDRESS, RepoProvider.DataColumns.ADDRESS); - matcher.addURI(getAuthority(), PATH_REPO + "/#", CODE_REPO); - matcher.addURI(getAuthority(), PATH_APK + "/#/*", CODE_SINGLE); - matcher.addURI(getAuthority(), PATH_APKS + "/*", CODE_APKS); - matcher.addURI(getAuthority(), PATH_APP + "/*", CODE_APP); - matcher.addURI(getAuthority(), PATH_REPO_APPS + "/#/*", CODE_REPO_APPS); - matcher.addURI(getAuthority(), PATH_REPO_APK + "/#/*", CODE_REPO_APK); - matcher.addURI(getAuthority(), null, CODE_LIST); + MATCHER.addURI(getAuthority(), PATH_REPO + "/#", CODE_REPO); + MATCHER.addURI(getAuthority(), PATH_APK + "/#/*", CODE_SINGLE); + MATCHER.addURI(getAuthority(), PATH_APKS + "/*", CODE_APKS); + MATCHER.addURI(getAuthority(), PATH_APP + "/*", CODE_APP); + MATCHER.addURI(getAuthority(), PATH_REPO_APPS + "/#/*", CODE_REPO_APPS); + MATCHER.addURI(getAuthority(), PATH_REPO_APK + "/#/*", CODE_REPO_APK); + MATCHER.addURI(getAuthority(), null, CODE_LIST); } public static String getAuthority() { @@ -357,7 +357,7 @@ public class ApkProvider extends FDroidProvider { @Override protected UriMatcher getMatcher() { - return matcher; + return MATCHER; } private static class Query extends QueryBuilder { @@ -449,7 +449,7 @@ public class ApkProvider extends FDroidProvider { QuerySelection query = new QuerySelection(selection, selectionArgs); - switch (matcher.match(uri)) { + switch (MATCHER.match(uri)) { case CODE_LIST: break; @@ -522,7 +522,7 @@ public class ApkProvider extends FDroidProvider { QuerySelection query = new QuerySelection(where, whereArgs); - switch (matcher.match(uri)) { + switch (MATCHER.match(uri)) { case CODE_REPO: query = query.add(queryRepo(Long.parseLong(uri.getLastPathSegment()))); @@ -561,7 +561,7 @@ public class ApkProvider extends FDroidProvider { @Override public int update(Uri uri, ContentValues values, String where, String[] whereArgs) { - if (matcher.match(uri) != CODE_SINGLE) { + if (MATCHER.match(uri) != CODE_SINGLE) { throw new UnsupportedOperationException("Cannot update anything other than a single apk."); } return performUpdateUnchecked(uri, values, where, whereArgs); diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java index 57ba3b43d..9ba2da081 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java @@ -423,7 +423,7 @@ public class AppProvider extends FDroidProvider { private static final String PROVIDER_NAME = "AppProvider"; - private static final UriMatcher matcher = new UriMatcher(-1); + private static final UriMatcher MATCHER = new UriMatcher(-1); private static final String PATH_INSTALLED = "installed"; private static final String PATH_CAN_UPDATE = "canUpdate"; @@ -456,22 +456,22 @@ public class AppProvider extends FDroidProvider { private static final int SEARCH_CAN_UPDATE = SEARCH_INSTALLED + 1; static { - matcher.addURI(getAuthority(), null, CODE_LIST); - matcher.addURI(getAuthority(), PATH_CALC_APP_DETAILS_FROM_INDEX, CALC_APP_DETAILS_FROM_INDEX); - matcher.addURI(getAuthority(), PATH_IGNORED, IGNORED); - matcher.addURI(getAuthority(), PATH_RECENTLY_UPDATED, RECENTLY_UPDATED); - matcher.addURI(getAuthority(), PATH_NEWLY_ADDED, NEWLY_ADDED); - matcher.addURI(getAuthority(), PATH_CATEGORY + "/*", CATEGORY); - matcher.addURI(getAuthority(), PATH_SEARCH + "/*", SEARCH); - matcher.addURI(getAuthority(), PATH_SEARCH_INSTALLED + "/*", SEARCH_INSTALLED); - matcher.addURI(getAuthority(), PATH_SEARCH_CAN_UPDATE + "/*", SEARCH_CAN_UPDATE); - matcher.addURI(getAuthority(), PATH_SEARCH_REPO + "/*/*", SEARCH_REPO); - matcher.addURI(getAuthority(), PATH_REPO + "/#", REPO); - matcher.addURI(getAuthority(), PATH_CAN_UPDATE, CAN_UPDATE); - matcher.addURI(getAuthority(), PATH_INSTALLED, INSTALLED); - matcher.addURI(getAuthority(), PATH_NO_APKS, NO_APKS); - matcher.addURI(getAuthority(), PATH_APPS + "/*", APPS); - matcher.addURI(getAuthority(), "*", CODE_SINGLE); + MATCHER.addURI(getAuthority(), null, CODE_LIST); + MATCHER.addURI(getAuthority(), PATH_CALC_APP_DETAILS_FROM_INDEX, CALC_APP_DETAILS_FROM_INDEX); + MATCHER.addURI(getAuthority(), PATH_IGNORED, IGNORED); + MATCHER.addURI(getAuthority(), PATH_RECENTLY_UPDATED, RECENTLY_UPDATED); + MATCHER.addURI(getAuthority(), PATH_NEWLY_ADDED, NEWLY_ADDED); + MATCHER.addURI(getAuthority(), PATH_CATEGORY + "/*", CATEGORY); + MATCHER.addURI(getAuthority(), PATH_SEARCH + "/*", SEARCH); + MATCHER.addURI(getAuthority(), PATH_SEARCH_INSTALLED + "/*", SEARCH_INSTALLED); + MATCHER.addURI(getAuthority(), PATH_SEARCH_CAN_UPDATE + "/*", SEARCH_CAN_UPDATE); + MATCHER.addURI(getAuthority(), PATH_SEARCH_REPO + "/*/*", SEARCH_REPO); + MATCHER.addURI(getAuthority(), PATH_REPO + "/#", REPO); + MATCHER.addURI(getAuthority(), PATH_CAN_UPDATE, CAN_UPDATE); + MATCHER.addURI(getAuthority(), PATH_INSTALLED, INSTALLED); + MATCHER.addURI(getAuthority(), PATH_NO_APKS, NO_APKS); + MATCHER.addURI(getAuthority(), PATH_APPS + "/*", APPS); + MATCHER.addURI(getAuthority(), "*", CODE_SINGLE); } public static Uri getContentUri() { @@ -597,7 +597,7 @@ public class AppProvider extends FDroidProvider { @Override protected UriMatcher getMatcher() { - return matcher; + return MATCHER; } private AppQuerySelection queryCanUpdate() { @@ -742,7 +742,7 @@ public class AppProvider extends FDroidProvider { // Queries which are for the main list of apps should not include swap apps. boolean includeSwap = true; - switch (matcher.match(uri)) { + switch (MATCHER.match(uri)) { case CODE_LIST: includeSwap = false; break; @@ -842,7 +842,7 @@ public class AppProvider extends FDroidProvider { public int delete(Uri uri, String where, String[] whereArgs) { QuerySelection query = new QuerySelection(where, whereArgs); - switch (matcher.match(uri)) { + switch (MATCHER.match(uri)) { case NO_APKS: query = query.add(queryNoApks()); @@ -870,7 +870,7 @@ public class AppProvider extends FDroidProvider { @Override public int update(Uri uri, ContentValues values, String where, String[] whereArgs) { QuerySelection query = new QuerySelection(where, whereArgs); - switch (matcher.match(uri)) { + switch (MATCHER.match(uri)) { case CALC_APP_DETAILS_FROM_INDEX: updateAppDetails(); diff --git a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java index f25559186..414e528f5 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java @@ -77,12 +77,12 @@ public class InstalledAppProvider extends FDroidProvider { private static final String PATH_SEARCH = "search"; private static final int CODE_SEARCH = CODE_SINGLE + 1; - private static final UriMatcher matcher = new UriMatcher(-1); + private static final UriMatcher MATCHER = new UriMatcher(-1); static { - matcher.addURI(getAuthority(), null, CODE_LIST); - matcher.addURI(getAuthority(), PATH_SEARCH + "/*", CODE_SEARCH); - matcher.addURI(getAuthority(), "*", CODE_SINGLE); + MATCHER.addURI(getAuthority(), null, CODE_LIST); + MATCHER.addURI(getAuthority(), PATH_SEARCH + "/*", CODE_SEARCH); + MATCHER.addURI(getAuthority(), "*", CODE_SINGLE); } public static Uri getContentUri() { @@ -143,7 +143,7 @@ public class InstalledAppProvider extends FDroidProvider { @Override protected UriMatcher getMatcher() { - return matcher; + return MATCHER; } private QuerySelection queryApp(String packageName) { @@ -162,7 +162,7 @@ public class InstalledAppProvider extends FDroidProvider { } QuerySelection selection = new QuerySelection(customSelection, selectionArgs); - switch (matcher.match(uri)) { + switch (MATCHER.match(uri)) { case CODE_LIST: break; @@ -188,7 +188,7 @@ public class InstalledAppProvider extends FDroidProvider { @Override public int delete(Uri uri, String where, String[] whereArgs) { - if (matcher.match(uri) != CODE_SINGLE) { + if (MATCHER.match(uri) != CODE_SINGLE) { throw new UnsupportedOperationException("Delete not supported for " + uri + "."); } @@ -205,7 +205,7 @@ public class InstalledAppProvider extends FDroidProvider { @Override public Uri insert(Uri uri, ContentValues values) { - if (matcher.match(uri) != CODE_LIST) { + if (MATCHER.match(uri) != CODE_LIST) { throw new UnsupportedOperationException("Insert not supported for " + uri + "."); } diff --git a/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java b/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java index ec96a7c2b..e682bd842 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java @@ -238,12 +238,12 @@ public class RepoProvider extends FDroidProvider { private static final int CODE_ALL_EXCEPT_SWAP = CODE_SINGLE + 1; - private static final UriMatcher matcher = new UriMatcher(-1); + private static final UriMatcher MATCHER = new UriMatcher(-1); static { - matcher.addURI(AUTHORITY + "." + PROVIDER_NAME, null, CODE_LIST); - matcher.addURI(AUTHORITY + "." + PROVIDER_NAME, PATH_ALL_EXCEPT_SWAP, CODE_ALL_EXCEPT_SWAP); - matcher.addURI(AUTHORITY + "." + PROVIDER_NAME, "#", CODE_SINGLE); + MATCHER.addURI(AUTHORITY + "." + PROVIDER_NAME, null, CODE_LIST); + MATCHER.addURI(AUTHORITY + "." + PROVIDER_NAME, PATH_ALL_EXCEPT_SWAP, CODE_ALL_EXCEPT_SWAP); + MATCHER.addURI(AUTHORITY + "." + PROVIDER_NAME, "#", CODE_SINGLE); } public static String getAuthority() { @@ -276,7 +276,7 @@ public class RepoProvider extends FDroidProvider { @Override protected UriMatcher getMatcher() { - return matcher; + return MATCHER; } @Override @@ -286,7 +286,7 @@ public class RepoProvider extends FDroidProvider { sortOrder = "_ID ASC"; } - switch (matcher.match(uri)) { + switch (MATCHER.match(uri)) { case CODE_LIST: // Do nothing (don't restrict query) break; @@ -350,7 +350,7 @@ public class RepoProvider extends FDroidProvider { @Override public int delete(Uri uri, String where, String[] whereArgs) { - switch (matcher.match(uri)) { + switch (MATCHER.match(uri)) { case CODE_LIST: // Don't support deleting of multiple repos. return 0; diff --git a/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java b/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java index 8a07f4e43..26765fa75 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java @@ -24,12 +24,12 @@ public class TempApkProvider extends ApkProvider { private static final int CODE_INIT = 10000; - private static final UriMatcher matcher = new UriMatcher(-1); + private static final UriMatcher MATCHER = new UriMatcher(-1); static { - matcher.addURI(getAuthority(), PATH_INIT, CODE_INIT); - matcher.addURI(getAuthority(), PATH_APK + "/#/*", CODE_SINGLE); - matcher.addURI(getAuthority(), PATH_REPO_APK + "/#/*", CODE_REPO_APK); + MATCHER.addURI(getAuthority(), PATH_INIT, CODE_INIT); + MATCHER.addURI(getAuthority(), PATH_APK + "/#/*", CODE_SINGLE); + MATCHER.addURI(getAuthority(), PATH_REPO_APK + "/#/*", CODE_REPO_APK); } @Override @@ -78,7 +78,7 @@ public class TempApkProvider extends ApkProvider { @Override public Uri insert(Uri uri, ContentValues values) { - switch (matcher.match(uri)) { + switch (MATCHER.match(uri)) { case CODE_INIT: initTable(); return null; @@ -90,7 +90,7 @@ public class TempApkProvider extends ApkProvider { @Override public int update(Uri uri, ContentValues values, String where, String[] whereArgs) { - if (matcher.match(uri) != CODE_SINGLE) { + if (MATCHER.match(uri) != CODE_SINGLE) { throw new UnsupportedOperationException("Cannot update anything other than a single apk."); } @@ -102,7 +102,7 @@ public class TempApkProvider extends ApkProvider { QuerySelection query = new QuerySelection(where, whereArgs); - switch (matcher.match(uri)) { + switch (MATCHER.match(uri)) { case CODE_REPO_APK: List pathSegments = uri.getPathSegments(); query = query.add(queryRepo(Long.parseLong(pathSegments.get(1)))).add(queryApks(pathSegments.get(2))); diff --git a/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java index 94e1375e9..81a0737ff 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java @@ -26,12 +26,12 @@ public class TempAppProvider extends AppProvider { private static final int CODE_INIT = 10000; private static final int CODE_COMMIT = CODE_INIT + 1; - private static final UriMatcher matcher = new UriMatcher(-1); + private static final UriMatcher MATCHER = new UriMatcher(-1); static { - matcher.addURI(getAuthority(), PATH_INIT, CODE_INIT); - matcher.addURI(getAuthority(), PATH_COMMIT, CODE_COMMIT); - matcher.addURI(getAuthority(), "*", CODE_SINGLE); + MATCHER.addURI(getAuthority(), PATH_INIT, CODE_INIT); + MATCHER.addURI(getAuthority(), PATH_COMMIT, CODE_COMMIT); + MATCHER.addURI(getAuthority(), "*", CODE_SINGLE); } @Override @@ -79,7 +79,7 @@ public class TempAppProvider extends AppProvider { @Override public Uri insert(Uri uri, ContentValues values) { - switch (matcher.match(uri)) { + switch (MATCHER.match(uri)) { case CODE_INIT: initTable(); return null; @@ -95,7 +95,7 @@ public class TempAppProvider extends AppProvider { @Override public int update(Uri uri, ContentValues values, String where, String[] whereArgs) { QuerySelection query = new QuerySelection(where, whereArgs); - switch (matcher.match(uri)) { + switch (MATCHER.match(uri)) { case CODE_SINGLE: query = query.add(querySingle(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 f5596c33c..0dc8380c3 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java @@ -221,7 +221,7 @@ public class SwapService extends Service { @Override protected Void doInBackground(Void... args) { Uri repoUri = Uri.parse(address); - String swapBackUri = Utils.getLocalRepoUri(FDroidApp.repo).toString(); + String swapBackUri = Utils.getLocalRepoUri(FDroidApp.REPO).toString(); AndroidHttpClient client = AndroidHttpClient.newInstance("F-Droid", SwapService.this); HttpPost request = new HttpPost("/request-swap"); diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java index 7d763dd19..ba982f8c3 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java @@ -130,7 +130,7 @@ class BonjourFinder extends PeerFinder implements ServiceListener { final String type = serviceInfo.getPropertyString("type"); final String fingerprint = serviceInfo.getPropertyString("fingerprint"); final boolean isFDroid = type != null && type.startsWith("fdroidrepo"); - final boolean isSelf = FDroidApp.repo != null && fingerprint != null && fingerprint.equalsIgnoreCase(FDroidApp.repo.fingerprint); + final boolean isSelf = FDroidApp.REPO != null && fingerprint != null && fingerprint.equalsIgnoreCase(FDroidApp.REPO.fingerprint); if (isFDroid && !isSelf) { Utils.debugLog(TAG, "Found F-Droid swap Bonjour service:\n" + serviceInfo); subscriber.onNext(new BonjourPeer(serviceInfo)); diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java b/F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java index 821731a54..a5ab3a6b9 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java @@ -47,7 +47,7 @@ public class BonjourBroadcast extends SwapType { HashMap values = new HashMap<>(); values.put("path", "/fdroid/repo"); values.put("name", repoName); - values.put("fingerprint", FDroidApp.repo.fingerprint); + values.put("fingerprint", FDroidApp.REPO.fingerprint); String type; if (Preferences.get().isLocalRepoHttpsEnabled()) { values.put("type", "fdroidrepos"); diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java index dd6a1dcd5..0e18b6af7 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java +++ b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java @@ -133,8 +133,8 @@ public class WifiStateChangeService extends Service { } else { scheme = "http"; } - FDroidApp.repo.name = Preferences.get().getLocalRepoName(); - FDroidApp.repo.address = String.format(Locale.ENGLISH, "%s://%s:%d/fdroid/repo", + FDroidApp.REPO.name = Preferences.get().getLocalRepoName(); + FDroidApp.REPO.address = String.format(Locale.ENGLISH, "%s://%s:%d/fdroid/repo", scheme, FDroidApp.ipAddressString, FDroidApp.port); if (isCancelled()) { // can be canceled by a change via WifiStateChangeReceiver @@ -143,7 +143,7 @@ public class WifiStateChangeService extends Service { Context context = WifiStateChangeService.this.getApplicationContext(); LocalRepoManager lrm = LocalRepoManager.get(context); - lrm.writeIndexPage(Utils.getSharingUri(FDroidApp.repo).toString()); + lrm.writeIndexPage(Utils.getSharingUri(FDroidApp.REPO).toString()); if (isCancelled()) { // can be canceled by a change via WifiStateChangeReceiver return null; @@ -152,7 +152,7 @@ public class WifiStateChangeService extends Service { // the fingerprint for the local repo's signing key LocalRepoKeyStore localRepoKeyStore = LocalRepoKeyStore.get(context); Certificate localCert = localRepoKeyStore.getCertificate(); - FDroidApp.repo.fingerprint = Utils.calcFingerprint(localCert); + FDroidApp.REPO.fingerprint = Utils.calcFingerprint(localCert); /* * Once the IP address is known we need to generate a self diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java index f8d107156..8e15e6e2f 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java @@ -24,7 +24,7 @@ import org.fdroid.fdroid.installer.PrivilegedInstaller; public class PreferencesFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener { - private static final String[] summariesToUpdate = { + private static final String[] SUMMARIES_TO_UPDATE = { Preferences.PREF_UPD_INTERVAL, Preferences.PREF_UPD_WIFI_ONLY, Preferences.PREF_UPD_NOTIFY, @@ -273,7 +273,7 @@ public class PreferencesFragment extends PreferenceFragment getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this); - for (final String key : summariesToUpdate) { + for (final String key : SUMMARIES_TO_UPDATE) { updateSummary(key, false); } diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java index 75f8335f7..2e1f6edac 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java @@ -500,7 +500,7 @@ public class SwapWorkflowActivity extends AppCompatActivity { // Even if they opted to skip the message which says "Touch devices to swap", // we still want to actually enable the feature, so that they could touch // during the wifi qr code being shown too. - boolean nfcMessageReady = NfcHelper.setPushMessage(this, Utils.getSharingUri(FDroidApp.repo)); + boolean nfcMessageReady = NfcHelper.setPushMessage(this, Utils.getSharingUri(FDroidApp.REPO)); if (Preferences.get().showNfcDuringSwap() && nfcMessageReady) { inflateInnerView(R.layout.swap_nfc); @@ -668,7 +668,7 @@ public class SwapWorkflowActivity extends AppCompatActivity { PrepareSwapRepo(@NonNull Set apps) { context = SwapWorkflowActivity.this; selectedApps = apps; - sharingUri = Utils.getSharingUri(FDroidApp.repo); + sharingUri = Utils.getSharingUri(FDroidApp.REPO); } private void broadcast(int type) { diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrView.java index c745c463d..bb4447348 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrView.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrView.java @@ -118,7 +118,7 @@ public class WifiQrView extends ScrollView implements SwapWorkflowActivity.Inner private void setUIFromWifi() { - if (TextUtils.isEmpty(FDroidApp.repo.address)) { + if (TextUtils.isEmpty(FDroidApp.REPO.address)) { return; } @@ -136,7 +136,7 @@ public class WifiQrView extends ScrollView implements SwapWorkflowActivity.Inner * wifi AP to join. Lots of QR Scanners are buggy and do not respect * custom URI schemes, so we have to use http:// or https:// :-( */ - Uri sharingUri = Utils.getSharingUri(FDroidApp.repo); + Uri sharingUri = Utils.getSharingUri(FDroidApp.REPO); String qrUriString = (scheme + sharingUri.getHost()).toUpperCase(Locale.ENGLISH); if (sharingUri.getPort() != 80) { qrUriString += ":" + sharingUri.getPort(); diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index a7d6ee2c9..664db6195 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -15,7 +15,9 @@ - + + +