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

checkstyle: obey ConstantName

Browse Source
This commit is contained in:
Daniel Martí 2016-02-17 12:09:53 +00:00
parent a6b804e93a
commit 17c731ef1d
17 changed files with 95 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
F-Droid/src/org/fdroid/fdroid/FDroidApp.java
View File

@ -81,16 +81,16 @@ public class FDroidApp extends Application {
public static SubnetUtils.SubnetInfo subnetInfo; public static SubnetUtils.SubnetInfo subnetInfo;
public static String ssid; public static String ssid;
public static String bssid; 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. // 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") @SuppressWarnings("unused")
BluetoothAdapter bluetoothAdapter; BluetoothAdapter bluetoothAdapter;
static { static {
spongyCastleProvider = new org.spongycastle.jce.provider.BouncyCastleProvider(); SPONGYCASTLE_PROVIDER = new org.spongycastle.jce.provider.BouncyCastleProvider();
enableSpongyCastle(); enableSpongyCastle();
} }
@ -127,18 +127,18 @@ public class FDroidApp extends Application {
} }
public static void enableSpongyCastle() { public static void enableSpongyCastle() {
Security.addProvider(spongyCastleProvider); Security.addProvider(SPONGYCASTLE_PROVIDER);
} }
public static void enableSpongyCastleOnLollipop() { public static void enableSpongyCastleOnLollipop() {
if (Build.VERSION.SDK_INT == 21) { if (Build.VERSION.SDK_INT == 21) {
Security.addProvider(spongyCastleProvider); Security.addProvider(SPONGYCASTLE_PROVIDER);
} }
} }
public static void disableSpongyCastleOnLollipop() { public static void disableSpongyCastleOnLollipop() {
if (Build.VERSION.SDK_INT == 21) { if (Build.VERSION.SDK_INT == 21) {
Security.removeProvider(spongyCastleProvider.getName()); Security.removeProvider(SPONGYCASTLE_PROVIDER.getName());
} }
} }

8
F-Droid/src/org/fdroid/fdroid/Utils.java
View File

@ -202,7 +202,7 @@ public final class Utils {
return String.format(FRIENDLY_SIZE_FORMAT[i], s); return String.format(FRIENDLY_SIZE_FORMAT[i], s);
} }
private static final String[] androidVersionNames = { private static final String[] ANDROID_VERSION_NAMES = {
"?", // 0, undefined "?", // 0, undefined
"1.0", // 1 "1.0", // 1
"1.1", // 2 "1.1", // 2
@ -231,12 +231,12 @@ public final class Utils {
public static String getAndroidVersionName(int sdkLevel) { public static String getAndroidVersionName(int sdkLevel) {
if (sdkLevel < 0) { 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 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 /* PackageManager doesn't give us the min and max sdk versions, so we have

16
F-Droid/src/org/fdroid/fdroid/compat/PRNGFixes.java
View File

@ -177,19 +177,19 @@ public final class PRNGFixes extends Compatibility {
* Linux PRNG. * Linux PRNG.
* *
* Concurrency: Read requests to the underlying Linux PRNG are * 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. * duplicated PRNG output.
*/ */
private static final File URANDOM_FILE = new File("/dev/urandom"); 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 * Input stream for reading from Linux PRNG or {@code null} if not yet
* opened. * opened.
* *
* @GuardedBy("sLock") * @GuardedBy("S_LOCK")
*/ */
private static DataInputStream sUrandomIn; 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 * Output stream for writing to Linux PRNG or {@code null} if not yet
* opened. * opened.
* *
* @GuardedBy("sLock") * @GuardedBy("S_LOCK")
*/ */
private static OutputStream sUrandomOut; private static OutputStream sUrandomOut;
@ -212,7 +212,7 @@ public final class PRNGFixes extends Compatibility {
protected void engineSetSeed(byte[] bytes) { protected void engineSetSeed(byte[] bytes) {
try { try {
OutputStream out; OutputStream out;
synchronized (sLock) { synchronized (S_LOCK) {
out = getUrandomOutputStream(); out = getUrandomOutputStream();
} }
out.write(bytes); out.write(bytes);
@ -235,7 +235,7 @@ public final class PRNGFixes extends Compatibility {
try { try {
DataInputStream in; DataInputStream in;
synchronized (sLock) { synchronized (S_LOCK) {
in = getUrandomInputStream(); in = getUrandomInputStream();
} }
synchronized (in) { synchronized (in) {
@ -255,7 +255,7 @@ public final class PRNGFixes extends Compatibility {
} }
private DataInputStream getUrandomInputStream() { private DataInputStream getUrandomInputStream() {
synchronized (sLock) { synchronized (S_LOCK) {
if (sUrandomIn == null) { if (sUrandomIn == null) {
// NOTE: Consider inserting a BufferedInputStream between // NOTE: Consider inserting a BufferedInputStream between
// DataInputStream and FileInputStream if you need higher // DataInputStream and FileInputStream if you need higher
@ -274,7 +274,7 @@ public final class PRNGFixes extends Compatibility {
} }
private OutputStream getUrandomOutputStream() throws IOException { private OutputStream getUrandomOutputStream() throws IOException {
synchronized (sLock) { synchronized (S_LOCK) {
if (sUrandomOut == null) { if (sUrandomOut == null) {
sUrandomOut = new FileOutputStream(URANDOM_FILE); sUrandomOut = new FileOutputStream(URANDOM_FILE);
} }

24
F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java
View File

@ -237,7 +237,7 @@ public class ApkProvider extends FDroidProvider {
private static final String PATH_REPO_APPS = "repo-apps"; private static final String PATH_REPO_APPS = "repo-apps";
protected static final String PATH_REPO_APK = "repo-apk"; 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<String, String> REPO_FIELDS = new HashMap<>(); private static final Map<String, String> 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_VERSION, RepoProvider.DataColumns.VERSION);
REPO_FIELDS.put(DataColumns.REPO_ADDRESS, RepoProvider.DataColumns.ADDRESS); REPO_FIELDS.put(DataColumns.REPO_ADDRESS, RepoProvider.DataColumns.ADDRESS);
matcher.addURI(getAuthority(), PATH_REPO + "/#", CODE_REPO); MATCHER.addURI(getAuthority(), PATH_REPO + "/#", CODE_REPO);
matcher.addURI(getAuthority(), PATH_APK + "/#/*", CODE_SINGLE); MATCHER.addURI(getAuthority(), PATH_APK + "/#/*", CODE_SINGLE);
matcher.addURI(getAuthority(), PATH_APKS + "/*", CODE_APKS); MATCHER.addURI(getAuthority(), PATH_APKS + "/*", CODE_APKS);
matcher.addURI(getAuthority(), PATH_APP + "/*", CODE_APP); MATCHER.addURI(getAuthority(), PATH_APP + "/*", CODE_APP);
matcher.addURI(getAuthority(), PATH_REPO_APPS + "/#/*", CODE_REPO_APPS); MATCHER.addURI(getAuthority(), PATH_REPO_APPS + "/#/*", CODE_REPO_APPS);
matcher.addURI(getAuthority(), PATH_REPO_APK + "/#/*", CODE_REPO_APK); MATCHER.addURI(getAuthority(), PATH_REPO_APK + "/#/*", CODE_REPO_APK);
matcher.addURI(getAuthority(), null, CODE_LIST); MATCHER.addURI(getAuthority(), null, CODE_LIST);
} }
public static String getAuthority() { public static String getAuthority() {
@ -357,7 +357,7 @@ public class ApkProvider extends FDroidProvider {
@Override @Override
protected UriMatcher getMatcher() { protected UriMatcher getMatcher() {
return matcher; return MATCHER;
} }
private static class Query extends QueryBuilder { private static class Query extends QueryBuilder {
@ -449,7 +449,7 @@ public class ApkProvider extends FDroidProvider {
QuerySelection query = new QuerySelection(selection, selectionArgs); QuerySelection query = new QuerySelection(selection, selectionArgs);
switch (matcher.match(uri)) { switch (MATCHER.match(uri)) {
case CODE_LIST: case CODE_LIST:
break; break;
@ -522,7 +522,7 @@ public class ApkProvider extends FDroidProvider {
QuerySelection query = new QuerySelection(where, whereArgs); QuerySelection query = new QuerySelection(where, whereArgs);
switch (matcher.match(uri)) { switch (MATCHER.match(uri)) {
case CODE_REPO: case CODE_REPO:
query = query.add(queryRepo(Long.parseLong(uri.getLastPathSegment()))); query = query.add(queryRepo(Long.parseLong(uri.getLastPathSegment())));
@ -561,7 +561,7 @@ public class ApkProvider extends FDroidProvider {
@Override @Override
public int update(Uri uri, ContentValues values, String where, String[] whereArgs) { 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."); throw new UnsupportedOperationException("Cannot update anything other than a single apk.");
} }
return performUpdateUnchecked(uri, values, where, whereArgs); return performUpdateUnchecked(uri, values, where, whereArgs);

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

@ -423,7 +423,7 @@ public class AppProvider extends FDroidProvider {
private static final String PROVIDER_NAME = "AppProvider"; 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_INSTALLED = "installed";
private static final String PATH_CAN_UPDATE = "canUpdate"; 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; private static final int SEARCH_CAN_UPDATE = SEARCH_INSTALLED + 1;
static { static {
matcher.addURI(getAuthority(), null, CODE_LIST); MATCHER.addURI(getAuthority(), null, CODE_LIST);
matcher.addURI(getAuthority(), PATH_CALC_APP_DETAILS_FROM_INDEX, CALC_APP_DETAILS_FROM_INDEX); MATCHER.addURI(getAuthority(), PATH_CALC_APP_DETAILS_FROM_INDEX, CALC_APP_DETAILS_FROM_INDEX);
matcher.addURI(getAuthority(), PATH_IGNORED, IGNORED); MATCHER.addURI(getAuthority(), PATH_IGNORED, IGNORED);
matcher.addURI(getAuthority(), PATH_RECENTLY_UPDATED, RECENTLY_UPDATED); MATCHER.addURI(getAuthority(), PATH_RECENTLY_UPDATED, RECENTLY_UPDATED);
matcher.addURI(getAuthority(), PATH_NEWLY_ADDED, NEWLY_ADDED); MATCHER.addURI(getAuthority(), PATH_NEWLY_ADDED, NEWLY_ADDED);
matcher.addURI(getAuthority(), PATH_CATEGORY + "/*", CATEGORY); MATCHER.addURI(getAuthority(), PATH_CATEGORY + "/*", CATEGORY);
matcher.addURI(getAuthority(), PATH_SEARCH + "/*", SEARCH); MATCHER.addURI(getAuthority(), PATH_SEARCH + "/*", SEARCH);
matcher.addURI(getAuthority(), PATH_SEARCH_INSTALLED + "/*", SEARCH_INSTALLED); MATCHER.addURI(getAuthority(), PATH_SEARCH_INSTALLED + "/*", SEARCH_INSTALLED);
matcher.addURI(getAuthority(), PATH_SEARCH_CAN_UPDATE + "/*", SEARCH_CAN_UPDATE); MATCHER.addURI(getAuthority(), PATH_SEARCH_CAN_UPDATE + "/*", SEARCH_CAN_UPDATE);
matcher.addURI(getAuthority(), PATH_SEARCH_REPO + "/*/*", SEARCH_REPO); MATCHER.addURI(getAuthority(), PATH_SEARCH_REPO + "/*/*", SEARCH_REPO);
matcher.addURI(getAuthority(), PATH_REPO + "/#", REPO); MATCHER.addURI(getAuthority(), PATH_REPO + "/#", REPO);
matcher.addURI(getAuthority(), PATH_CAN_UPDATE, CAN_UPDATE); MATCHER.addURI(getAuthority(), PATH_CAN_UPDATE, CAN_UPDATE);
matcher.addURI(getAuthority(), PATH_INSTALLED, INSTALLED); MATCHER.addURI(getAuthority(), PATH_INSTALLED, INSTALLED);
matcher.addURI(getAuthority(), PATH_NO_APKS, NO_APKS); MATCHER.addURI(getAuthority(), PATH_NO_APKS, NO_APKS);
matcher.addURI(getAuthority(), PATH_APPS + "/*", APPS); MATCHER.addURI(getAuthority(), PATH_APPS + "/*", APPS);
matcher.addURI(getAuthority(), "*", CODE_SINGLE); MATCHER.addURI(getAuthority(), "*", CODE_SINGLE);
} }
public static Uri getContentUri() { public static Uri getContentUri() {
@ -597,7 +597,7 @@ public class AppProvider extends FDroidProvider {
@Override @Override
protected UriMatcher getMatcher() { protected UriMatcher getMatcher() {
return matcher; return MATCHER;
} }
private AppQuerySelection queryCanUpdate() { 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. // Queries which are for the main list of apps should not include swap apps.
boolean includeSwap = true; boolean includeSwap = true;
switch (matcher.match(uri)) { switch (MATCHER.match(uri)) {
case CODE_LIST: case CODE_LIST:
includeSwap = false; includeSwap = false;
break; break;
@ -842,7 +842,7 @@ public class AppProvider extends FDroidProvider {
public int delete(Uri uri, String where, String[] whereArgs) { public int delete(Uri uri, String where, String[] whereArgs) {
QuerySelection query = new QuerySelection(where, whereArgs); QuerySelection query = new QuerySelection(where, whereArgs);
switch (matcher.match(uri)) { switch (MATCHER.match(uri)) {
case NO_APKS: case NO_APKS:
query = query.add(queryNoApks()); query = query.add(queryNoApks());
@ -870,7 +870,7 @@ public class AppProvider extends FDroidProvider {
@Override @Override
public int update(Uri uri, ContentValues values, String where, String[] whereArgs) { public int update(Uri uri, ContentValues values, String where, String[] whereArgs) {
QuerySelection query = new QuerySelection(where, whereArgs); QuerySelection query = new QuerySelection(where, whereArgs);
switch (matcher.match(uri)) { switch (MATCHER.match(uri)) {
case CALC_APP_DETAILS_FROM_INDEX: case CALC_APP_DETAILS_FROM_INDEX:
updateAppDetails(); updateAppDetails();

16
F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java
View File

@ -77,12 +77,12 @@ public class InstalledAppProvider extends FDroidProvider {
private static final String PATH_SEARCH = "search"; private static final String PATH_SEARCH = "search";
private static final int CODE_SEARCH = CODE_SINGLE + 1; 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 { static {
matcher.addURI(getAuthority(), null, CODE_LIST); MATCHER.addURI(getAuthority(), null, CODE_LIST);
matcher.addURI(getAuthority(), PATH_SEARCH + "/*", CODE_SEARCH); MATCHER.addURI(getAuthority(), PATH_SEARCH + "/*", CODE_SEARCH);
matcher.addURI(getAuthority(), "*", CODE_SINGLE); MATCHER.addURI(getAuthority(), "*", CODE_SINGLE);
} }
public static Uri getContentUri() { public static Uri getContentUri() {
@ -143,7 +143,7 @@ public class InstalledAppProvider extends FDroidProvider {
@Override @Override
protected UriMatcher getMatcher() { protected UriMatcher getMatcher() {
return matcher; return MATCHER;
} }
private QuerySelection queryApp(String packageName) { private QuerySelection queryApp(String packageName) {
@ -162,7 +162,7 @@ public class InstalledAppProvider extends FDroidProvider {
} }
QuerySelection selection = new QuerySelection(customSelection, selectionArgs); QuerySelection selection = new QuerySelection(customSelection, selectionArgs);
switch (matcher.match(uri)) { switch (MATCHER.match(uri)) {
case CODE_LIST: case CODE_LIST:
break; break;
@ -188,7 +188,7 @@ public class InstalledAppProvider extends FDroidProvider {
@Override @Override
public int delete(Uri uri, String where, String[] whereArgs) { 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 + "."); throw new UnsupportedOperationException("Delete not supported for " + uri + ".");
} }
@ -205,7 +205,7 @@ public class InstalledAppProvider extends FDroidProvider {
@Override @Override
public Uri insert(Uri uri, ContentValues values) { 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 + "."); throw new UnsupportedOperationException("Insert not supported for " + uri + ".");
} }

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

@ -238,12 +238,12 @@ public class RepoProvider extends FDroidProvider {
private static final int CODE_ALL_EXCEPT_SWAP = CODE_SINGLE + 1; 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 { static {
matcher.addURI(AUTHORITY + "." + PROVIDER_NAME, null, CODE_LIST); 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, PATH_ALL_EXCEPT_SWAP, CODE_ALL_EXCEPT_SWAP);
matcher.addURI(AUTHORITY + "." + PROVIDER_NAME, "#", CODE_SINGLE); MATCHER.addURI(AUTHORITY + "." + PROVIDER_NAME, "#", CODE_SINGLE);
} }
public static String getAuthority() { public static String getAuthority() {
@ -276,7 +276,7 @@ public class RepoProvider extends FDroidProvider {
@Override @Override
protected UriMatcher getMatcher() { protected UriMatcher getMatcher() {
return matcher; return MATCHER;
} }
@Override @Override
@ -286,7 +286,7 @@ public class RepoProvider extends FDroidProvider {
sortOrder = "_ID ASC"; sortOrder = "_ID ASC";
} }
switch (matcher.match(uri)) { switch (MATCHER.match(uri)) {
case CODE_LIST: case CODE_LIST:
// Do nothing (don't restrict query) // Do nothing (don't restrict query)
break; break;
@ -350,7 +350,7 @@ public class RepoProvider extends FDroidProvider {
@Override @Override
public int delete(Uri uri, String where, String[] whereArgs) { public int delete(Uri uri, String where, String[] whereArgs) {
switch (matcher.match(uri)) { switch (MATCHER.match(uri)) {
case CODE_LIST: case CODE_LIST:
// Don't support deleting of multiple repos. // Don't support deleting of multiple repos.
return 0; return 0;

14
F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java
View File

@ -24,12 +24,12 @@ public class TempApkProvider extends ApkProvider {
private static final int CODE_INIT = 10000; private static final int CODE_INIT = 10000;
private static final UriMatcher matcher = new UriMatcher(-1); private static final UriMatcher MATCHER = new UriMatcher(-1);
static { static {
matcher.addURI(getAuthority(), PATH_INIT, CODE_INIT); MATCHER.addURI(getAuthority(), PATH_INIT, CODE_INIT);
matcher.addURI(getAuthority(), PATH_APK + "/#/*", CODE_SINGLE); MATCHER.addURI(getAuthority(), PATH_APK + "/#/*", CODE_SINGLE);
matcher.addURI(getAuthority(), PATH_REPO_APK + "/#/*", CODE_REPO_APK); MATCHER.addURI(getAuthority(), PATH_REPO_APK + "/#/*", CODE_REPO_APK);
} }
@Override @Override
@ -78,7 +78,7 @@ public class TempApkProvider extends ApkProvider {
@Override @Override
public Uri insert(Uri uri, ContentValues values) { public Uri insert(Uri uri, ContentValues values) {
switch (matcher.match(uri)) { switch (MATCHER.match(uri)) {
case CODE_INIT: case CODE_INIT:
initTable(); initTable();
return null; return null;
@ -90,7 +90,7 @@ public class TempApkProvider extends ApkProvider {
@Override @Override
public int update(Uri uri, ContentValues values, String where, String[] whereArgs) { 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."); 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); QuerySelection query = new QuerySelection(where, whereArgs);
switch (matcher.match(uri)) { switch (MATCHER.match(uri)) {
case CODE_REPO_APK: case CODE_REPO_APK:
List<String> pathSegments = uri.getPathSegments(); List<String> pathSegments = uri.getPathSegments();
query = query.add(queryRepo(Long.parseLong(pathSegments.get(1)))).add(queryApks(pathSegments.get(2))); query = query.add(queryRepo(Long.parseLong(pathSegments.get(1)))).add(queryApks(pathSegments.get(2)));

12
F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java
View File

@ -26,12 +26,12 @@ public class TempAppProvider extends AppProvider {
private static final int CODE_INIT = 10000; private static final int CODE_INIT = 10000;
private static final int CODE_COMMIT = CODE_INIT + 1; 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 { static {
matcher.addURI(getAuthority(), PATH_INIT, CODE_INIT); MATCHER.addURI(getAuthority(), PATH_INIT, CODE_INIT);
matcher.addURI(getAuthority(), PATH_COMMIT, CODE_COMMIT); MATCHER.addURI(getAuthority(), PATH_COMMIT, CODE_COMMIT);
matcher.addURI(getAuthority(), "*", CODE_SINGLE); MATCHER.addURI(getAuthority(), "*", CODE_SINGLE);
} }
@Override @Override
@ -79,7 +79,7 @@ public class TempAppProvider extends AppProvider {
@Override @Override
public Uri insert(Uri uri, ContentValues values) { public Uri insert(Uri uri, ContentValues values) {
switch (matcher.match(uri)) { switch (MATCHER.match(uri)) {
case CODE_INIT: case CODE_INIT:
initTable(); initTable();
return null; return null;
@ -95,7 +95,7 @@ public class TempAppProvider extends AppProvider {
@Override @Override
public int update(Uri uri, ContentValues values, String where, String[] whereArgs) { public int update(Uri uri, ContentValues values, String where, String[] whereArgs) {
QuerySelection query = new QuerySelection(where, whereArgs); QuerySelection query = new QuerySelection(where, whereArgs);
switch (matcher.match(uri)) { switch (MATCHER.match(uri)) {
case CODE_SINGLE: case CODE_SINGLE:
query = query.add(querySingle(uri.getLastPathSegment())); query = query.add(querySingle(uri.getLastPathSegment()));
break; break;

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

@ -221,7 +221,7 @@ public class SwapService extends Service {
@Override @Override
protected Void doInBackground(Void... args) { protected Void doInBackground(Void... args) {
Uri repoUri = Uri.parse(address); 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); AndroidHttpClient client = AndroidHttpClient.newInstance("F-Droid", SwapService.this);
HttpPost request = new HttpPost("/request-swap"); HttpPost request = new HttpPost("/request-swap");

2
F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java
View File

@ -130,7 +130,7 @@ class BonjourFinder extends PeerFinder implements ServiceListener {
final String type = serviceInfo.getPropertyString("type"); final String type = serviceInfo.getPropertyString("type");
final String fingerprint = serviceInfo.getPropertyString("fingerprint"); final String fingerprint = serviceInfo.getPropertyString("fingerprint");
final boolean isFDroid = type != null && type.startsWith("fdroidrepo"); 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) { if (isFDroid && !isSelf) {
Utils.debugLog(TAG, "Found F-Droid swap Bonjour service:\n" + serviceInfo); Utils.debugLog(TAG, "Found F-Droid swap Bonjour service:\n" + serviceInfo);
subscriber.onNext(new BonjourPeer(serviceInfo)); subscriber.onNext(new BonjourPeer(serviceInfo));

2
F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java
View File

@ -47,7 +47,7 @@ public class BonjourBroadcast extends SwapType {
HashMap<String, String> values = new HashMap<>(); HashMap<String, String> values = new HashMap<>();
values.put("path", "/fdroid/repo"); values.put("path", "/fdroid/repo");
values.put("name", repoName); values.put("name", repoName);
values.put("fingerprint", FDroidApp.repo.fingerprint); values.put("fingerprint", FDroidApp.REPO.fingerprint);
String type; String type;
if (Preferences.get().isLocalRepoHttpsEnabled()) { if (Preferences.get().isLocalRepoHttpsEnabled()) {
values.put("type", "fdroidrepos"); values.put("type", "fdroidrepos");

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

@ -133,8 +133,8 @@ public class WifiStateChangeService extends Service {
} else { } else {
scheme = "http"; scheme = "http";
} }
FDroidApp.repo.name = Preferences.get().getLocalRepoName(); FDroidApp.REPO.name = Preferences.get().getLocalRepoName();
FDroidApp.repo.address = String.format(Locale.ENGLISH, "%s://%s:%d/fdroid/repo", FDroidApp.REPO.address = String.format(Locale.ENGLISH, "%s://%s:%d/fdroid/repo",
scheme, FDroidApp.ipAddressString, FDroidApp.port); scheme, FDroidApp.ipAddressString, FDroidApp.port);
if (isCancelled()) { // can be canceled by a change via WifiStateChangeReceiver if (isCancelled()) { // can be canceled by a change via WifiStateChangeReceiver
@ -143,7 +143,7 @@ public class WifiStateChangeService extends Service {
Context context = WifiStateChangeService.this.getApplicationContext(); Context context = WifiStateChangeService.this.getApplicationContext();
LocalRepoManager lrm = LocalRepoManager.get(context); 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 if (isCancelled()) { // can be canceled by a change via WifiStateChangeReceiver
return null; return null;
@ -152,7 +152,7 @@ public class WifiStateChangeService extends Service {
// the fingerprint for the local repo's signing key // the fingerprint for the local repo's signing key
LocalRepoKeyStore localRepoKeyStore = LocalRepoKeyStore.get(context); LocalRepoKeyStore localRepoKeyStore = LocalRepoKeyStore.get(context);
Certificate localCert = localRepoKeyStore.getCertificate(); 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 * Once the IP address is known we need to generate a self

4
F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
View File

@ -24,7 +24,7 @@ import org.fdroid.fdroid.installer.PrivilegedInstaller;
public class PreferencesFragment extends PreferenceFragment public class PreferencesFragment extends PreferenceFragment
implements SharedPreferences.OnSharedPreferenceChangeListener { implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String[] summariesToUpdate = { private static final String[] SUMMARIES_TO_UPDATE = {
Preferences.PREF_UPD_INTERVAL, Preferences.PREF_UPD_INTERVAL,
Preferences.PREF_UPD_WIFI_ONLY, Preferences.PREF_UPD_WIFI_ONLY,
Preferences.PREF_UPD_NOTIFY, Preferences.PREF_UPD_NOTIFY,
@ -273,7 +273,7 @@ public class PreferencesFragment extends PreferenceFragment
getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this); getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
for (final String key : summariesToUpdate) { for (final String key : SUMMARIES_TO_UPDATE) {
updateSummary(key, false); updateSummary(key, false);
} }

4
F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
View File

@ -500,7 +500,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
// Even if they opted to skip the message which says "Touch devices to swap", // 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 // we still want to actually enable the feature, so that they could touch
// during the wifi qr code being shown too. // 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) { if (Preferences.get().showNfcDuringSwap() && nfcMessageReady) {
inflateInnerView(R.layout.swap_nfc); inflateInnerView(R.layout.swap_nfc);
@ -668,7 +668,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
PrepareSwapRepo(@NonNull Set<String> apps) { PrepareSwapRepo(@NonNull Set<String> apps) {
context = SwapWorkflowActivity.this; context = SwapWorkflowActivity.this;
selectedApps = apps; selectedApps = apps;
sharingUri = Utils.getSharingUri(FDroidApp.repo); sharingUri = Utils.getSharingUri(FDroidApp.REPO);
} }
private void broadcast(int type) { private void broadcast(int type) {

4
F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrView.java
View File

@ -118,7 +118,7 @@ public class WifiQrView extends ScrollView implements SwapWorkflowActivity.Inner
private void setUIFromWifi() { private void setUIFromWifi() {
if (TextUtils.isEmpty(FDroidApp.repo.address)) { if (TextUtils.isEmpty(FDroidApp.REPO.address)) {
return; 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 * 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:// :-( * 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); String qrUriString = (scheme + sharingUri.getHost()).toUpperCase(Locale.ENGLISH);
if (sharingUri.getPort() != 80) { if (sharingUri.getPort() != 80) {
qrUriString += ":" + sharingUri.getPort(); qrUriString += ":" + sharingUri.getPort();

4
config/checkstyle/checkstyle.xml
View File

@ -15,7 +15,9 @@
<module name="TreeWalker"> <module name="TreeWalker">
<!--<module name="ConstantName" />--> <module name="ConstantName">
<property name="format" value="^[A-Z_][A-Z0-9]*(_[A-Z0-9]+)*$"/>
</module>
<module name="LocalFinalVariableName" /> <module name="LocalFinalVariableName" />
<module name="LocalVariableName" /> <module name="LocalVariableName" />
<module name="MemberName" /> <module name="MemberName" />