Skip to content
This repository was archived by the owner on Sep 23, 2024. It is now read-only.

Commit f617bde

Browse files
AbandonedCartpixincreate
authored andcommitted
fix(storage): Media storage confirmation implementation
1 parent 1038a5c commit f617bde

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -556,12 +556,11 @@ class MediaPreviewV2Fragment : LoggingFragment(R.layout.fragment_media_preview_v
556556
}
557557

558558
private fun saveToDisk(mediaItem: MediaTable.MediaRecord) {
559-
SaveAttachmentTask.showWarningDialog(requireContext()) { _: DialogInterface?, _: Int ->
560-
if (StorageUtil.canWriteToMediaStore()) {
561-
performSaveToDisk(mediaItem)
562-
return@showWarningDialog
563-
}
564-
Permissions.with(this)
559+
if (StorageUtil.canWriteToMediaStore()) {
560+
performSaveToDisk(mediaItem)
561+
return
562+
}
563+
SaveAttachmentTask.showWarningDialog(requireContext()) { _: DialogInterface?, _: Int -> Permissions.with(this)
565564
.request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
566565
.ifNecessary()
567566
.withPermanentDenialDialog(getString(R.string.MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied))

app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -653,20 +653,19 @@ public void onDelete() {
653653

654654
@Override
655655
public void onSave() {
656-
SaveAttachmentTask.showWarningDialog(requireContext(), (dialogInterface, i) -> {
657-
if (StorageUtil.canWriteToMediaStore()) {
658-
performSaveToDisk();
659-
return;
660-
}
656+
if (StorageUtil.canWriteToMediaStore()) {
657+
performSaveToDisk();
658+
return;
659+
}
661660

662-
Permissions.with(this)
661+
SaveAttachmentTask.showWarningDialog(requireContext(), (dialogInterface, i) -> Permissions.with(this)
663662
.request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
664663
.ifNecessary()
665664
.withPermanentDenialDialog(getString(R.string.MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied))
666665
.onAnyDenied(() -> Toast.makeText(requireContext(), R.string.MediaPreviewActivity_unable_to_write_to_external_storage_without_permission, Toast.LENGTH_LONG).show())
667666
.onAllGranted(this::performSaveToDisk)
668-
.execute();
669-
});
667+
.execute()
668+
);
670669
}
671670

672671
@Override

0 commit comments

Comments
 (0)