Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 22:29:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1964-no-colons' into 'master'

Browse Source 
Remove colons from default filename

Closes #1964

See merge request briar/briar!1400
This commit is contained in:
Torsten Grote
2021-03-11 11:36:49 +00:00
parent c5d2661c1d d796916387
commit 3f9a66b1b6
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java
View File

@@ -24,10 +24,7 @@ import org.briarproject.briar.android.attachment.AttachmentItem;
import org.briarproject.briar.android.util.BriarSnackbarBuilder; import org.briarproject.briar.android.util.BriarSnackbarBuilder;
import org.briarproject.briar.android.view.PullDownLayout; import org.briarproject.briar.android.view.PullDownLayout;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale;
import javax.inject.Inject; import javax.inject.Inject;
@@ -293,13 +290,10 @@ public class ImageActivity extends BriarActivity
@RequiresApi(api = 19) @RequiresApi(api = 19)
private Intent getCreationIntent() { 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 intent = new Intent(ACTION_CREATE_DOCUMENT);
intent.addCategory(CATEGORY_OPENABLE); intent.addCategory(CATEGORY_OPENABLE);
intent.setType(getVisibleAttachment().getMimeType()); intent.setType(getVisibleAttachment().getMimeType());
intent.putExtra(EXTRA_TITLE, fileName); intent.putExtra(EXTRA_TITLE, viewModel.getFileName());
return intent; return intent;
} }

4
briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java
View File

@@ -225,8 +225,8 @@ public class ImageViewModel extends DbViewModel implements EventListener {
}); });
} }
private String getFileName() { String getFileName() {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd",
Locale.getDefault()); Locale.getDefault());
return sdf.format(new Date()); return sdf.format(new Date());
} }