From 05f3b77a73cc2dcd91b4c63dd5de8af145829a75 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Wed, 25 May 2022 21:06:21 +0200
Subject: [PATCH] Various minor fixes

---
 CHANGELOG.md                                              | 4 ++++
 .../java/protect/card_locker/LoyaltyCardEditActivity.java | 6 +++++-
 .../protect/card_locker/LoyaltyCardViewActivityTest.java  | 8 ++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7f02a161..71cbf8134 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased - 108
+
+- Add card duplication feature
+
 ## v2.16.3 - 107 (2022-04-15)
 
 - Stocard import fixes
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index 9d1319291..34e8b3312 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -777,9 +777,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         }
 
         if (!initDone) {
-            if (updateLoyaltyCard || duplicateFromLoyaltyCardId) {
+            if (updateLoyaltyCard) {
                 setTitle(R.string.editCardTitle);
+            } else {
+                setTitle(R.string.addCardTitle);
+            }
 
+            if (updateLoyaltyCard || duplicateFromLoyaltyCardId) {
                 if (!mFrontImageUnsaved && !croppedFrontImage() && !mFrontImageRemoved) {
                     setCardImage(cardImageFront, Utils.retrieveCardImage(this, tempLoyaltyCard.id, ImageLocationType.front), true);
                 }
diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
index 56a4b8c6b..1cf7f2991 100644
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -981,8 +981,8 @@ public class LoyaltyCardViewActivityTest {
         final Menu menu = shadowOf(activity).getOptionsMenu();
         assertTrue(menu != null);
 
-        // The share, settings, add and star button should be present
-        assertEquals(menu.size(), 3);
+        // The share, settings, star and duplicate options should be present
+        assertEquals(menu.size(), 4);
 
         assertEquals("Block Rotation", menu.findItem(R.id.action_lock_unlock).getTitle().toString());
         assertEquals("Share", menu.findItem(R.id.action_share).getTitle().toString());
@@ -1200,8 +1200,8 @@ public class LoyaltyCardViewActivityTest {
         final Menu menu = shadowOf(activity).getOptionsMenu();
         assertTrue(menu != null);
 
-        // The share, settings and star button should be present
-        assertEquals(menu.size(), 3);
+        // The share, settings, star and duplicate options should be present
+        assertEquals(menu.size(), 4);
 
         assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());