Fix For Categories

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

@@ -29,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)
+            }
         }
     }
 
@@ -45,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)
+            }
         }
     }
 
@@ -85,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)
+            }
         }
     }
 

app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesContract.java

@@ -56,6 +56,12 @@ interface View {
          * Refreshes the categories
          */
         void refreshCategories();
+
+
+        /**
+         * Navigate the user to Login Activity
+         */
+        void navigateToLoginScreen();
     }
 
     interface UserActionListener extends BasePresenter<View> {

app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import fr.free.nrw.commons.Media
 import fr.free.nrw.commons.R
+import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException
 import fr.free.nrw.commons.category.CategoryEditHelper
 import fr.free.nrw.commons.category.CategoryItem
 import fr.free.nrw.commons.di.CommonsApplicationModule
@@ -223,12 +224,16 @@ class CategoriesPresenter @Inject constructor(
                             view.dismissProgressDialog()
                             view.refreshCategories()
                             view.goBackToPreviousScreen()
+                        }, { error ->
+                            if (error is InvalidLoginTokenException) {
+                                view.navigateToLoginScreen();
+                            } else {
+                                Timber.e(
+                                    "Failed to update categories"
+                                )
+                            }
                         })
-                        {
-                            Timber.e(
-                                "Failed to update categories"
-                            )
-                        }
+
                 )
 
             }

app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java

@@ -19,8 +19,10 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import com.jakewharton.rxbinding2.view.RxView;
 import com.jakewharton.rxbinding2.widget.RxTextView;
+import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.category.CategoryItem;
 import fr.free.nrw.commons.contributions.ContributionsFragment;
 import fr.free.nrw.commons.databinding.UploadCategoriesFragmentBinding;
@@ -41,6 +43,8 @@ public class UploadCategoriesFragment extends UploadBaseFragment implements Cate
 
     @Inject
     CategoriesContract.UserActionListener presenter;
+    @Inject
+    SessionManager sessionManager;
     private UploadCategoryAdapter adapter;
     private Disposable subscribe;
     /**
@@ -295,6 +299,22 @@ public void refreshCategories() {
         mediaDetailFragment.updateCategories();
     }
 
+    /**
+     *
+     */
+    @Override
+    public void navigateToLoginScreen() {
+        final String username = sessionManager.getUserName();
+        final CommonsApplication.BaseLogoutListener logoutListener = new CommonsApplication.BaseLogoutListener(
+            getActivity(),
+            requireActivity().getString(R.string.invalid_login_message),
+            username
+        );
+
+        CommonsApplication.getInstance().clearApplicationData(
+            requireActivity(), logoutListener);
+    }
+
     public void onNextButtonClicked() {
         if (media != null) {
             presenter.updateCategories(media, wikiText);