X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FSslCertificateError.java;h=917b302756c5849e5ec5b13a31a7ffd50f0974da;hp=1e95616258c9cae22d326319eba331bd165db9cb;hb=348acd7bd2c9ba9638ff87b34df4e7501214ca27;hpb=ae2ee09aa7a2afc19f5603c9bc021f98888d7b78 diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateError.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateError.java index 1e956162..917b3027 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateError.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateError.java @@ -1,5 +1,5 @@ -/** - * Copyright 2016 Soren Stoutner . +/* + * Copyright 2016-2017 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -28,6 +28,7 @@ import android.net.http.SslCertificate; import android.net.http.SslError; import android.os.Bundle; import android.support.annotation.NonNull; +// We have to use `AppCompatDialogFragment` instead of `DialogFragment` or an error is produced on API <= 22. import android.support.v7.app.AppCompatDialogFragment; import android.text.SpannableStringBuilder; import android.text.Spanned; @@ -37,6 +38,7 @@ import android.widget.TextView; import com.stoutner.privacybrowser.R; +import java.text.DateFormat; import java.util.Date; public class SslCertificateError extends AppCompatDialogFragment { @@ -76,8 +78,8 @@ public class SslCertificateError extends AppCompatDialogFragment { argumentsBundle.putString("IssuedByCName", issuedByCNameForBundle); argumentsBundle.putString("IssuedByOName", issuedByONameForBundle); argumentsBundle.putString("IssuedByUName", issuedByUNameForBundle); - argumentsBundle.putString("StartDate", startDateForBundle.toString()); - argumentsBundle.putString("EndDate", endDateForBundle.toString()); + argumentsBundle.putString("StartDate", DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG).format(startDateForBundle)); + argumentsBundle.putString("EndDate", DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG).format(endDateForBundle)); // Add `argumentsBundle` to this instance of `SslCertificateError`. SslCertificateError thisSslCertificateErrorDialog = new SslCertificateError();