Fix - No Precise Error Message After Error Due to Password Change

app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.java

@@ -30,9 +30,13 @@
 import androidx.core.content.ContextCompat;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import fr.free.nrw.commons.CameraPosition;
+import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.auth.SessionManager;
+import fr.free.nrw.commons.auth.csrf.CsrfTokenClient;
+import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException;
 import fr.free.nrw.commons.coordinates.CoordinateEditHelper;
 import fr.free.nrw.commons.filepicker.Constants;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
@@ -136,6 +140,8 @@ public class LocationPickerActivity extends BaseActivity implements
 
     @Inject
     LocationServiceManager locationManager;
+    @Inject
+    SessionManager sessionManager;
 
     /**
      * Constants
@@ -366,13 +372,29 @@ public void updateCoordinates(final String Latitude, final String Longitude,
         if (media == null) {
             return;
         }
-        compositeDisposable.add(coordinateEditHelper.makeCoordinatesEdit(getApplicationContext(),media,
-                Latitude, Longitude, Accuracy)
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(s -> {
-                Timber.d("Coordinates are added.");
-            }));
+
+        try {
+            compositeDisposable.add(
+                coordinateEditHelper.makeCoordinatesEdit(getApplicationContext(), media,
+                        Latitude, Longitude, Accuracy)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(s -> {
+                            Timber.d("Coordinates are added.");
+                        }));
+        } catch (Exception e) {
+            if (e.getLocalizedMessage().equals(CsrfTokenClient.ANONYMOUS_TOKEN_MESSAGE)) {
+                final String username = sessionManager.getUserName();
+                final CommonsApplication.BaseLogoutListener logoutListener = new CommonsApplication.BaseLogoutListener(
+                    this,
+                    getString(R.string.invalid_login_message),
+                    username
+                );
+
+                CommonsApplication.getInstance().clearApplicationData(
+                    this, logoutListener);
+            }
+        }
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.actions
 
+import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException
 import io.reactivex.Observable
 import io.reactivex.Single
 import fr.free.nrw.commons.auth.csrf.CsrfTokenClient
@@ -28,7 +29,11 @@ class PageEditClient(
             pageEditInterface.postEdit(pageTitle, summary, text, csrfTokenClient.getTokenBlocking())
                 .map { editResponse -> editResponse.edit()!!.editSucceeded() }
         } catch (throwable: Throwable) {
-            Observable.just(false)
+            if (throwable is InvalidLoginTokenException) {
+                throw throwable
+            } else {
+                Observable.just(false)
+            }
         }
     }
 
@@ -44,7 +49,11 @@ class PageEditClient(
             pageEditInterface.postAppendEdit(pageTitle, summary, appendText, csrfTokenClient.getTokenBlocking())
                 .map { editResponse -> editResponse.edit()!!.editSucceeded() }
         } catch (throwable: Throwable) {
-            Observable.just(false)
+            if (throwable is InvalidLoginTokenException) {
+                throw throwable
+            } else {
+                Observable.just(false)
+            }
         }
     }
 
@@ -58,12 +67,17 @@ class PageEditClient(
     fun prependEdit(pageTitle: String, prependText: String, summary: String): Observable<Boolean> {
         return try {
             pageEditInterface.postPrependEdit(pageTitle, summary, prependText, csrfTokenClient.getTokenBlocking())
-                .map { editResponse -> editResponse.edit()!!.editSucceeded() }
+                .map { editResponse -> editResponse.edit()?.editSucceeded() ?: false }
         } catch (throwable: Throwable) {
-            Observable.just(false)
+            if (throwable is InvalidLoginTokenException) {
+                throw throwable
+            } else {
+                Observable.just(false)
+            }
         }
     }
 
+
     /**
      * Set new labels to Wikibase server of commons
      * @param summary   Edit summary
@@ -79,7 +93,11 @@ class PageEditClient(
                 value, csrfTokenClient.getTokenBlocking()
             ).map { it.success }
         } catch (throwable: Throwable) {
-            Observable.just(0)
+            if (throwable is InvalidLoginTokenException) {
+                throw throwable
+            } else {
+                Observable.just(0)
+            }
         }
     }
 
@@ -93,4 +111,4 @@ class PageEditClient(
             it.query()?.pages()?.get(0)?.revisions()?.get(0)?.content()
         }
     }
-}
+}

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

@@ -4,6 +4,8 @@ import fr.free.nrw.commons.CommonsApplication
 import fr.free.nrw.commons.di.NetworkingModule.NAMED_COMMONS_CSRF
 import io.reactivex.Observable
 import fr.free.nrw.commons.auth.csrf.CsrfTokenClient
+import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException
+import fr.free.nrw.commons.auth.login.LoginFailedException
 import javax.inject.Inject
 import javax.inject.Named
 import javax.inject.Singleton
@@ -32,8 +34,15 @@ class ThanksClient @Inject constructor(
             ).map {
                 mwThankPostResponse -> mwThankPostResponse.result?.success == 1
             }
-        } catch (throwable: Throwable) {
-            Observable.just(false)
+        }
+        catch (throwable: Throwable) {
+            if (throwable is InvalidLoginTokenException) {
+                Observable.error(throwable)
+            }
+            else {
+                Observable.just(false)
+            }
         }
     }
-}
+
+}

app/src/main/java/fr/free/nrw/commons/auth/csrf/CsrfTokenClient.kt

@@ -48,16 +48,19 @@ class CsrfTokenClient(
 
                 token = response.body()!!.query()!!.csrfToken()!!
                 if (sessionManager.isUserLoggedIn && token == ANON_TOKEN) {
-                    throw RuntimeException("App believes we're logged in, but got anonymous token.")
+                    throw InvalidLoginTokenException(ANONYMOUS_TOKEN_MESSAGE)
                 }
                 break
-            } catch (t: Throwable) {
+            } catch (e: LoginFailedException) {
+               throw InvalidLoginTokenException(ANONYMOUS_TOKEN_MESSAGE)
+            }
+            catch (t: Throwable) {
                 Timber.w(t)
             }
         }
 
         if (token.isEmpty() || token == ANON_TOKEN) {
-            throw IOException(INVALID_TOKEN_ERROR_MESSAGE)
+            throw InvalidLoginTokenException(ANONYMOUS_TOKEN_MESSAGE)
         }
         return token
     }
@@ -68,7 +71,7 @@ class CsrfTokenClient(
             override fun success(token: String?) {
                 if (sessionManager.isUserLoggedIn && token == ANON_TOKEN) {
                     retryWithLogin(cb) {
-                        RuntimeException("App believes we're logged in, but got anonymous token.")
+                        InvalidLoginTokenException(ANONYMOUS_TOKEN_MESSAGE)
                     }
                 } else {
                     cb.success(token)
@@ -161,5 +164,8 @@ class CsrfTokenClient(
         private const val MAX_RETRIES = 1
         private const val MAX_RETRIES_OF_LOGIN_BLOCKING = 2
         const val INVALID_TOKEN_ERROR_MESSAGE = "Invalid token, or login failure."
+        const val ANONYMOUS_TOKEN_MESSAGE = "App believes we're logged in, but got anonymous token."
     }
 }
+class InvalidLoginTokenException(message: String) : Exception(message)
+

app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java

@@ -13,6 +13,7 @@
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.actions.PageEditClient;
+import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException;
 import fr.free.nrw.commons.notification.NotificationHelper;
 import fr.free.nrw.commons.review.ReviewController;
 import fr.free.nrw.commons.utils.ViewUtilWrapper;
@@ -66,7 +67,13 @@ public Single<Boolean> makeDeletion(Context context, Media media, String reason)
 
         return delete(media, reason)
                 .flatMapSingle(result -> Single.just(showDeletionNotification(context, media, result)))
-                .firstOrError();
+                .firstOrError()
+                .onErrorResumeNext(throwable -> {
+                    if (throwable instanceof InvalidLoginTokenException) {
+                        return Single.error(throwable);
+                    }
+                    return Single.error(throwable);
+                });
     }
 
     /**
@@ -104,22 +111,30 @@ private Observable<Boolean> delete(Media media, String reason) {
         }
 
         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:" + creator, userPageString + "\n", summary);
-                    }
-                    throw new RuntimeException("Failed to nominate for deletion");
-                });
+            .onErrorResumeNext(throwable -> {
+                if (throwable instanceof InvalidLoginTokenException) {
+                    return Observable.error(throwable);
+                }
+                return Observable.error(throwable);
+            })
+            .flatMap(result -> {
+                if (result) {
+                    return pageEditClient.edit("Commons:Deletion_requests/" + media.getFilename(), subpageString + "\n", summary);
+                }
+                return Observable.error(new RuntimeException("Failed to nominate for deletion"));
+            })
+            .flatMap(result -> {
+                if (result) {
+                    return pageEditClient.appendEdit("Commons:Deletion_requests/" + date, logPageString + "\n", summary);
+                }
+                return Observable.error(new RuntimeException("Failed to nominate for deletion"));
+            })
+            .flatMap(result -> {
+                if (result) {
+                    return pageEditClient.appendEdit("User_Talk:" + creator, userPageString + "\n", summary);
+                }
+                return Observable.error(new RuntimeException("Failed to nominate for deletion"));
+            });
     }
 
     private boolean showDeletionNotification(Context context, Media media, boolean result) {
@@ -226,14 +241,15 @@ public void askReasonAndExecute(Media media,
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(aBoolean -> {
-                    if (aBoolean) {
-                        reviewCallback.onSuccess();
+                    reviewCallback.onSuccess();
+                }, throwable -> {
+                    if (throwable instanceof InvalidLoginTokenException) {
+                        reviewCallback.onTokenException((InvalidLoginTokenException) throwable);
                     } else {
                         reviewCallback.onFailure();
                     }
                     reviewCallback.enableButtons();
                 });
-
         });
         alert.setNegativeButton(context.getString(R.string.cancel), (dialog, which) -> reviewCallback.onFailure());
         d = alert.create();