Fix displaying birthday for leap+non-leap year combination

vkryl · vkryl · commit 865b6bf36f67 · 2025-08-30T17:49:39.000+03:00
diff --git a/app/src/main/java/org/thunderdog/challegram/core/Lang.java b/app/src/main/java/org/thunderdog/challegram/core/Lang.java
@@ -2414,26 +2414,32 @@ public static String getDownloadStatus (TdApi.File file, int downloadedRes, bool
 
   public static CharSequence getBirthdate (@NonNull TdApi.Birthdate birthdate, boolean includeAge, boolean isSelf) {
     Calendar c = Calendar.getInstance();
+    c.setTimeInMillis(0);
     c.set(Calendar.DAY_OF_MONTH, birthdate.day);
     c.set(Calendar.MONTH, birthdate.month - 1);
+    int birthDayOfThisYear = -1;
     String date;
     if (birthdate.year != 0) {
       c.set(Calendar.YEAR, birthdate.year);
       date = dateYearShort(c);
+
+      Calendar now = DateUtils.getNowCalendar();
+      now.set(Calendar.DAY_OF_MONTH, birthdate.day);
+      now.set(Calendar.MONTH, birthdate.month - 1);
+      birthDayOfThisYear = now.get(Calendar.DAY_OF_YEAR);
     } else {
       date = dateShort(c);
     }
     int ageYears = -1;
     int daysTillBirthday = 0;
     if (birthdate.year != 0) {
       Calendar now = DateUtils.getNowCalendar();
-      ageYears = now.get(Calendar.YEAR) - c.get(Calendar.YEAR);
+      ageYears = now.get(Calendar.YEAR) - birthdate.year;
       int today = now.get(Calendar.DAY_OF_YEAR);
-      int birthday = c.get(Calendar.DAY_OF_YEAR);
-      if (today < birthday) {
+      if (today < birthDayOfThisYear) {
         ageYears--;
       }
-      daysTillBirthday = birthday - today;
+      daysTillBirthday = birthDayOfThisYear - today;
     }
     if (includeAge && ageYears > 0) {
       CharSequence age;
