From 7fdd404556459acbb80e4c8f7bcce38fd0f59bc9 Mon Sep 17 00:00:00 2001
From: Niko Strijbol <strijbol.niko@gmail.com>
Date: Thu, 5 Sep 2024 16:13:18 +0200
Subject: [PATCH] Fix some lint errors

---
 app/src/main/AndroidManifest.xml                             | 3 ++-
 .../be/ugent/zeus/hydra/common/utils/StringUtilsTest.java    | 4 ++--
 .../zeus/hydra/feed/cards/dismissal/DismissalDaoTest.java    | 4 ----
 .../ugent/zeus/hydra/feed/commands/MemoryDismissalDao.java   | 4 ++--
 .../java/be/ugent/zeus/hydra/testing/matcher/Fields.java     | 5 ++---
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a43986fee..33fac14af 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -192,7 +192,8 @@
             android:label="@string/wpi_cammie_title"
             android:parentActivityName=".wpi.cammie.CammieActivity"
             android:screenOrientation="fullSensor"
-            android:theme="@style/Zeus.Material.Cammie" />
+            android:theme="@style/Zeus.Material.Cammie"
+            tools:ignore="DiscouragedApi" />
 
         <activity
             android:name=".wpi.door.NfcIntentReceiverActivity"
diff --git a/app/src/test/java/be/ugent/zeus/hydra/common/utils/StringUtilsTest.java b/app/src/test/java/be/ugent/zeus/hydra/common/utils/StringUtilsTest.java
index afecd3f01..871de1d1f 100644
--- a/app/src/test/java/be/ugent/zeus/hydra/common/utils/StringUtilsTest.java
+++ b/app/src/test/java/be/ugent/zeus/hydra/common/utils/StringUtilsTest.java
@@ -23,7 +23,7 @@
 package be.ugent.zeus.hydra.common.utils;
 
 import android.os.Build;
-import androidx.annotation.RequiresApi;
+import androidx.test.filters.SdkSuppress;
 
 import org.junit.Test;
 
@@ -32,7 +32,7 @@
 /**
  * @author Niko Strijbol
  */
-@RequiresApi(api = Build.VERSION_CODES.KITKAT)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
 public class StringUtilsTest {
 
     @Test
diff --git a/app/src/test/java/be/ugent/zeus/hydra/feed/cards/dismissal/DismissalDaoTest.java b/app/src/test/java/be/ugent/zeus/hydra/feed/cards/dismissal/DismissalDaoTest.java
index 583ab5276..f49045f59 100644
--- a/app/src/test/java/be/ugent/zeus/hydra/feed/cards/dismissal/DismissalDaoTest.java
+++ b/app/src/test/java/be/ugent/zeus/hydra/feed/cards/dismissal/DismissalDaoTest.java
@@ -23,7 +23,6 @@
 package be.ugent.zeus.hydra.feed.cards.dismissal;
 
 import android.content.Context;
-import androidx.annotation.RequiresApi;
 import androidx.room.Room;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -47,7 +46,6 @@
 
 import static be.ugent.zeus.hydra.testing.Assert.assertCollectionEquals;
 import static be.ugent.zeus.hydra.testing.Assert.assertThat;
-import static be.ugent.zeus.hydra.testing.Assert.samePropertyValuesAs;
 import static be.ugent.zeus.hydra.testing.Utils.generate;
 import static be.ugent.zeus.hydra.testing.Utils.getRandom;
 import static org.hamcrest.Matchers.empty;
@@ -59,8 +57,6 @@
  *
  * @author Niko Strijbol
  */
-// Request an older version of Android, since the SQLite version in Robolectric does not follow Android releases.
-@RequiresApi(api = 26)
 @RunWith(AndroidJUnit4.class)
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(application = TestApp.class)
diff --git a/app/src/test/java/be/ugent/zeus/hydra/feed/commands/MemoryDismissalDao.java b/app/src/test/java/be/ugent/zeus/hydra/feed/commands/MemoryDismissalDao.java
index da75d5681..c8be1197e 100644
--- a/app/src/test/java/be/ugent/zeus/hydra/feed/commands/MemoryDismissalDao.java
+++ b/app/src/test/java/be/ugent/zeus/hydra/feed/commands/MemoryDismissalDao.java
@@ -23,7 +23,7 @@
 package be.ugent.zeus.hydra.feed.commands;
 
 import android.os.Build;
-import androidx.annotation.RequiresApi;
+import androidx.test.filters.SdkSuppress;
 
 import java.util.HashSet;
 import java.util.List;
@@ -38,7 +38,7 @@
 /**
  * @author Niko Strijbol
  */
-@RequiresApi(api = Build.VERSION_CODES.N)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
 public class MemoryDismissalDao extends DismissalDao {
 
     private final Set<CardDismissal> dismissals = new HashSet<>();
diff --git a/app/src/test/java/be/ugent/zeus/hydra/testing/matcher/Fields.java b/app/src/test/java/be/ugent/zeus/hydra/testing/matcher/Fields.java
index 6ef648d0a..2a44d6254 100644
--- a/app/src/test/java/be/ugent/zeus/hydra/testing/matcher/Fields.java
+++ b/app/src/test/java/be/ugent/zeus/hydra/testing/matcher/Fields.java
@@ -23,7 +23,7 @@
 package be.ugent.zeus.hydra.testing.matcher;
 
 import android.os.Build;
-import androidx.annotation.RequiresApi;
+import androidx.test.filters.SdkSuppress;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -37,13 +37,12 @@
  *
  * @author Niko Strijbol
  */
-@RequiresApi(api = Build.VERSION_CODES.N)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
 class Fields<T> {
 
     private final Class<T> clazz;
 
     private final Collection<String> ignoredFields;
-    private List<Field> results;
 
     Fields(Class<T> clazz) {
         this.clazz = clazz;