Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing photos in gallery.

Browse Source
This commit is contained in:
Michelle Tang
2024-09-03 12:20:38 -07:00
committed by GitHub
parent ab7bdc3c03
commit 2c7668253e
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/conversation/AttachmentKeyboard.java
View File

@@ -118,13 +118,7 @@ public class AttachmentKeyboard extends FrameLayout implements InputAwareLayout.
} }
public void onMediaChanged(@NonNull List<Media> media) { public void onMediaChanged(@NonNull List<Media> media) {
if (StorageUtil.canReadAllFromMediaStore()) { if (StorageUtil.canOnlyReadSelectedMediaStore() && media.isEmpty()) {
mediaList.setVisibility(VISIBLE);
mediaAdapter.setMedia(media, false);
permissionButton.setVisibility(GONE);
permissionText.setVisibility(GONE);
manageButton.setVisibility(GONE);
} else if (StorageUtil.canOnlyReadSelectedMediaStore() && media.isEmpty()) {
mediaList.setVisibility(GONE); mediaList.setVisibility(GONE);
manageButton.setVisibility(GONE); manageButton.setVisibility(GONE);
permissionText.setVisibility(VISIBLE); permissionText.setVisibility(VISIBLE);
@@ -142,6 +136,12 @@ public class AttachmentKeyboard extends FrameLayout implements InputAwareLayout.
manageButton.setVisibility(VISIBLE); manageButton.setVisibility(VISIBLE);
permissionText.setVisibility(GONE); permissionText.setVisibility(GONE);
permissionButton.setVisibility(GONE); permissionButton.setVisibility(GONE);
} else if (StorageUtil.canReadAnyFromMediaStore()) {
mediaList.setVisibility(VISIBLE);
mediaAdapter.setMedia(media, false);
permissionButton.setVisibility(GONE);
permissionText.setVisibility(GONE);
manageButton.setVisibility(GONE);
} else { } else {
mediaList.setVisibility(GONE); mediaList.setVisibility(GONE);
manageButton.setVisibility(GONE); manageButton.setVisibility(GONE);

12
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGalleryFragment.kt
View File

@@ -181,12 +181,7 @@ class MediaGalleryFragment : Fragment(R.layout.v2_media_gallery_fragment) {
} }
galleryItemsWithSelection.observe(viewLifecycleOwner) { galleryItemsWithSelection.observe(viewLifecycleOwner) {
if (StorageUtil.canReadAllFromMediaStore()) { if (StorageUtil.canOnlyReadSelectedMediaStore() && it.isEmpty()) {
binding.mediaGalleryMissingPermissions.visible = false
binding.mediaGalleryManageContainer.visible = false
shouldEnableScrolling = true
galleryAdapter.submitList(it)
} else if (StorageUtil.canOnlyReadSelectedMediaStore() && it.isEmpty()) {
binding.mediaGalleryMissingPermissions.visible = true binding.mediaGalleryMissingPermissions.visible = true
binding.mediaGalleryManageContainer.visible = false binding.mediaGalleryManageContainer.visible = false
binding.mediaGalleryPermissionText.text = getString(R.string.MediaGalleryFragment__no_photos_found) binding.mediaGalleryPermissionText.text = getString(R.string.MediaGalleryFragment__no_photos_found)
@@ -200,6 +195,11 @@ class MediaGalleryFragment : Fragment(R.layout.v2_media_gallery_fragment) {
binding.mediaGalleryManageButton.setOnClickListener { v -> showManageContextMenu(v, v.rootView as ViewGroup, false, false) } binding.mediaGalleryManageButton.setOnClickListener { v -> showManageContextMenu(v, v.rootView as ViewGroup, false, false) }
shouldEnableScrolling = true shouldEnableScrolling = true
galleryAdapter.submitList(it) galleryAdapter.submitList(it)
} else if (StorageUtil.canReadAnyFromMediaStore()) {
binding.mediaGalleryMissingPermissions.visible = false
binding.mediaGalleryManageContainer.visible = false
shouldEnableScrolling = true
galleryAdapter.submitList(it)
} else { } else {
binding.mediaGalleryMissingPermissions.visible = true binding.mediaGalleryMissingPermissions.visible = true
binding.mediaGalleryManageContainer.visible = false binding.mediaGalleryManageContainer.visible = false

4
app/src/main/java/org/thoughtcrime/securesms/util/StorageUtil.java
View File

@@ -145,7 +145,9 @@ public class StorageUtil {
} }
public static boolean canOnlyReadSelectedMediaStore() { public static boolean canOnlyReadSelectedMediaStore() {
return Build.VERSION.SDK_INT >= 34 && Permissions.hasAll(AppDependencies.getApplication(), Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED); return Build.VERSION.SDK_INT >= 34 &&
Permissions.hasAll(AppDependencies.getApplication(), Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED) &&
!Permissions.hasAny(AppDependencies.getApplication(), Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO);
} }
public static boolean canReadAllFromMediaStore() { public static boolean canReadAllFromMediaStore() {