From 7e00dcc1b71742f97270e749cbbb06752ad864e4 Mon Sep 17 00:00:00 2001 From: Austin Huang Date: Sun, 23 May 2021 21:34:19 -0400 Subject: [PATCH] more #1309 --- .../awais/instagrabber/db/Converters.java | 20 +++++++++---------- .../dialogs/CreateBackupDialogFragment.java | 9 ++++----- .../notification/NotificationArgs.java | 1 - .../instagrabber/utils/MediaUploadHelper.kt | 3 ++- .../awais/instagrabber/utils/TextUtils.kt | 5 +---- .../instagrabber/utils/VoiceRecorder.java | 8 ++++---- .../viewmodels/ImageEditViewModel.java | 8 ++++---- .../awaisomereport/CrashReporterHelper.java | 7 ++++--- 8 files changed, 29 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/awais/instagrabber/db/Converters.java b/app/src/main/java/awais/instagrabber/db/Converters.java index de10e3fc..c852b920 100644 --- a/app/src/main/java/awais/instagrabber/db/Converters.java +++ b/app/src/main/java/awais/instagrabber/db/Converters.java @@ -6,20 +6,20 @@ import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; import java.time.ZoneOffset; -import java.util.Date; +//import java.util.Date; import awais.instagrabber.models.enums.FavoriteType; public class Converters { - @TypeConverter - public static Date fromTimestamp(Long value) { - return value == null ? null : new Date(value); - } - - @TypeConverter - public static Long dateToTimestamp(Date date) { - return date == null ? null : date.getTime(); - } +// @TypeConverter +// public static Date fromTimestamp(Long value) { +// return value == null ? null : new Date(value); +// } +// +// @TypeConverter +// public static Long dateToTimestamp(Date date) { +// return date == null ? null : date.getTime(); +// } @TypeConverter public static FavoriteType fromFavoriteTypeString(String value) { diff --git a/app/src/main/java/awais/instagrabber/dialogs/CreateBackupDialogFragment.java b/app/src/main/java/awais/instagrabber/dialogs/CreateBackupDialogFragment.java index 68f895e0..478837ad 100644 --- a/app/src/main/java/awais/instagrabber/dialogs/CreateBackupDialogFragment.java +++ b/app/src/main/java/awais/instagrabber/dialogs/CreateBackupDialogFragment.java @@ -19,8 +19,8 @@ import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentTransaction; import java.io.File; -import java.text.SimpleDateFormat; -import java.util.Date; +import java.time.format.DateTimeFormatter; +import java.time.LocalDateTime; import java.util.Locale; import awais.instagrabber.databinding.DialogCreateBackupBinding; @@ -34,7 +34,7 @@ import static awais.instagrabber.utils.DownloadUtils.PERMS; public class CreateBackupDialogFragment extends DialogFragment { private static final int STORAGE_PERM_REQUEST_CODE = 8020; - private static final SimpleDateFormat BACKUP_FILE_DATE_TIME_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss", Locale.US); + private static final DateTimeFormatter BACKUP_FILE_DATE_TIME_FORMAT = DateTimeFormatter.ofPattern("yyyyMMddHHmmss", Locale.US); private final OnResultListener onResultListener; private DialogCreateBackupBinding binding; @@ -142,8 +142,7 @@ public class CreateBackupDialogFragment extends DialogFragment { final DirectoryChooser directoryChooser = new DirectoryChooser() .setInitialDirectory(folderPath) .setInteractionListener(path -> { - final Date now = new Date(); - final File file = new File(path, String.format("barinsta_%s.backup", BACKUP_FILE_DATE_TIME_FORMAT.format(now))); + final File file = new File(path, String.format("barinsta_%s.backup", LocalDateTime.now().format(BACKUP_FILE_DATE_TIME_FORMAT))); int flags = 0; if (binding.cbExportFavorites.isChecked()) { flags |= ExportImportUtils.FLAG_FAVORITES; diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/notification/NotificationArgs.java b/app/src/main/java/awais/instagrabber/repositories/responses/notification/NotificationArgs.java index c8e22f10..c984b801 100644 --- a/app/src/main/java/awais/instagrabber/repositories/responses/notification/NotificationArgs.java +++ b/app/src/main/java/awais/instagrabber/repositories/responses/notification/NotificationArgs.java @@ -2,7 +2,6 @@ package awais.instagrabber.repositories.responses.notification; import androidx.annotation.NonNull; -import java.util.Date; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/app/src/main/java/awais/instagrabber/utils/MediaUploadHelper.kt b/app/src/main/java/awais/instagrabber/utils/MediaUploadHelper.kt index 2b6825d1..31ed2f67 100644 --- a/app/src/main/java/awais/instagrabber/utils/MediaUploadHelper.kt +++ b/app/src/main/java/awais/instagrabber/utils/MediaUploadHelper.kt @@ -6,6 +6,7 @@ import awais.instagrabber.models.UploadPhotoOptions import awais.instagrabber.models.UploadVideoOptions import awais.instagrabber.models.enums.MediaItemType import org.json.JSONObject +import java.time.Instant import java.util.* import kotlin.random.Random @@ -106,7 +107,7 @@ fun createUploadDmVoiceOptions( } fun generateUploadId(): String { - return (Date().time / 1000).toString() + return Instant.now().epochSecond.toString() } fun generateName(uploadId: String): String { diff --git a/app/src/main/java/awais/instagrabber/utils/TextUtils.kt b/app/src/main/java/awais/instagrabber/utils/TextUtils.kt index 6fa79a27..c4e71e2d 100644 --- a/app/src/main/java/awais/instagrabber/utils/TextUtils.kt +++ b/app/src/main/java/awais/instagrabber/utils/TextUtils.kt @@ -94,9 +94,6 @@ object TextUtils { @JvmStatic fun nowToString(): String { - return LocalDateTime.ofInstant( - Instant.now(), - ZoneId.systemDefault() - ).format(datetimeParser) + return LocalDateTime.now().format(datetimeParser) } } \ No newline at end of file diff --git a/app/src/main/java/awais/instagrabber/utils/VoiceRecorder.java b/app/src/main/java/awais/instagrabber/utils/VoiceRecorder.java index a22f5055..83f79c7f 100644 --- a/app/src/main/java/awais/instagrabber/utils/VoiceRecorder.java +++ b/app/src/main/java/awais/instagrabber/utils/VoiceRecorder.java @@ -9,9 +9,9 @@ import android.webkit.MimeTypeMap; import androidx.annotation.NonNull; import java.io.File; -import java.text.SimpleDateFormat; +import java.time.format.DateTimeFormatter; +import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Locale; @@ -24,7 +24,7 @@ public class VoiceRecorder { private static final int AUDIO_BIT_DEPTH = 16; private static final int AUDIO_BIT_RATE = AUDIO_SAMPLE_RATE * AUDIO_BIT_DEPTH; private static final String FILE_FORMAT = "yyyy-MM-dd-HH-mm-ss-SSS"; - private static final SimpleDateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat(FILE_FORMAT, Locale.US); + private static final DateTimeFormatter SIMPLE_DATE_FORMAT = DateTimeFormatter.ofPattern(FILE_FORMAT, Locale.US); private final List waveform = new ArrayList<>(); private final File recordingsDir; @@ -141,7 +141,7 @@ public class VoiceRecorder { @NonNull private File getAudioRecordFile() { - final String name = String.format("%s-%s.%s", FILE_PREFIX, SIMPLE_DATE_FORMAT.format(new Date()), EXTENSION); + final String name = String.format("%s-%s.%s", FILE_PREFIX, LocalDateTime.now().format(SIMPLE_DATE_FORMAT), EXTENSION); return new File(recordingsDir, name); } diff --git a/app/src/main/java/awais/instagrabber/viewmodels/ImageEditViewModel.java b/app/src/main/java/awais/instagrabber/viewmodels/ImageEditViewModel.java index 2f7f01b0..561d4fb3 100644 --- a/app/src/main/java/awais/instagrabber/viewmodels/ImageEditViewModel.java +++ b/app/src/main/java/awais/instagrabber/viewmodels/ImageEditViewModel.java @@ -10,9 +10,9 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import java.io.File; -import java.text.SimpleDateFormat; +import java.time.format.DateTimeFormatter; +import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -34,7 +34,7 @@ public class ImageEditViewModel extends AndroidViewModel { private static final String CROP = "crop"; private static final String RESULT = "result"; private static final String FILE_FORMAT = "yyyyMMddHHmmssSSS"; - private static final SimpleDateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat(FILE_FORMAT, Locale.US); + private static final DateTimeFormatter SIMPLE_DATE_FORMAT = DateTimeFormatter.ofPattern(FILE_FORMAT, Locale.US); private Uri originalUri; private SavedImageEditState savedImageEditState; @@ -55,7 +55,7 @@ public class ImageEditViewModel extends AndroidViewModel { public ImageEditViewModel(final Application application) { super(application); - sessionId = SIMPLE_DATE_FORMAT.format(new Date()); + sessionId = LocalDateTime.now().format(SIMPLE_DATE_FORMAT); outputDir = DirectoryUtils.getOutputMediaDirectory(application, "Edit", sessionId); destinationFile = new File(outputDir, RESULT + ".jpg"); destinationUri = Uri.fromFile(destinationFile); diff --git a/app/src/main/java/awaisomereport/CrashReporterHelper.java b/app/src/main/java/awaisomereport/CrashReporterHelper.java index 83f17f3e..172214d9 100644 --- a/app/src/main/java/awaisomereport/CrashReporterHelper.java +++ b/app/src/main/java/awaisomereport/CrashReporterHelper.java @@ -16,7 +16,7 @@ import java.io.FileReader; import java.io.PrintWriter; import java.io.StringWriter; import java.io.Writer; -import java.util.Date; +import java.time.LocalDateTime; import awais.instagrabber.BuildConfig; import awais.instagrabber.R; @@ -28,9 +28,10 @@ public final class CrashReporterHelper { public static void startErrorReporterActivity(@NonNull final Application application, @NonNull final Throwable exception) { final StringBuilder reportBuilder = new StringBuilder(); - reportBuilder.append("IMPORTANT: If sending by email, your email address and the entire content will be made public on GitHub issues.") + reportBuilder.append("IMPORTANT: If sending by email, your email address and the entire content will be made public at") + .append("\r\nIMPORTANT: https://github.com/austinhuang0131/barinsta/issues") .append("\r\nIMPORTANT: When possible, please describe the steps leading to this crash. Thank you for your cooperation.") - .append("\r\n\r\nError report collected on: ").append(new Date().toString()) + .append("\r\n\r\nError report collected on: ").append(LocalDateTime.now().toString()) .append("\r\n\r\nInformation:\r\n==============") .append("\r\nVERSION : ").append(BuildConfig.VERSION_NAME) .append("\r\nVERSION_CODE : ").append(BuildConfig.VERSION_CODE)