diff --git a/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java index f31f36c51..611cb7975 100644 --- a/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java @@ -54,12 +54,12 @@ public abstract class AuthenticatedActivity extends NavigationBaseActivity { protected abstract void onAuthFailure(); /** - * Makes API call to check if user is blocked. If the user is blocked, a snackbar + * Makes API call to check if user is blocked from Commons. If the user is blocked, a snackbar * is created to notify the user */ protected void showBlockStatus() { - Observable.fromCallable(() -> mediaWikiApi.isUserBlocked()) + Observable.fromCallable(() -> mediaWikiApi.isUserBlockedFromCommons()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .filter(result -> result) diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java b/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java index c24ee2f21..ab534b00f 100644 --- a/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java +++ b/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java @@ -617,11 +617,11 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi { } /** - * Checks to see if a user is currently blocked - * @return whether or not the user is blocked + * Checks to see if a user is currently blocked from Commons + * @return whether or not the user is blocked from Commons */ @Override - public boolean isUserBlocked() { + public boolean isUserBlockedFromCommons() { boolean userBlocked = false; try { ApiResult result = api.action("query") diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java b/app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java index 6ba1f9158..21f45e127 100644 --- a/app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java +++ b/app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java @@ -75,7 +75,7 @@ public interface MediaWikiApi { @NonNull Single getUploadCount(String userName); - boolean isUserBlocked(); + boolean isUserBlockedFromCommons(); interface ProgressListener { void onProgress(long transferred, long total); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6828af2c3..eb040f458 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -282,7 +282,7 @@ Share App Coordinates were not specified during image selection Error fetching nearby places. - You are blocked from editing commons + You are blocked from editing Commons Set wallpaper Wallpaper set successfully! diff --git a/app/src/test/kotlin/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.kt index eea86fd2f..2d624ced8 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.kt @@ -225,10 +225,10 @@ class ApacheHttpClientMediaWikiApiTest { } @Test - fun isUserBlockedForInfinitelyBlockedUser() { + fun isUserBlockedFromCommonsForInfinitelyBlockedUser() { server.enqueue(MockResponse().setBody("")) - val result = testObject.isUserBlocked(); + val result = testObject.isUserBlockedFromCommons(); assertBasicRequestParameters(server, "GET").let { userBlockedRequest -> parseQueryParams(userBlockedRequest).let { body -> @@ -243,14 +243,14 @@ class ApacheHttpClientMediaWikiApiTest { } @Test - fun isUserBlockedForTimeBlockedUser() { + fun isUserBlockedFromCommonsForTimeBlockedUser() { val currentDate = Date() val expiredDate = Date(currentDate.time + 10000) val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'") dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")) server.enqueue(MockResponse().setBody("")) - val result = testObject.isUserBlocked(); + val result = testObject.isUserBlockedFromCommons(); assertBasicRequestParameters(server, "GET").let { userBlockedRequest -> parseQueryParams(userBlockedRequest).let { body -> @@ -265,14 +265,14 @@ class ApacheHttpClientMediaWikiApiTest { } @Test - fun isUserBlockedForExpiredBlockedUser() { + fun isUserBlockedFromCommonsForExpiredBlockedUser() { val currentDate = Date() val expiredDate = Date(currentDate.time - 10000) val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'") dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")) server.enqueue(MockResponse().setBody("")) - val result = testObject.isUserBlocked(); + val result = testObject.isUserBlockedFromCommons(); assertBasicRequestParameters(server, "GET").let { userBlockedRequest -> parseQueryParams(userBlockedRequest).let { body -> @@ -287,10 +287,10 @@ class ApacheHttpClientMediaWikiApiTest { } @Test - fun isUserBlockedForNotBlockedUser() { + fun isUserBlockedFromCommonsForNotBlockedUser() { server.enqueue(MockResponse().setBody("")) - val result = testObject.isUserBlocked(); + val result = testObject.isUserBlockedFromCommons(); assertBasicRequestParameters(server, "GET").let { userBlockedRequest -> parseQueryParams(userBlockedRequest).let { body ->