With delete helper migrated to data client

maskaravivek · maskaravivek · commit 8b9c23ee1259 · 2019-06-07T14:24:56.000+05:30
diff --git a/app/src/main/java/fr/free/nrw/commons/actions/PageEditClient.java b/app/src/main/java/fr/free/nrw/commons/actions/PageEditClient.java
@@ -21,9 +21,27 @@ public PageEditClient(@Named("commons-csrf") CsrfTokenClient csrfTokenClient,
         this.pageEditInterface = pageEditInterface;
     }
 
+    public Observable<Boolean> edit(String pageTitle, String text, String summary) {
+        try {
+            return pageEditInterface.postEdit(pageTitle, csrfTokenClient.getTokenBlocking(), text, summary)
+                    .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.appendEdit(pageTitle, csrfTokenClient.getTokenBlocking(), appendText, summary)
+            return pageEditInterface.postAppendEdit(pageTitle, csrfTokenClient.getTokenBlocking(), appendText, summary)
+                    .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, csrfTokenClient.getTokenBlocking(), prependText, summary)
                     .map(editResponse -> editResponse.edit().editSucceeded());
         } catch (Throwable throwable) {
             return Observable.just(false);
diff --git a/app/src/main/java/fr/free/nrw/commons/actions/PageEditInterface.java b/app/src/main/java/fr/free/nrw/commons/actions/PageEditInterface.java
@@ -1,16 +1,43 @@
 package fr.free.nrw.commons.actions;
 
+import androidx.annotation.NonNull;
+
 import org.wikipedia.edit.Edit;
 
 import io.reactivex.Observable;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
+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 {
 
-    @GET("w/api.php?action=edit")
-    Observable<Edit> appendEdit(@Query("title") String title,
-                                @Query("token") String token,
-                                @Query("appendtext") String appendText,
-                                @Query("summary") String summary);
+    @FormUrlEncoded
+    @Headers("Cache-Control: no-cache")
+    @POST(MW_API_PREFIX + "action=edit&nocreate=")
+    @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&nocreate=")
+    @NonNull
+    Observable<Edit> postPrependEdit(@NonNull @Field("title") String title,
+                                     @NonNull @Field("summary") String summary,
+                                     @NonNull @Field("prependtext") String text,
+                                     @NonNull @Field("token") String token);
+
+    @FormUrlEncoded
+    @Headers("Cache-Control: no-cache")
+    @POST(MW_API_PREFIX + "action=edit&nocreate=")
+    @NonNull
+    Observable<Edit> postEdit(@NonNull @Field("title") String title,
+                              @NonNull @Field("summary") String summary,
+                              @NonNull @Field("text") String text,
+                              @NonNull @Field("token") String token);
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/actions/ThankInterface.java b/app/src/main/java/fr/free/nrw/commons/actions/ThankInterface.java
@@ -6,7 +6,9 @@
 import retrofit2.http.GET;
 import retrofit2.http.Query;
 
+import static org.wikipedia.dataclient.Service.MW_API_PREFIX;
+
 public interface ThankInterface {
-    @GET("w/api.php?action=thank")
+    @GET(MW_API_PREFIX + "action=thank")
     Observable<MwQueryResponse> thank(@Query("rev") long revisionId, @Query("token") String token, @Query("source") String source);
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
@@ -212,7 +212,6 @@ protected void onResume() {
                 && sessionManager.isUserLoggedIn()
                 && sessionManager.getCachedAuthCookie() != null) {
             applicationKvStore.putBoolean("login_skipped", false);
-            sessionManager.revalidateAuthToken();
             startMainActivity();
         }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/SessionManager.java b/app/src/main/java/fr/free/nrw/commons/auth/SessionManager.java
@@ -8,16 +8,16 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.wikipedia.login.LoginResult;
 import org.wikipedia.util.log.L;
 
-import androidx.annotation.Nullable;
-
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import androidx.annotation.NonNull;
 import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
@@ -137,25 +137,6 @@ private AccountManager accountManager() {
         return AccountManager.get(context);
     }
 
-    public Boolean revalidateAuthToken() {
-        AccountManager accountManager = AccountManager.get(context);
-        Account curAccount = getCurrentAccount();
-
-        if (curAccount == null) {
-            return false; // This should never happen
-        }
-
-        accountManager.invalidateAuthToken(BuildConfig.ACCOUNT_TYPE, null);
-        String authCookie = getAuthCookie();
-
-        if (authCookie == null) {
-            return false;
-        }
-
-        mediaWikiApi.setAuthCookie(authCookie);
-        return true;
-    }
-
     public String getAuthCookie() {
         if (!isUserLoggedIn()) {
             Timber.e("User is not logged in");
diff --git a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java
@@ -4,6 +4,10 @@
 import android.content.Intent;
 import android.net.Uri;
 
+import androidx.appcompat.app.AlertDialog;
+
+import org.wikipedia.AppAdapter;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -12,18 +16,15 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import androidx.appcompat.app.AlertDialog;
 import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.Media;
-import fr.free.nrw.commons.auth.SessionManager;
-import fr.free.nrw.commons.mwapi.MediaWikiApi;
+import fr.free.nrw.commons.actions.PageEditClient;
 import fr.free.nrw.commons.notification.NotificationHelper;
 import fr.free.nrw.commons.review.ReviewActivity;
-import fr.free.nrw.commons.utils.ViewUtil;
 import fr.free.nrw.commons.review.ReviewController;
 import fr.free.nrw.commons.utils.ViewUtilWrapper;
+import io.reactivex.Observable;
 import io.reactivex.Single;
-import timber.log.Timber;
 
 import static fr.free.nrw.commons.notification.NotificationHelper.NOTIFICATION_DELETE;
 
@@ -32,19 +33,16 @@
  */
 @Singleton
 public class DeleteHelper {
-    private final MediaWikiApi mwApi;
-    private final SessionManager sessionManager;
     private final NotificationHelper notificationHelper;
+    private final PageEditClient pageEditClient;
     private final ViewUtilWrapper viewUtil;
 
     @Inject
-    public DeleteHelper(MediaWikiApi mwApi,
-                        SessionManager sessionManager,
-                        NotificationHelper notificationHelper,
+    public DeleteHelper(NotificationHelper notificationHelper,
+                        PageEditClient pageEditClient,
                         ViewUtilWrapper viewUtil) {
-        this.mwApi = mwApi;
-        this.sessionManager = sessionManager;
         this.notificationHelper = notificationHelper;
+        this.pageEditClient = pageEditClient;
         this.viewUtil = viewUtil;
     }
 
@@ -58,9 +56,9 @@ public DeleteHelper(MediaWikiApi mwApi,
     public Single<Boolean> makeDeletion(Context context, Media media, String reason) {
         viewUtil.showShortToast(context, "Trying to nominate " + media.getDisplayTitle() + " for deletion");
 
-        return Single.fromCallable(() -> delete(media, reason))
-                .flatMap(result -> Single.fromCallable(() ->
-                        showDeletionNotification(context, media, result)));
+        return delete(media, reason)
+                .flatMapSingle(result -> Single.just(showDeletionNotification(context, media, result)))
+                .firstOrError();
     }
 
     /**
@@ -69,14 +67,8 @@ public Single<Boolean> makeDeletion(Context context, Media media, String reason)
      * @param reason
      * @return
      */
-    private boolean delete(Media media, String reason) {
-        String editToken;
-        String authCookie;
+    private Observable<Boolean> delete(Media media, String reason) {
         String summary = "Nominating " + media.getFilename() + " for deletion.";
-
-        authCookie = sessionManager.getAuthCookie();
-        mwApi.setAuthCookie(authCookie);
-
         Calendar calendar = Calendar.getInstance();
         String fileDeleteString = "{{delete|reason=" + reason +
                 "|subpage=" + media.getFilename() +
@@ -97,25 +89,23 @@ private boolean delete(Media media, String reason) {
         String userPageString = "\n{{subst:idw|" + media.getFilename() +
                 "}} ~~~~";
 
-        try {
-            editToken = mwApi.getEditToken();
-            if (editToken.equals("+\\")) {
-                return false;
-            }
-
-            mwApi.prependEdit(editToken, fileDeleteString + "\n",
-                    media.getFilename(), summary);
-            mwApi.edit(editToken, subpageString + "\n",
-                    "Commons:Deletion_requests/" + media.getFilename(), summary);
-            mwApi.appendEdit(editToken, logPageString + "\n",
-                    "Commons:Deletion_requests/" + date, summary);
-            mwApi.appendEdit(editToken, userPageString + "\n",
-                    "User_Talk:" + sessionManager.getCurrentAccount().name, summary);
-        } catch (Exception e) {
-            Timber.e(e);
-            return false;
-        }
-        return true;
+        return pageEditClient.prependEdit(media.getFilename(), fileDeleteString + "\n", summary)
+                .flatMap(result -> {
+                    if (result) {
+                        return pageEditClient.edit("Commons:Deletion_requests/" + media.getFilename(), subpageString + "\n", summary);
+                    }
+                    throw new RuntimeException("Failed to nominate for deletion");
+                }).flatMap(result -> {
+                    if (result) {
+                        return pageEditClient.appendEdit("Commons:Deletion_requests/" + date, logPageString + "\n", summary);
+                    }
+                    throw new RuntimeException("Failed to nominate for deletion");
+                }).flatMap(result -> {
+                    if (result) {
+                        return pageEditClient.appendEdit("User_Talk:" + AppAdapter.get().getUserName(), userPageString + "\n", summary);
+                    }
+                    throw new RuntimeException("Failed to nominate for deletion");
+                });
     }
 
     private boolean showDeletionNotification(Context context, Media media, boolean result) {
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
@@ -8,9 +8,10 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
+import android.widget.Toast;
+
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
-import android.widget.Toast;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -229,20 +230,7 @@ private void uploadContribution(Contribution contribution) {
                 contribution
         );
 
-        Single.fromCallable(() -> {
-            if (!mwApi.validateLogin()) {
-                // Need to revalidate!
-                if (sessionManager.revalidateAuthToken()) {
-                    Timber.d("Successfully revalidated token!");
-                } else {
-                    Timber.d("Unable to revalidate :(");
-                    stopForeground(true);
-                    sessionManager.forceLogin(UploadService.this);
-                    throw new RuntimeException(getString(R.string.authentication_failed));
-                }
-            }
-            return "Temp_" + contribution.hashCode() + filename;
-        }).flatMap(stashFilename -> mwApi.uploadFile(
+        Single.fromCallable(() -> "Temp_" + contribution.hashCode() + filename).flatMap(stashFilename -> mwApi.uploadFile(
                 stashFilename, fileInputStream, contribution.getDataLength(),
                 localUri, contribution.getContentProviderUri(), notificationUpdater))
                 .subscribeOn(Schedulers.io())

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,6 @@ protected void onResume() {`
`212`	`212`	`&& sessionManager.isUserLoggedIn()`
`213`	`213`	`&& sessionManager.getCachedAuthCookie() != null) {`
`214`	`214`	`applicationKvStore.putBoolean("login_skipped", false);`
`215`		`- sessionManager.revalidateAuthToken();`
`216`	`215`	`startMainActivity();`
`217`	`216`	`}`
`218`	`217`