From d7356704ea81fa042a76432b31f5b93b4605b29d Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sun, 17 Jan 2021 23:31:05 +0100
Subject: [PATCH] Make spotBugs happy

---
 app/build.gradle                                                | 1 +
 app/src/main/java/protect/card_locker/ImportURIHelper.java      | 2 +-
 .../main/java/protect/card_locker/LoyaltyCardEditActivity.java  | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 79797af8d..2dfd04951 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -68,6 +68,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'com.google.android.material:material:1.2.1'
+    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
 
 // Third-party
     implementation 'com.journeyapps:zxing-android-embedded:4.1.0@aar'
diff --git a/app/src/main/java/protect/card_locker/ImportURIHelper.java b/app/src/main/java/protect/card_locker/ImportURIHelper.java
index ceea0bb8a..ba77d83cf 100644
--- a/app/src/main/java/protect/card_locker/ImportURIHelper.java
+++ b/app/src/main/java/protect/card_locker/ImportURIHelper.java
@@ -53,7 +53,7 @@ public class ImportURIHelper {
             if (store == null || note == null || cardId == null || barcodeType == null) throw new InvalidObjectException("Not a valid import URI");
 
             String unparsedExpiry = uri.getQueryParameter(EXPIRY);
-            if(unparsedExpiry != null && unparsedExpiry != "")
+            if(unparsedExpiry != null && !unparsedExpiry.equals(""))
             {
                 expiry = new Date(Long.parseLong(unparsedExpiry));
             }
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index 6732e9415..558418b32 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -229,6 +229,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
+            @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
             public void onTabSelected(TabLayout.Tab tab) {
                 showPart(tab.getText().toString());
             }
@@ -239,6 +240,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             }
 
             @Override
+            @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
             public void onTabReselected(TabLayout.Tab tab) {
                 showPart(tab.getText().toString());
             }