From 7bbcbf25a6237a8cb5d282cf09b970d3643a6b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 8 Oct 2015 22:23:10 +0200 Subject: [PATCH] checkstyle: Add EmptyLineSeparator --- F-Droid/src/com/google/zxing/encode/QRCodeEncoder.java | 1 + .../org/apache/commons/io/input/BoundedInputStream.java | 1 + F-Droid/src/org/fdroid/fdroid/AppDetails.java | 4 ++++ F-Droid/src/org/fdroid/fdroid/compat/LayoutCompat.java | 3 +++ .../src/org/fdroid/fdroid/localrepo/peers/PeerFinder.java | 1 + F-Droid/src/org/fdroid/fdroid/net/AsyncDownloader.java | 5 +++++ F-Droid/src/org/fdroid/fdroid/net/Downloader.java | 1 + .../fdroid/net/bluetooth/httpish/headers/Header.java | 1 + .../fdroid/privileged/views/AppSecurityPermissions.java | 7 +++++++ .../org/fdroid/fdroid/privileged/views/TabsAdapter.java | 1 + .../src/org/fdroid/fdroid/receiver/PackageReceiver.java | 1 + .../fdroid/views/fragments/AvailableAppsFragment.java | 1 + .../src/org/fdroid/fdroid/views/swap/SwapConnecting.java | 4 ++++ config/checkstyle/checkstyle.xml | 3 +++ 14 files changed, 34 insertions(+) diff --git a/F-Droid/src/com/google/zxing/encode/QRCodeEncoder.java b/F-Droid/src/com/google/zxing/encode/QRCodeEncoder.java index 1287437fd..9da79a013 100755 --- a/F-Droid/src/com/google/zxing/encode/QRCodeEncoder.java +++ b/F-Droid/src/com/google/zxing/encode/QRCodeEncoder.java @@ -14,6 +14,7 @@ * limitations under the License. */ // from https://stackoverflow.com/questions/4782543/integration-zxing-library-directly-into-my-android-application + package com.google.zxing.encode; import android.graphics.Bitmap; diff --git a/F-Droid/src/org/apache/commons/io/input/BoundedInputStream.java b/F-Droid/src/org/apache/commons/io/input/BoundedInputStream.java index 49b0f5d5e..7eae22a52 100644 --- a/F-Droid/src/org/apache/commons/io/input/BoundedInputStream.java +++ b/F-Droid/src/org/apache/commons/io/input/BoundedInputStream.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.commons.io.input; import java.io.IOException; diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java index a1516b57e..88be33569 100644 --- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java +++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java @@ -103,8 +103,11 @@ import java.util.List; interface AppDetailsData { App getApp(); + AppDetails.ApkListAdapter getApks(); + Signature getInstalledSignature(); + String getInstalledSignatureId(); } @@ -118,6 +121,7 @@ interface AppDetailsData { */ interface AppInstallListener { void install(final Apk apk); + void removeApk(String packageName); } diff --git a/F-Droid/src/org/fdroid/fdroid/compat/LayoutCompat.java b/F-Droid/src/org/fdroid/fdroid/compat/LayoutCompat.java index d341c5a29..7d7b8bb8f 100644 --- a/F-Droid/src/org/fdroid/fdroid/compat/LayoutCompat.java +++ b/F-Droid/src/org/fdroid/fdroid/compat/LayoutCompat.java @@ -14,8 +14,11 @@ public abstract class LayoutCompat extends Compatibility { private static final LayoutCompat impl = LayoutCompat.create(); protected abstract int relativeLayoutStartOf(); + protected abstract int relativeLayoutEndOf(); + protected abstract int relativeLayoutAlignParentStart(); + protected abstract int relativeLayoutAlignParentEnd(); public static class RelativeLayout { diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/PeerFinder.java b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/PeerFinder.java index 61232400f..5522ca8a6 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/PeerFinder.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/PeerFinder.java @@ -20,6 +20,7 @@ public abstract class PeerFinder { protected final Context context; public abstract void scan(); + public abstract void cancel(); public PeerFinder(Context context) { diff --git a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloader.java index 1a6a6c15f..d0cfc77a4 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloader.java +++ b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloader.java @@ -6,13 +6,18 @@ public interface AsyncDownloader { interface Listener extends ProgressListener { void onErrorDownloading(String localisedExceptionDetails); + void onDownloadComplete(); + void onDownloadCancelled(); } int getBytesRead(); + int getTotalBytes(); + void download(); + void attemptCancel(boolean userRequested); } diff --git a/F-Droid/src/org/fdroid/fdroid/net/Downloader.java b/F-Droid/src/org/fdroid/fdroid/net/Downloader.java index 35bbcc5e5..fcc74eef5 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/Downloader.java +++ b/F-Droid/src/org/fdroid/fdroid/net/Downloader.java @@ -36,6 +36,7 @@ public abstract class Downloader { protected int totalBytes; public abstract InputStream getInputStream() throws IOException; + public abstract void close(); Downloader(Context context, URL url, File destFile) diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java index 57de6eda0..e5c013ca8 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java +++ b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java @@ -12,6 +12,7 @@ public abstract class Header { }; protected abstract String getName(); + protected abstract void handle(FileDetails details, String value); public static void process(FileDetails details, String header, String value) { diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java index 9bdcf1600..da7bfe5b5 100644 --- a/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java +++ b/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java @@ -15,6 +15,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ + package org.fdroid.fdroid.privileged.views; import android.annotation.TargetApi; @@ -459,9 +460,12 @@ public class AppSecurityPermissions { } private static class PermissionGroupInfoComparator implements Comparator { + private final Collator sCollator = Collator.getInstance(); + PermissionGroupInfoComparator() { } + public final int compare(MyPermissionGroupInfo a, MyPermissionGroupInfo b) { if (((a.flags() ^ b.flags()) & PermissionGroupInfo.FLAG_PERSONAL_INFO) != 0) { return ((a.flags() & PermissionGroupInfo.FLAG_PERSONAL_INFO) != 0) ? -1 : 1; @@ -474,9 +478,12 @@ public class AppSecurityPermissions { } private static class PermissionInfoComparator implements Comparator { + private final Collator sCollator = Collator.getInstance(); + PermissionInfoComparator() { } + public final int compare(MyPermissionInfo a, MyPermissionInfo b) { return sCollator.compare(a.mLabel, b.mLabel); } diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/TabsAdapter.java b/F-Droid/src/org/fdroid/fdroid/privileged/views/TabsAdapter.java index f140c76bd..28e69cc4f 100644 --- a/F-Droid/src/org/fdroid/fdroid/privileged/views/TabsAdapter.java +++ b/F-Droid/src/org/fdroid/fdroid/privileged/views/TabsAdapter.java @@ -14,6 +14,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ + package org.fdroid.fdroid.privileged.views; import android.app.Activity; diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java index acbd96267..367b34538 100644 --- a/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java +++ b/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java @@ -33,6 +33,7 @@ abstract class PackageReceiver extends BroadcastReceiver { private static final String TAG = "PackageReceiver"; protected abstract boolean toDiscard(Intent intent); + protected abstract void handle(Context context, String appId); protected PackageInfo getPackageInfo(Context context, String appId) { 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 1637d0fc9..f9d55a508 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java @@ -168,6 +168,7 @@ public class AvailableAppsFragment extends AppListFragment implements getListView().setSelection(0); setCurrentCategory(categories.get(pos)); } + @Override public void onNothingSelected(AdapterView parent) { setCurrentCategory(null); diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java index f90517b9f..a14c82021 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java @@ -125,6 +125,7 @@ public class SwapConnecting extends LinearLayout implements SwapWorkflowActivity return status == UpdateService.STATUS_COMPLETE_AND_SAME || status == UpdateService.STATUS_COMPLETE_WITH_CHANGES; } + @Override protected boolean isError(Intent intent) { int status = getStatusCode(intent); @@ -143,8 +144,11 @@ public class SwapConnecting extends LinearLayout implements SwapWorkflowActivity abstract class Receiver extends BroadcastReceiver { protected abstract String getMessageExtra(); + protected abstract boolean isComplete(Intent intent); + protected abstract boolean isError(Intent intent); + protected abstract void onComplete(); @Override diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index d73d44235..37aff83eb 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -35,6 +35,9 @@ + + +