From 91174778b5b226e2cdb99b722bdc47ee27e4f2b0 Mon Sep 17 00:00:00 2001 From: Sujal-Gupta-SG Date: Sun, 26 Jan 2025 21:05:52 +0530 Subject: [PATCH] updated --- .../ContributionsListPresenter.java | 18 ++----------- .../ContributionsRemoteDataSource.kt | 27 ------------------- .../commons/contributions/MainActivity.java | 4 +-- 3 files changed, 4 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java index f0b63c547..5428c405f 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListPresenter.java @@ -129,25 +129,11 @@ public class ContributionsListPresenter implements UserActionListener { }); } - private long lastKnownIdentifier ; // Declare and initialize - /** * Check for new contributions by comparing the latest contribution identifier. */ - void checkForNewContributions() { - - // Set the username before fetching contributions - contributionsRemoteDataSource.setUserName(sessionManager.getUserName()); - - contributionsRemoteDataSource.fetchLatestContributionIdentifier(latestIdentifier -> { - Timber.d("Latest identifier: %s", latestIdentifier); - Timber.d("Last known identifier: %s", lastKnownIdentifier); - if (latestIdentifier != null && !latestIdentifier.equals(lastKnownIdentifier)) { - lastKnownIdentifier = latestIdentifier; - contributionBoundaryCallback.refreshList(() -> Unit.INSTANCE); - } - return Unit.INSTANCE; - }); + void fetchContributions() { + contributionBoundaryCallback.refreshList(() -> Unit.INSTANCE); } } \ No newline at end of file diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRemoteDataSource.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRemoteDataSource.kt index ccad51860..d3abc2f0d 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRemoteDataSource.kt +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRemoteDataSource.kt @@ -73,33 +73,6 @@ constructor( ) } - /** - * Fetches the latest contribution identifier only - */ - fun fetchLatestContributionIdentifier(callback: (Long?) -> Unit) { - if (userName.isNullOrEmpty()) { - Timber.e("Failed to fetch latest contribution: userName is null or empty") - return - } - Timber.d("Fetching latest contribution identifier for user: $userName") - - compositeDisposable.add( - mediaClient.getMediaListForUser(userName!!) - .map { mediaList -> - mediaList.firstOrNull()?.pageId // Extract the first contribution's pageId as Long - } - .subscribeOn(ioThreadScheduler) - .subscribe({ latestIdentifier -> - if (latestIdentifier != null) { - callback(latestIdentifier.toLong()) - } - }) { error: Throwable -> - Timber.e("Failed to fetch latest contribution identifier: %s", error.message) - callback(null) - }, - ) - } - fun dispose() { compositeDisposable.dispose() } diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java index dc2116785..0a9ea9f35 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java @@ -463,7 +463,7 @@ public class MainActivity extends BaseActivity v.startAnimation(rotateAnimation); // Trigger refresh logic - contributionsListPresenter.checkForNewContributions(); + contributionsListPresenter.fetchContributions(); }); } } @@ -495,7 +495,7 @@ public class MainActivity extends BaseActivity retryAllFailedUploads(); // Background check for new contributions - contributionsListPresenter.checkForNewContributions(); + contributionsListPresenter.fetchContributions(); } @Override