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 6bfe1d2e1..7cef1e286 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -9,20 +9,6 @@ import android.content.res.Resources; import android.graphics.Rect; import android.net.Uri; import android.os.Build; -import androidx.annotation.DrawableRes; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; -import androidx.core.content.FileProvider; -import androidx.core.os.ConfigurationCompat; -import androidx.core.os.LocaleListCompat; -import androidx.core.view.ViewCompat; -import androidx.core.widget.TextViewCompat; -import androidx.appcompat.app.AlertDialog; -import androidx.gridlayout.widget.GridLayout; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.LinearSmoothScroller; -import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.text.Spannable; import android.text.Spanned; @@ -42,6 +28,20 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.DrawableRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; +import androidx.core.content.FileProvider; +import androidx.core.os.ConfigurationCompat; +import androidx.core.os.LocaleListCompat; +import androidx.core.view.ViewCompat; +import androidx.core.widget.TextViewCompat; +import androidx.gridlayout.widget.GridLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.LinearSmoothScroller; +import androidx.recyclerview.widget.RecyclerView; import org.apache.commons.io.FilenameUtils; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; @@ -405,7 +405,7 @@ public class AppDetailsRecyclerViewAdapter whatsNewView = (TextView) view.findViewById(R.id.whats_new); descriptionView = (TextView) view.findViewById(R.id.description); descriptionMoreView = (TextView) view.findViewById(R.id.description_more); - antiFeaturesSectionView = view.findViewById(R.id.anti_features_section); + antiFeaturesSectionView = view.findViewById(R.id.anti_features_section); antiFeaturesLabelView = (TextView) view.findViewById(R.id.label_anti_features); antiFeaturesWarningView = view.findViewById(R.id.anti_features_warning); antiFeaturesListingView = view.findViewById(R.id.anti_features_full_listing); diff --git a/app/src/test/java/org/fdroid/fdroid/TestUtils.java b/app/src/test/java/org/fdroid/fdroid/TestUtils.java index ef5a46804..170f03f8a 100644 --- a/app/src/test/java/org/fdroid/fdroid/TestUtils.java +++ b/app/src/test/java/org/fdroid/fdroid/TestUtils.java @@ -7,9 +7,7 @@ import android.content.Context; import android.content.ContextWrapper; import android.content.pm.ProviderInfo; import android.net.Uri; - import androidx.test.core.app.ApplicationProvider; - import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.App; @@ -97,13 +95,13 @@ public class TestUtils { } public static App insertApp(Context context, String packageName, String appName, int suggestedVersionCode, - String repoUrl, String preferredSigner) { + String repoUrl, String preferredSigner) { Repo repo = ensureRepo(context, repoUrl); return insertApp(context, packageName, appName, suggestedVersionCode, repo, preferredSigner); } public static App insertApp(Context context, String packageName, String appName, int suggestedVersionCode, - Repo repo, String preferredSigner) { + Repo repo, String preferredSigner) { ContentValues values = new ContentValues(); values.put(Schema.AppMetadataTable.Cols.REPO_ID, repo.getId()); values.put(Schema.AppMetadataTable.Cols.SUGGESTED_VERSION_CODE, suggestedVersionCode);