diff --git a/F-Droid/src/com/google/zxing/encode/QRCodeEncoder.java b/F-Droid/src/com/google/zxing/encode/QRCodeEncoder.java index 9da79a013..fe2ba9e47 100755 --- a/F-Droid/src/com/google/zxing/encode/QRCodeEncoder.java +++ b/F-Droid/src/com/google/zxing/encode/QRCodeEncoder.java @@ -229,19 +229,25 @@ public final class QRCodeEncoder { private static String guessAppropriateEncoding(CharSequence contents) { // Very crude at the moment for (int i = 0; i < contents.length(); i++) { - if (contents.charAt(i) > 0xFF) { return "UTF-8"; } + if (contents.charAt(i) > 0xFF) { + return "UTF-8"; + } } return null; } private static String trim(String s) { - if (s == null) { return null; } + if (s == null) { + return null; + } String result = s.trim(); return result.length() == 0 ? null : result; } private static String escapeMECARD(String input) { - if (input == null || (input.indexOf(':') < 0 && input.indexOf(';') < 0)) { return input; } + if (input == null || (input.indexOf(':') < 0 && input.indexOf(';') < 0)) { + return input; + } int length = input.length(); StringBuilder result = new StringBuilder(length); for (int i = 0; i < length; i++) { diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java index 0f01be225..6939b2a34 100644 --- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java +++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java @@ -1043,16 +1043,24 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A } @Override - public App getApp() { return app; } + public App getApp() { + return app; + } @Override - public ApkListAdapter getApks() { return adapter; } + public ApkListAdapter getApks() { + return adapter; + } @Override - public Signature getInstalledSignature() { return mInstalledSignature; } + public Signature getInstalledSignature() { + return mInstalledSignature; + } @Override - public String getInstalledSignatureId() { return mInstalledSigID; } + public String getInstalledSignatureId() { + return mInstalledSigID; + } public static class AppDetailsSummaryFragment extends Fragment { @@ -1089,13 +1097,21 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A data = (AppDetailsData) activity; } - protected App getApp() { return data.getApp(); } + protected App getApp() { + return data.getApp(); + } - protected ApkListAdapter getApks() { return data.getApks(); } + protected ApkListAdapter getApks() { + return data.getApks(); + } - protected Signature getInstalledSignature() { return data.getInstalledSignature(); } + protected Signature getInstalledSignature() { + return data.getInstalledSignature(); + } - protected String getInstalledSignatureId() { return data.getInstalledSignatureId(); } + protected String getInstalledSignatureId() { + return data.getInstalledSignatureId(); + } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -1442,9 +1458,13 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A .build(); } - private App getApp() { return data.getApp(); } + private App getApp() { + return data.getApp(); + } - private ApkListAdapter getApks() { return data.getApks(); } + private ApkListAdapter getApks() { + return data.getApks(); + } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -1666,9 +1686,13 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A installListener.removeApk(getApp().id); } - protected App getApp() { return data.getApp(); } + protected App getApp() { + return data.getApp(); + } - protected ApkListAdapter getApks() { return data.getApks(); } + protected ApkListAdapter getApks() { + return data.getApks(); + } @Override public void onViewCreated(View view, Bundle savedInstanceState) { diff --git a/F-Droid/src/org/fdroid/fdroid/ProgressListener.java b/F-Droid/src/org/fdroid/fdroid/ProgressListener.java index d393b52a2..a559ae141 100644 --- a/F-Droid/src/org/fdroid/fdroid/ProgressListener.java +++ b/F-Droid/src/org/fdroid/fdroid/ProgressListener.java @@ -41,7 +41,9 @@ public interface ProgressListener { } @Override - public int describeContents() { return 0; } + public int describeContents() { + return 0; + } @Override public void writeToParcel(Parcel dest, int flags) { @@ -70,7 +72,9 @@ public interface ProgressListener { * so we pass that through to the downloader when we set the progress listener. This way, * we can ask the event for the name of the repo. */ - public Bundle getData() { return data; } + public Bundle getData() { + return data; + } } } diff --git a/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java b/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java index c30d5002b..070b40e23 100644 --- a/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java +++ b/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java @@ -70,11 +70,17 @@ public class RepoUpdater { this.progressListener = progressListener; } - public boolean hasChanged() { return hasChanged; } + public boolean hasChanged() { + return hasChanged; + } - public List getApps() { return apps; } + public List getApps() { + return apps; + } - public List getApks() { return apks; } + public List getApks() { + return apks; + } private URL getIndexAddress() throws MalformedURLException { String urlString = repo.address + "/index.jar"; @@ -219,7 +225,9 @@ public class RepoUpdater { return values; } - public RepoUpdateRememberer getRememberer() { return rememberer; } + public RepoUpdateRememberer getRememberer() { + return rememberer; + } public static class RepoUpdateRememberer { diff --git a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java index 5e37daaf3..d2f174158 100644 --- a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java +++ b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java @@ -63,19 +63,33 @@ public class RepoXMLHandler extends DefaultHandler { description = null; } - public List getApps() { return apps; } + public List getApps() { + return apps; + } - public List getApks() { return apksList; } + public List getApks() { + return apksList; + } - public int getMaxAge() { return maxage; } + public int getMaxAge() { + return maxage; + } - public int getVersion() { return version; } + public int getVersion() { + return version; + } - public String getDescription() { return description; } + public String getDescription() { + return description; + } - public String getName() { return name; } + public String getName() { + return name; + } - public String getSigningCertFromIndexXml() { return signingCertFromIndexXml; } + public String getSigningCertFromIndexXml() { + return signingCertFromIndexXml; + } @Override public void characters(char[] ch, int start, int length) { diff --git a/F-Droid/src/org/fdroid/fdroid/compat/ClipboardCompat.java b/F-Droid/src/org/fdroid/fdroid/compat/ClipboardCompat.java index bcbea8ac1..890f61060 100644 --- a/F-Droid/src/org/fdroid/fdroid/compat/ClipboardCompat.java +++ b/F-Droid/src/org/fdroid/fdroid/compat/ClipboardCompat.java @@ -43,5 +43,7 @@ class HoneycombClipboard extends ClipboardCompat { class OldClipboard extends ClipboardCompat { @Override - public String getText() { return null; } + public String getText() { + return null; + } } diff --git a/F-Droid/src/org/fdroid/fdroid/data/App.java b/F-Droid/src/org/fdroid/fdroid/data/App.java index c874dfa50..5416617a7 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/App.java +++ b/F-Droid/src/org/fdroid/fdroid/data/App.java @@ -424,5 +424,7 @@ public class App extends ValueObject implements Comparable { return new AppFilter().filter(this); } - public String getSuggestedVersion() { return suggestedVersion; } + public String getSuggestedVersion() { + return suggestedVersion; + } } diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java index fca8891d4..13a45aec3 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java +++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java @@ -539,17 +539,23 @@ public class AppProvider extends FDroidProvider { } @Override - protected String getTableName() { return DBHelper.TABLE_APP; } + protected String getTableName() { + return DBHelper.TABLE_APP; + } @Override - protected String getProviderName() { return "AppProvider"; } + protected String getProviderName() { + return "AppProvider"; + } public static String getAuthority() { return AUTHORITY + "." + PROVIDER_NAME; } @Override - protected UriMatcher getMatcher() { return matcher; } + protected UriMatcher getMatcher() { + return matcher; + } private AppQuerySelection queryCanUpdate() { final String ignoreCurrent = " fdroid_app.ignoreThisUpdate != fdroid_app.suggestedVercode "; diff --git a/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java b/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java index 248dd34c6..5594a7d64 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java +++ b/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java @@ -100,13 +100,21 @@ public class NewRepoConfig { } - public String getBssid() { return bssid; } + public String getBssid() { + return bssid; + } - public String getSsid() { return ssid; } + public String getSsid() { + return ssid; + } - public int getPort() { return port; } + public int getPort() { + return port; + } - public String getRepoUriString() { return uriString; } + public String getRepoUriString() { + return uriString; + } public Uri getRepoUri() { if (uriString == null) { @@ -115,17 +123,29 @@ public class NewRepoConfig { return Uri.parse(uriString); } - public String getHost() { return host; } + public String getHost() { + return host; + } - public String getFingerprint() { return fingerprint; } + public String getFingerprint() { + return fingerprint; + } - public boolean isValidRepo() { return isValidRepo; } + public boolean isValidRepo() { + return isValidRepo; + } - public boolean isFromSwap() { return fromSwap; } + public boolean isFromSwap() { + return fromSwap; + } - public boolean preventFurtherSwaps() { return preventFurtherSwaps; } + public boolean preventFurtherSwaps() { + return preventFurtherSwaps; + } - public String getErrorMessage() { return errorMessage; } + public String getErrorMessage() { + return errorMessage; + } /** Sanitize and format an incoming repo URI for function and readability */ public static String sanitizeRepoUri(Uri uri) { diff --git a/F-Droid/src/org/fdroid/fdroid/data/QuerySelection.java b/F-Droid/src/org/fdroid/fdroid/data/QuerySelection.java index f19d93032..c6f7a9631 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/QuerySelection.java +++ b/F-Droid/src/org/fdroid/fdroid/data/QuerySelection.java @@ -33,9 +33,13 @@ public class QuerySelection { this.selection = selection; } - public String[] getArgs() { return args; } + public String[] getArgs() { + return args; + } - public String getSelection() { return selection; } + public String getSelection() { + return selection; + } public boolean hasSelection() { return !TextUtils.isEmpty(selection); diff --git a/F-Droid/src/org/fdroid/fdroid/data/Repo.java b/F-Droid/src/org/fdroid/fdroid/data/Repo.java index b187240c5..be53e9907 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/Repo.java +++ b/F-Droid/src/org/fdroid/fdroid/data/Repo.java @@ -89,12 +89,18 @@ public class Repo extends ValueObject { } } - public long getId() { return id; } + public long getId() { + return id; + } - public String getName() { return name; } + public String getName() { + return name; + } @Override - public String toString() { return address; } + public String toString() { + return address; + } public boolean isSigned() { return !TextUtils.isEmpty(this.pubkey); diff --git a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java index 9dc5ddaf8..f2b379321 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java +++ b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java @@ -281,9 +281,15 @@ public class ApkDownloader implements AsyncDownloader.Listener { } } - public Apk getApk() { return curApk; } + public Apk getApk() { + return curApk; + } - public int getBytesRead() { return dlWrapper != null ? dlWrapper.getBytesRead() : 0; } + public int getBytesRead() { + return dlWrapper != null ? dlWrapper.getBytesRead() : 0; + } - public int getTotalBytes() { return dlWrapper != null ? dlWrapper.getTotalBytes() : 0; } + public int getTotalBytes() { + return dlWrapper != null ? dlWrapper.getTotalBytes() : 0; + } } diff --git a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java index 5e0d20147..d2a58defc 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java +++ b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java @@ -168,8 +168,8 @@ public class HttpDownloader extends Downloader { try { if (stream != null) stream.close(); + } catch (IOException e) { } - catch (IOException e) { } connection.disconnect(); } diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java index 68695c1ab..366a981e3 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java +++ b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java @@ -44,7 +44,9 @@ public class BluetoothServer extends Thread { start(); } - public boolean isRunning() { return isRunning; } + public boolean isRunning() { + return isRunning; + } public void close() { diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java index 413a2ce95..d40fe84fb 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java +++ b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java @@ -154,8 +154,9 @@ public final class Request { baos.write(b); } - try { Thread.sleep(100); } - catch (Exception e) { } + try { + Thread.sleep(100); + } catch (Exception e) { } } return line; diff --git a/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java index 09f39f68d..6de85f127 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java +++ b/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java @@ -44,7 +44,9 @@ public class AppListFragmentPagerAdapter extends FragmentPagerAdapter { } @Override - public int getCount() { return TabManager.INDEX_COUNT; } + public int getCount() { + return TabManager.INDEX_COUNT; + } @Override public String getPageTitle(int i) { diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 872a34f91..873411ab4 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -68,9 +68,9 @@ - + - +