From 5c0ffea1ef16d817b1627da6047bf883ddad46e0 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 25 Jun 2020 10:20:12 +0200 Subject: [PATCH] fix checkstyle from !817 !818 --- app/src/main/java/org/fdroid/fdroid/Utils.java | 3 ++- .../fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java | 1 - .../org/fdroid/fdroid/views/apps/AppListItemController.java | 4 ---- .../fdroid/fdroid/views/categories/AppCardController.java | 1 - .../test/java/org/fdroid/fdroid/updater/AppIconsTest.java | 6 +++--- .../java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java | 3 ++- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java index 431ae7a13..359f9556e 100644 --- a/app/src/main/java/org/fdroid/fdroid/Utils.java +++ b/app/src/main/java/org/fdroid/fdroid/Utils.java @@ -505,7 +505,8 @@ public final class Utils { : null); } } else { - ImageLoader.getInstance().displayImage(app.getIconUrl(iv.getContext()), iv, Utils.getRepoAppDisplayImageOptions()); + ImageLoader.getInstance().displayImage( + app.getIconUrl(iv.getContext()), iv, Utils.getRepoAppDisplayImageOptions()); } } diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java index 4cbf162b0..70aa50289 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -40,7 +40,6 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import com.nostra13.universalimageloader.core.ImageLoader; import org.apache.commons.io.FilenameUtils; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java index ac7b62a25..87123287a 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java @@ -7,7 +7,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.pm.PackageManager; import android.graphics.Outline; import android.net.Uri; import android.os.Build; @@ -28,11 +27,8 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; -import com.nostra13.universalimageloader.core.DisplayImageOptions; -import com.nostra13.universalimageloader.core.ImageLoader; import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.AppUpdateStatusManager.AppUpdateStatus; -import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java index 00639e6fd..4a99c238d 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java @@ -13,7 +13,6 @@ import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.nostra13.universalimageloader.core.ImageLoader; import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.App; diff --git a/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java b/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java index ccf850ecf..aa6e776ce 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java @@ -1,7 +1,6 @@ package org.fdroid.fdroid.updater; import android.content.ContentValues; - import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.IndexUpdater; import org.fdroid.fdroid.data.App; @@ -16,7 +15,7 @@ import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertThat; /** * Check whether app icons are loaded from the correct repository. The repository with the @@ -71,7 +70,8 @@ public class AppIconsTest extends MultiIndexUpdaterTest { "org.adaway", new String[]{ Schema.AppMetadataTable.Cols.ICON_URL, Schema.AppMetadataTable.Cols.ICON, - Schema.AppMetadataTable.Cols.REPO_ID}); + Schema.AppMetadataTable.Cols.REPO_ID, + }); assertThat(app.getIconUrl(context), MatchesPattern.matchesPattern(expectedUrl)); } } diff --git a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java index b7a29f4c2..9a04510aa 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java @@ -149,7 +149,8 @@ public class IndexV1UpdaterTest extends FDroidProviderTest { Schema.AppMetadataTable.Cols.ICON_URL, Schema.AppMetadataTable.Cols.ICON, Schema.AppMetadataTable.Cols.REPO_ID, - Schema.AppMetadataTable.Cols.Package.PACKAGE_NAME}); + Schema.AppMetadataTable.Cols.Package.PACKAGE_NAME, + }); assertEquals("localized icon takes precedence", TESTY_CANONICAL_URL + "/" + app.packageName + "/en-US/icon.png", app.getIconUrl(context)); }