Skip to content

Commit 9253640

Browse files
authored
Merge pull request #11887 from Nikunj-Aggarwal/bg-iso-timestamp
Convert error report timestamps to ISO format
2 parents 8b5aa5c + edd1964 commit 9253640

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.schabi.newpipe.util.ThemeHelper;
2727
import org.schabi.newpipe.util.external_communication.ShareUtils;
2828

29-
import java.time.LocalDateTime;
29+
import java.time.ZonedDateTime;
3030
import java.time.format.DateTimeFormatter;
3131
import java.util.Arrays;
3232
import java.util.stream.Collectors;
@@ -67,10 +67,6 @@ public class ErrorActivity extends AppCompatActivity {
6767
public static final String ERROR_GITHUB_ISSUE_URL =
6868
"https://github.com/TeamNewPipe/NewPipe/issues";
6969

70-
public static final DateTimeFormatter CURRENT_TIMESTAMP_FORMATTER =
71-
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
72-
73-
7470
private ErrorInfo errorInfo;
7571
private String currentTimeStamp;
7672

@@ -107,7 +103,9 @@ protected void onCreate(final Bundle savedInstanceState) {
107103

108104
// important add guru meditation
109105
addGuruMeditation();
110-
currentTimeStamp = CURRENT_TIMESTAMP_FORMATTER.format(LocalDateTime.now());
106+
// print current time, as zoned ISO8601 timestamp
107+
final ZonedDateTime now = ZonedDateTime.now();
108+
currentTimeStamp = now.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
111109

112110
activityErrorBinding.errorReportEmailButton.setOnClickListener(v ->
113111
openPrivacyPolicyDialog(this, "EMAIL"));
@@ -250,6 +248,9 @@ private String buildMarkdown() {
250248
.append("\n* __Content Language:__ ").append(getContentLanguageString())
251249
.append("\n* __App Language:__ ").append(getAppLanguage())
252250
.append("\n* __Service:__ ").append(errorInfo.getServiceName())
251+
.append("\n* __Timestamp:__ ").append(currentTimeStamp)
252+
.append("\n* __Package:__ ").append(getPackageName())
253+
.append("\n* __Service:__ ").append(errorInfo.getServiceName())
253254
.append("\n* __Version:__ ").append(BuildConfig.VERSION_NAME)
254255
.append("\n* __OS:__ ").append(getOsString()).append("\n");
255256

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
<string name="error_snackbar_action">Report</string>
267267
<string name="what_device_headline">Info:</string>
268268
<string name="what_happened_headline">What happened:</string>
269-
<string name="info_labels">What:\\nRequest:\\nContent Language:\\nContent Country:\\nApp Language:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version:</string>
269+
<string name="info_labels">What:\\nRequest:\\nContent Language:\\nContent Country:\\nApp Language:\\nService:\\nTimestamp:\\nPackage:\\nVersion:\\nOS version:</string>
270270
<string name="your_comment">Your comment (in English):</string>
271271
<string name="error_details_headline">Details:</string>
272272
<!-- Content descriptions (for better accessibility) -->

0 commit comments

Comments
 (0)