Migrated isUserBlockedFromCommons to retrofit (commons-app#3085)

* Switched wikimedia-android-data-client for new features

* Added UserCLient and UserInterface

* Migrated isUserBlockedFromCommons to retrofit

* Added tests and removed dead code

* Implemented ban checking functionality in UploadActivity

* Removed unused class AuthenticatedActivity

* Fixed tests

* Fixed NullPointerException when a user accessed image details without logging in.

Author: ilgazer

app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java

@@ -15,6 +15,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import javax.inject.Named;
 import javax.inject.Singleton;
@@ -194,6 +195,6 @@ public Scheduler providesMainThread() {
     @Named("username")
     @Provides
     public String provideLoggedInUsername() {
-        return AppAdapter.get().getUserName();
+        return Objects.toString(AppAdapter.get().getUserName(), "");
     }
 }

app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java

@@ -230,6 +230,7 @@ public MediaInterface provideMediaInterface(@Named(NAMED_COMMONS_WIKI_SITE) Wiki
     public CategoryInterface provideCategoryInterface(@Named(NAMED_COMMONS_WIKI_SITE) WikiSite commonsWikiSite) {
         return ServiceFactory.get(commonsWikiSite, BuildConfig.COMMONS_URL, CategoryInterface.class);
     }
+
     @Provides
     @Singleton
     public UserInterface provideUserInterface(@Named(NAMED_COMMONS_WIKI_SITE) WikiSite commonsWikiSite) {

app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.java

@@ -49,47 +49,6 @@ public ApacheHttpClientMediaWikiApi(String apiURL) {
         api = new CustomMwApi(apiURL, httpClient);
     }
 
-    /**
-     * Checks to see if a user is currently blocked from Commons
-     *
-     * @return whether or not the user is blocked from Commons
-     */
-    @Override
-    public boolean isUserBlockedFromCommons() {
-        boolean userBlocked = false;
-        try {
-            CustomApiResult result = api.action("query")
-                    .param("action", "query")
-                    .param("format", "xml")
-                    .param("meta", "userinfo")
-                    .param("uiprop", "blockinfo")
-                    .get();
-            if (result != null) {
-                String blockEnd = result.getString("/api/query/userinfo/@blockexpiry");
-                if (blockEnd.equals("infinite")) {
-                    userBlocked = true;
-                } else if (!blockEnd.isEmpty()) {
-                    Date endDate = parseMWDate(blockEnd);
-                    Date current = new Date();
-                    userBlocked = endDate.after(current);
-                }
-
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return userBlocked;
-    }
-
-    private Date parseMWDate(String mwDate) {
-        try {
-            return DateUtil.iso8601DateParse(mwDate);
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     /**
      * Calls media wiki's logout API
      */

app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java

@@ -9,8 +9,6 @@
 
 public interface MediaWikiApi {
 
-    boolean isUserBlockedFromCommons();
-
     void logout();
 
 //    Single<CampaignResponseDTO> getCampaigns();

app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java

@@ -1,14 +1,22 @@
 package fr.free.nrw.commons.mwapi;
 
+import java.util.Collections;
+
+import javax.inject.Inject;
+
+import io.reactivex.Observable;
+
 import org.wikipedia.dataclient.mwapi.MwQueryLogEvent;
 import org.wikipedia.dataclient.mwapi.MwQueryResponse;
 import org.wikipedia.dataclient.mwapi.MwQueryResult;
+import org.wikipedia.dataclient.mwapi.UserInfo;
+import org.wikipedia.util.DateUtil;
 
-import java.util.Collections;
+import java.util.Date;
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.Single;
 
 public class UserClient {
     private final UserInterface userInterface;
@@ -18,6 +26,29 @@ public UserClient(UserInterface userInterface) {
         this.userInterface = userInterface;
     }
 
+    /**
+     * Checks to see if a user is currently blocked from Commons
+     *
+     * @return whether or not the user is blocked from Commons
+     */
+    public Single<Boolean> isUserBlockedFromCommons() {
+        return userInterface.getUserBlockInfo()
+                .map(MwQueryResponse::query)
+                .map(MwQueryResult::userInfo)
+                .map(UserInfo::blockexpiry)
+                .map(blockExpiry -> {
+                    if (blockExpiry.isEmpty())
+                        return false;
+                    else if ("infinite".equals(blockExpiry))
+                        return true;
+                    else {
+                        Date endDate = DateUtil.iso8601DateParse(blockExpiry);
+                        Date current = new Date();
+                        return endDate.after(current);
+                    }
+                }).single(false);
+    }
+
     public Observable<MwQueryLogEvent> logEvents(String user) {
         try {
             return userInterface.getUserLogEvents(user, Collections.emptyMap())

app/src/main/java/fr/free/nrw/commons/mwapi/UserClient.java

@@ -12,6 +12,20 @@
 import static org.wikipedia.dataclient.Service.MW_API_PREFIX;
 
 public interface UserInterface {
+
+    /**
+     * Gets the log events of user
+     * @param user name of user without prefix
+     * @param continuation continuation params returned in previous query
+     * @return query response
+     */
+
     @GET(MW_API_PREFIX+"action=query&list=logevents&letype=upload&leprop=title|timestamp|ids&lelimit=500")
     Observable<MwQueryResponse> getUserLogEvents(@Query("leuser") String user, @QueryMap Map<String, String> continuation);
+
+    /**
+     * Checks to see if a user is currently blocked from Commons
+     */
+    @GET(MW_API_PREFIX + "action=query&meta=userinfo&uiprop=blockinfo")
+    Observable<MwQueryResponse> getUserBlockInfo();
 }