Skip to content

[FIX] Crash when space link has an specific expiration date format #4834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jesmrec merged 2 commits into from
Apr 22, 2026
+8 −2
Merged

[FIX] Crash when space link has an specific expiration date format #4834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d80d047
fix: support expiration dates without milliseconds to avoid crashes
joragua Apr 22, 2026
fff51d6
chore: add calens file
joragua Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/unreleased/4783
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ This new section shows information like public link names, types and expiration

https://github.com/owncloud/android/issues/4752
https://github.com/owncloud/android/pull/4783
https://github.com/owncloud/android/pull/4834
9 changes: 7 additions & 2 deletions owncloudApp/src/main/java/com/owncloud/android/utils/DisplayUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public class DisplayUtils {
private static final int[] sizeScales = {0, 0, 1, 1, 1, 2, 2, 2, 2};

private static final String DATE_FORMAT_DISPLAY = "dd/MM/yyyy HH:mm";
private static final String DATE_FORMAT_ISO_WITHOUT_MILLISECONDS = "yyyy-MM-dd'T'HH:mm:ss'Z'";
public static final String DATE_FORMAT_ISO = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";

private static Map<String, String> mimeType2HumanReadable;
Expand Down Expand Up @@ -290,8 +291,12 @@ public static Pair<String, String> formatFromBytes(long bytes) {
public static String displayDateToHumanReadable(String date) throws ParseException {
SimpleDateFormat parser = new SimpleDateFormat(DATE_FORMAT_ISO, Locale.ROOT);
parser.setTimeZone(TimeZone.getTimeZone("UTC"));
Date dateParsed = parser.parse(date);
SimpleDateFormat formatter = new SimpleDateFormat(DATE_FORMAT_DISPLAY, Locale.ROOT);
return formatter.format(dateParsed);
try {
return formatter.format(parser.parse(date));
} catch (ParseException e) {
parser.applyPattern(DATE_FORMAT_ISO_WITHOUT_MILLISECONDS);
return formatter.format(parser.parse(date));
}
}
}
Loading