From a8d72dfcc073530fab923f95d08dc10c15852e03 Mon Sep 17 00:00:00 2001
From: alansley <aclansley@gmail.com>
Date: Tue, 6 Aug 2024 14:12:10 +1000
Subject: [PATCH] Cleaned up a few comments and fixed some plurals logic

---
 .../notifications/DefaultMessageNotifier.java      |  6 +++---
 .../securesms/notifications/PushReceiver.kt        |  4 ++--
 .../src/main/res/values/strings.xml                |  6 ++++--
 libsession/src/main/res/values/strings.xml         | 14 ++++++--------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index 4ac25cc0c1..26e3667542 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -521,9 +521,9 @@ public class DefaultMessageNotifier implements MessageNotifier {
 
       // If we received some manner of notification but Session is locked..
       } else if (KeyCachingService.isLocked(context)) {
-        // Note: We provide 0 because `messageNewYouveGot` is now a plurals string and we don't have a count yet, so just
-        // giving it zero will result in "You got a new message".
-        body = SpanUtil.italic(context.getResources().getQuantityString(R.plurals.messageNewYouveGot, 0, 0));
+        // Note: We provide 1 because `messageNewYouveGot` is now a plurals string and we don't have a count yet, so just
+        // giving it 1 will result in "You got a new message".
+        body = SpanUtil.italic(context.getResources().getQuantityString(R.plurals.messageNewYouveGot, 1, 1));
 
       // ----- All further cases assume we know the contact and that Session isn't locked -----
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushReceiver.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushReceiver.kt
index 25d18143af..0274deee82 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushReceiver.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushReceiver.kt
@@ -56,8 +56,8 @@ class PushReceiver @Inject constructor(@ApplicationContext val context: Context)
             .setColor(context.getColor(R.color.textsecure_primary))
             .setContentTitle(getString(context, R.string.sessionMessenger))
 
-            // Note: We set the count to zero in the below plurals string so it says "You've got a new message" (singular)
-            .setContentText(context.resources.getQuantityString(R.plurals.messageNewYouveGot, 0, 0))
+            // Note: We set the count to 1 in the below plurals string so it says "You've got a new message" (singular)
+            .setContentText(context.resources.getQuantityString(R.plurals.messageNewYouveGot, 1, 1))
 
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)
             .setAutoCancel(true)
diff --git a/content-descriptions/src/main/res/values/strings.xml b/content-descriptions/src/main/res/values/strings.xml
index ab47da53cb..afd3ff8720 100644
--- a/content-descriptions/src/main/res/values/strings.xml
+++ b/content-descriptions/src/main/res/values/strings.xml
@@ -184,8 +184,10 @@
     <string name="AccessibilityId_closeDialog">Close Dialog</string>
     <string name="attachment_type_selector__gallery_description">Image or video</string>
     <string name="attachment_type_selector__drawer_description">Toggle attachment drawer</string>
-    <string name="expiration_type_disappear_legacy_description">Original version of disappearing messages.</string>
     <string name="expand">Expand</string>
-
     <string name="contentDescriptionMediaMessage">Media message</string>
+
+    <!-- REMOVE AFTER ONBOARDING GOES OUT -->
+    <string name="expiration_type_disappear_legacy_description">Original version of disappearing messages.</string>
+
 </resources>
\ No newline at end of file
diff --git a/libsession/src/main/res/values/strings.xml b/libsession/src/main/res/values/strings.xml
index c348eed20a..07f727784e 100644
--- a/libsession/src/main/res/values/strings.xml
+++ b/libsession/src/main/res/values/strings.xml
@@ -6,31 +6,26 @@
         <item quantity="one">%1$d member</item>
         <item quantity="other">%1$d members</item>
     </plurals>
-    <!-- Old for above was: <string name="members">{count} members</string> -->
 
     <plurals name="membersActive">
         <item quantity="one">%1$d active member</item>
         <item quantity="other">%1$d active members</item>
     </plurals>
-    <!-- Old for above was: <string name="activeMembers">{count} active members</string> -->
 
     <plurals name="searchMatches">
         <item quantity="one">%1$d of %2$d match</item>
         <item quantity="other">%1$d of %2$d matches</item>
     </plurals>
-    <!-- CURRENTLY UNUSED: Old for above was: <string name="searchMatches">{count} of {total_count} matches</string> -->
 
     <plurals name="messageNewYouveGot">
         <item quantity="one">You\'ve got a new message.</item>
         <item quantity="other">You\'ve got %1$d new messages.</item>
     </plurals>
-    <!-- CURRENTLY UNUSED and no 'old' string for this as of 2024/07/24 -ACL -->
 
     <plurals name="emojiReactsCountOthers">
         <item quantity="one">And %1$d other has reacted %2$s to this message.</item>
         <item quantity="other">And %1$d others have reacted %2$s to this message.</item>
     </plurals>
-    <!-- Old for above was: <string name="emojiReactsCountOthers">And {count} others have reacted {emoji} to this message.</string> -->
 
     <plurals name="deleteMessagesFailed">
         <item quantity="one">Failed to delete message</item>
@@ -49,8 +44,10 @@
 
     <!-- ========== STRAGGLERS SECTION ========== -->
 
-    <!-- REQUIRED: Title on media picker when you go to send an image - this can be either to a specific Button on the `Set Display Picture` dialog used to instigate choosing a profile picture to set.
-         person, to to a closed group, or to a community (in the latter two cases it will show the group name).
+    <!-- USED as title on media picker when you go to send an image - this can be either to a specific
+         Button on the `Set Display Picture` dialog used to instigate choosing a profile picture to set,
+         sending to a single person, to a closed group, or to a community (in the latter two cases it
+         will show the group name).
          Figma: Unable to locate usage in Figma.
          Morgan 2024/07/31: "Added to Crowdin as `attachmentsSendTo` (not yet exported)" - leaving for now until I know the exact string substitution key -AL 2024/08/02
     -->
@@ -61,7 +58,8 @@
          may still need to cater to _seeing_ Legacy disappearing messages from clients which haven't
          been updated, perhaps?
          Figma: https://www.figma.com/design/tEgZ8ujg76DdtPwEJv8zFp/Disappearing-Messages?t=25H0THKH9VADKm9s-0
-         Morgan 2024/07/31: "once the Onboarding release has gone out we can remove the "Legacy" disappearing message settings (there is a PR for iOS to do so already)"
+         Morgan 2024/07/31: "once the Onboarding release has gone out we can remove the 'Legacy'
+         disappearing message settings (there is a PR for iOS to do so already)"
     -->
     <string name="expiration_type_disappear_legacy">Legacy</string>