From 029f1708037b200c4d66f85c6af8c85e071dbd82 Mon Sep 17 00:00:00 2001 From: Aditya-Srivastav <54016427+4D17Y4@users.noreply.github.com> Date: Thu, 12 Aug 2021 17:19:07 +0530 Subject: [PATCH] refractoring (#4545) --- .../commons/customselector/ui/selector/FolderFragment.kt | 4 ++++ .../commons/customselector/ui/selector/ImageFragment.kt | 7 +++++++ .../nrw/commons/customselector/ui/selector/ImageLoader.kt | 7 +++++++ .../main/java/fr/free/nrw/commons/upload/UploadItem.java | 5 +++++ 4 files changed, 23 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt index 45237e92d..456c14831 100644 --- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt @@ -123,6 +123,10 @@ class FolderFragment : CommonsDaggerSupportFragment() { } } + /** + * onResume + * notifyDataSetChanged, rebuild the holder views to account for deleted images, folders. + */ override fun onResume() { folderAdapter.notifyDataSetChanged() super.onResume() diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt index ef49f27e7..ef9ae1fce 100644 --- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt @@ -26,6 +26,9 @@ import java.io.FileInputStream import java.net.URI import javax.inject.Inject +/** + * Custom Selector Image Fragment. + */ class ImageFragment: CommonsDaggerSupportFragment() { /** @@ -169,6 +172,10 @@ class ImageFragment: CommonsDaggerSupportFragment() { // todo change span count depending on the device orientation and other factos. } + /** + * onResume + * notifyDataSetChanged, rebuild the holder views to account for deleted images. + */ override fun onResume() { imageAdapter.notifyDataSetChanged() super.onResume() diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageLoader.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageLoader.kt index 73b2f1f79..cf45a87c1 100644 --- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageLoader.kt +++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageLoader.kt @@ -266,7 +266,14 @@ class ImageLoader @Inject constructor( object ERROR : Result() } + /** + * Companion Object + */ companion object { + /** + * Invalidate Day count. + * False Database Entries are invalid after INVALIDATE_DAY_COUNT and need to be re-queried. + */ const val INVALIDATE_DAY_COUNT: Long = 7 } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadItem.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadItem.java index d7a9c9582..1b482717f 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadItem.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadItem.java @@ -23,6 +23,11 @@ public class UploadItem { private final String createdTimestampSource; private final BehaviorSubject imageQuality; private boolean hasInvalidLocation; + + /** + * Uri of uploadItem + * Uri points to image location or name, eg content://media/external/images/camera/10495 (Android 10) + */ private final Uri contentUri;