Skip to content

Fixed crash when starting NewPipe after it was removed from RAM #4921

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
TobiGr merged 1 commit into from
Nov 20, 2020
Merged

Fixed crash when starting NewPipe after it was removed from RAM #4921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ public void updateFromItem(final InfoItem infoItem,
}

if (item.getUploadDate() != null) {
itemPublishedTime.setText(Localization.relativeTime(item.getUploadDate().date()));
itemPublishedTime.setText(Localization.relativeTime(item.getUploadDate()
.offsetDateTime()));
} else {
itemPublishedTime.setText(item.getTextualUploadDate());
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ private String getStreamInfoDetailLine(final StreamInfoItem infoItem) {
private String getFormattedRelativeUploadDate(final StreamInfoItem infoItem) {
if (infoItem.getUploadDate() != null) {
String formattedRelativeTime = Localization
.relativeTime(infoItem.getUploadDate().date());
.relativeTime(infoItem.getUploadDate().offsetDateTime());

if (DEBUG && PreferenceManager.getDefaultSharedPreferences(itemBuilder.getContext())
.getBoolean(itemBuilder.getContext()
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/org/schabi/newpipe/util/Localization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.time.format.FormatStyle;
import java.util.Arrays;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Locale;

Expand Down Expand Up @@ -312,12 +313,12 @@ private static void initPrettyTime(final Context context) {
prettyTime.removeUnit(Decade.class);
}

private static PrettyTime getPrettyTime() {
return prettyTime;
public static String relativeTime(final OffsetDateTime offsetDateTime) {
return relativeTime(GregorianCalendar.from(offsetDateTime.toZonedDateTime()));
}

public static String relativeTime(final Calendar calendarTime) {
return getPrettyTime().formatUnrounded(calendarTime);
return prettyTime.formatUnrounded(calendarTime);
}

private static void changeAppLanguage(final Locale loc, final Resources res) {
Expand Down