From d7969163876d7c2b351cf80e7151d78e486a6ccd Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 11 Mar 2021 10:33:53 +0000 Subject: [PATCH] Also remove colons on API >= 19. --- .../briar/android/conversation/ImageActivity.java | 8 +------- .../briar/android/conversation/ImageViewModel.java | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java index 5b816f26c..a181b66f8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java @@ -24,10 +24,7 @@ import org.briarproject.briar.android.attachment.AttachmentItem; import org.briarproject.briar.android.util.BriarSnackbarBuilder; import org.briarproject.briar.android.view.PullDownLayout; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; -import java.util.Locale; import javax.inject.Inject; @@ -293,13 +290,10 @@ public class ImageActivity extends BriarActivity @RequiresApi(api = 19) private Intent getCreationIntent() { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", - Locale.getDefault()); - String fileName = sdf.format(new Date()); Intent intent = new Intent(ACTION_CREATE_DOCUMENT); intent.addCategory(CATEGORY_OPENABLE); intent.setType(getVisibleAttachment().getMimeType()); - intent.putExtra(EXTRA_TITLE, fileName); + intent.putExtra(EXTRA_TITLE, viewModel.getFileName()); return intent; } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java index cfb142377..80ab00150 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java @@ -225,7 +225,7 @@ public class ImageViewModel extends DbViewModel implements EventListener { }); } - private String getFileName() { + String getFileName() { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()); return sdf.format(new Date());