Skip to content

Commit 3898b69

Browse files
Use Java 8 Date/Time API instead of java.util.Date.
1 parent 12c6d78 commit 3898b69

File tree

5 files changed

+26
-20
lines changed

5 files changed

+26
-20
lines changed

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,7 @@ public void handleResult(@NonNull final StreamInfo info) {
12451245

12461246
if (info.getUploadDate() != null) {
12471247
videoUploadDateView.setText(Localization
1248-
.localizeUploadDate(activity, info.getUploadDate().date().getTime()));
1248+
.localizeUploadDate(activity, info.getUploadDate().date()));
12491249
videoUploadDateView.setVisibility(View.VISIBLE);
12501250
} else {
12511251
videoUploadDateView.setText(null);

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import com.xwray.groupie.kotlinandroidextensions.GroupieViewHolder
3030
import icepick.State
3131
import io.reactivex.disposables.CompositeDisposable
3232
import java.io.File
33-
import java.text.SimpleDateFormat
34-
import java.util.Date
33+
import java.time.LocalDateTime
34+
import java.time.format.DateTimeFormatter
3535
import java.util.Locale
3636
import kotlin.math.floor
3737
import kotlin.math.max
@@ -189,7 +189,8 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
189189
}
190190

191191
private fun onExportSelected() {
192-
val date = SimpleDateFormat("yyyyMMddHHmm", Locale.ENGLISH).format(Date())
192+
val date = DateTimeFormatter.ofPattern("yyyyMMddHHmm", Locale.ENGLISH)
193+
.format(LocalDateTime.now())
193194
val exportName = "newpipe_subscriptions_$date.json"
194195
val exportFile = File(Environment.getExternalStorageDirectory(), exportName)
195196

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141

4242
import java.io.PrintWriter;
4343
import java.io.StringWriter;
44-
import java.text.SimpleDateFormat;
44+
import java.time.ZoneId;
45+
import java.time.ZonedDateTime;
46+
import java.time.format.DateTimeFormatter;
4547
import java.util.Arrays;
46-
import java.util.Date;
4748
import java.util.List;
4849
import java.util.Locale;
49-
import java.util.TimeZone;
5050
import java.util.Vector;
5151

5252
import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
@@ -405,9 +405,8 @@ public void onBackPressed() {
405405
}
406406

407407
public String getCurrentTimeStamp() {
408-
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
409-
df.setTimeZone(TimeZone.getTimeZone("GMT"));
410-
return df.format(new Date());
408+
return DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm").withZone(ZoneId.of("GMT"))
409+
.format(ZonedDateTime.now());
411410
}
412411

413412
public static class ErrorInfo implements Parcelable {

app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import java.io.IOException;
3838
import java.io.ObjectInputStream;
3939
import java.io.ObjectOutputStream;
40-
import java.text.SimpleDateFormat;
41-
import java.util.Date;
40+
import java.time.LocalDateTime;
41+
import java.time.format.DateTimeFormatter;
4242
import java.util.Locale;
4343
import java.util.Map;
4444
import java.util.zip.ZipFile;
@@ -177,8 +177,8 @@ public void onActivityResult(final int requestCode, final int resultCode,
177177
&& resultCode == Activity.RESULT_OK && data.getData() != null) {
178178
String path = Utils.getFileForUri(data.getData()).getAbsolutePath();
179179
if (requestCode == REQUEST_EXPORT_PATH) {
180-
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US);
181-
exportDatabase(path + "/NewPipeData-" + sdf.format(new Date()) + ".zip");
180+
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss", Locale.US);
181+
exportDatabase(path + "/NewPipeData-" + dtf.format(LocalDateTime.now()) + ".zip");
182182
} else {
183183
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
184184
builder.setMessage(R.string.override_current_data)

app/src/main/java/org/schabi/newpipe/util/Localization.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@
2121

2222
import java.math.BigDecimal;
2323
import java.math.RoundingMode;
24-
import java.text.DateFormat;
2524
import java.text.NumberFormat;
25+
import java.time.LocalDate;
26+
import java.time.ZoneId;
27+
import java.time.ZonedDateTime;
28+
import java.time.format.DateTimeFormatter;
29+
import java.time.format.FormatStyle;
2630
import java.util.Arrays;
2731
import java.util.Calendar;
28-
import java.util.Date;
2932
import java.util.List;
3033
import java.util.Locale;
3134

@@ -137,13 +140,16 @@ public static String localizeNumber(final Context context, final double number)
137140
return nf.format(number);
138141
}
139142

140-
public static String formatDate(final Date date, final Context context) {
141-
return DateFormat.getDateInstance(DateFormat.MEDIUM, getAppLocale(context)).format(date);
143+
public static String formatDate(final LocalDate date) {
144+
return DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).format(date);
142145
}
143146

144147
@SuppressLint("StringFormatInvalid")
145-
public static String localizeUploadDate(final Context context, final Date date) {
146-
return context.getString(R.string.upload_date_text, formatDate(date, context));
148+
public static String localizeUploadDate(final Context context, final Calendar calendar) {
149+
final ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(calendar.toInstant(),
150+
ZoneId.systemDefault());
151+
return context.getString(R.string.upload_date_text, formatDate(zonedDateTime
152+
.toLocalDate()));
147153
}
148154

149155
public static String localizeViewCount(final Context context, final long viewCount) {

0 commit comments

Comments
 (0)