Consume login client from data client library

app/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id 'com.github.triplet.play' version '2.2.1' apply false
 }
-
 apply from: '../gitutils.gradle'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
@@ -32,7 +31,7 @@ dependencies {
     implementation 'com.facebook.fresco:fresco:1.13.0'
     implementation 'com.drewnoakes:metadata-extractor:2.11.0'
     implementation 'org.apache.commons:commons-lang3:3.8.1'
-    implementation 'com.dmitrybrant:wikimedia-android-data-client:0.0.23'
+    implementation 'com.dmitrybrant:wikimedia-android-data-client:0.0.25'
 
     // UI
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
@@ -195,6 +194,7 @@ android {
             buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.wikimedia.org/wikipedia/commons\""
             buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.org/wiki/\""
             buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.org\""
+            buildConfigField "String", "WIKIDATA_URL", "\"https://wikidata.org\""
             buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.org/wiki/\""
             buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
             buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Main_Page&welcome=yes\""
@@ -226,6 +226,7 @@ android {
             buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.beta.wmflabs.org/wikipedia/commons\""
             buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/\""
             buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.beta.wmflabs.org\""
+            buildConfigField "String", "WIKIDATA_URL", "\"https://wikidata.org\""
             buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/wiki/\""
             buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
             buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Main_Page&welcome=yes\""

app/src/main/java/fr/free/nrw/commons/CommonsAppAdapter.java

@@ -61,15 +61,16 @@ public String getPassword() {
 
     @Override
     public void updateAccount(@NonNull LoginResult result) {
-        // TODO:  sessionManager.updateAccount(result);
+        sessionManager.updateAccount(result);
     }
 
     @Override
     public SharedPreferenceCookieManager getCookies() {
         if (!preferences.contains(COOKIE_STORE_NAME)) {
             return null;
         }
-        return GsonUnmarshaller.unmarshal(SharedPreferenceCookieManager.class, preferences.getString(COOKIE_STORE_NAME, null));
+        return GsonUnmarshaller.unmarshal(SharedPreferenceCookieManager.class,
+                preferences.getString(COOKIE_STORE_NAME, null));
     }
 
     @Override

app/src/main/java/fr/free/nrw/commons/actions/PageEditClient.java

@@ -0,0 +1,58 @@
+package fr.free.nrw.commons.actions;
+
+import org.wikipedia.csrf.CsrfTokenClient;
+import org.wikipedia.dataclient.Service;
+
+import io.reactivex.Observable;
+import timber.log.Timber;
+
+public class PageEditClient {
+
+    private final CsrfTokenClient csrfTokenClient;
+    private final PageEditInterface pageEditInterface;
+    private final Service service;
+
+    public PageEditClient(CsrfTokenClient csrfTokenClient,
+                          PageEditInterface pageEditInterface,
+                          Service service) {
+        this.csrfTokenClient = csrfTokenClient;
+        this.pageEditInterface = pageEditInterface;
+        this.service = service;
+    }
+
+    public Observable<Boolean> edit(String pageTitle, String text, String summary) {
+        try {
+            return pageEditInterface.postEdit(pageTitle, summary, text, csrfTokenClient.getTokenBlocking())
+                    .map(editResponse -> editResponse.edit().editSucceeded());
+        } catch (Throwable throwable) {
+            return Observable.just(false);
+        }
+    }
+
+    public Observable<Boolean> appendEdit(String pageTitle, String appendText, String summary) {
+        try {
+            return pageEditInterface.postAppendEdit(pageTitle, summary, appendText, csrfTokenClient.getTokenBlocking())
+                    .map(editResponse -> editResponse.edit().editSucceeded());
+        } catch (Throwable throwable) {
+            return Observable.just(false);
+        }
+    }
+
+    public Observable<Boolean> prependEdit(String pageTitle, String prependText, String summary) {
+        try {
+            return pageEditInterface.postPrependEdit(pageTitle, summary, prependText, csrfTokenClient.getTokenBlocking())
+                    .map(editResponse -> editResponse.edit().editSucceeded());
+        } catch (Throwable throwable) {
+            return Observable.just(false);
+        }
+    }
+
+    public Observable<Integer> addEditTag(long revisionId, String tagName, String reason) {
+        try {
+            return service.addEditTag(String.valueOf(revisionId), tagName, reason, csrfTokenClient.getTokenBlocking())
+                    .map(mwPostResponse -> mwPostResponse.getSuccessVal());
+        } catch (Throwable throwable) {
+            return Observable.just(-1);
+        }
+    }
+}

app/src/main/java/fr/free/nrw/commons/actions/PageEditInterface.java

@@ -0,0 +1,41 @@
+package fr.free.nrw.commons.actions;
+
+import androidx.annotation.NonNull;
+
+import org.wikipedia.edit.Edit;
+
+import io.reactivex.Observable;
+import retrofit2.http.Field;
+import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.Headers;
+import retrofit2.http.POST;
+
+import static org.wikipedia.dataclient.Service.MW_API_PREFIX;
+
+public interface PageEditInterface {
+
+    @FormUrlEncoded
+    @Headers("Cache-Control: no-cache")
+    @POST(MW_API_PREFIX + "action=edit")
+    @NonNull
+    Observable<Edit> postEdit(@NonNull @Field("title") String title,
+                              @NonNull @Field("summary") String summary,
+                              @NonNull @Field("text") String text,
+                              @NonNull @Field("token") String token);
+
+    @FormUrlEncoded
+    @Headers("Cache-Control: no-cache")
+    @POST(MW_API_PREFIX + "action=edit")
+    @NonNull Observable<Edit> postAppendEdit(@NonNull @Field("title") String title,
+                                             @NonNull @Field("summary") String summary,
+                                             @NonNull @Field("appendtext") String text,
+                                             @NonNull @Field("token") String token);
+
+    @FormUrlEncoded
+    @Headers("Cache-Control: no-cache")
+    @POST(MW_API_PREFIX + "action=edit")
+    @NonNull Observable<Edit> postPrependEdit(@NonNull @Field("title") String title,
+                                              @NonNull @Field("summary") String summary,
+                                              @NonNull @Field("prependtext") String text,
+                                              @NonNull @Field("token") String token);
+}

app/src/main/java/fr/free/nrw/commons/actions/ThanksClient.java

@@ -0,0 +1,36 @@
+package fr.free.nrw.commons.actions;
+
+import org.wikipedia.csrf.CsrfTokenClient;
+import org.wikipedia.dataclient.Service;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import fr.free.nrw.commons.CommonsApplication;
+import io.reactivex.Observable;
+
+@Singleton
+public class ThanksClient {
+
+    private final CsrfTokenClient csrfTokenClient;
+    private final Service service;
+
+    @Inject
+    public ThanksClient(@Named("commons-csrf") CsrfTokenClient csrfTokenClient,
+                        @Named("commons-service") Service service) {
+        this.csrfTokenClient = csrfTokenClient;
+        this.service = service;
+    }
+
+    public Observable<Boolean> thank(long revisionId) {
+        try {
+            return service.thank(String.valueOf(revisionId), null,
+                    csrfTokenClient.getTokenBlocking(),
+                    CommonsApplication.getInstance().getUserAgent())
+                    .map(mwQueryResponse -> mwQueryResponse.getSuccessVal() == 1);
+        } catch (Throwable throwable) {
+            return Observable.just(false);
+        }
+    }
+}

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

@@ -3,19 +3,17 @@
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.Context;
-import androidx.annotation.Nullable;
 
+import androidx.annotation.Nullable;
 import fr.free.nrw.commons.BuildConfig;
 import timber.log.Timber;
 
 public class AccountUtil {
 
     public static final String AUTH_COOKIE = "authCookie";
     public static final String AUTH_TOKEN_TYPE = "CommonsAndroid";
-    private final Context context;
 
-    public AccountUtil(Context context) {
-        this.context = context;
+    public AccountUtil() {
     }
 
     /**
@@ -49,5 +47,4 @@ public static String getPassword(Context context) {
     private static AccountManager accountManager(Context context) {
         return AccountManager.get(context);
     }
-
 }