Update contributor list in README.md

* Part of issue #5996: Fix IDE warnings in ContributionsListFragment (naming, null-safety, deprecations)

* Part of issue #5996: Clean final IDE warnings (parameter name alignment, remove redundant toggle)

---------

Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,7 +1,7 @@
 name: "\U0001F41E Bug report"
 description: Create a report to help us improve.
 title: "[Bug]: "
-labels: ["bug"]
+type: Bug  # Retained to categorize the issue as per organization-level type
 body:
   - type: markdown
     attributes:
@@ -70,7 +70,7 @@ body:
       required: false
   - type: textarea
     attributes:
-      label: Screen-shots
+      label: Screenshots
       description: Add screenshots related to the issue (if available). Can be created by pressing the Volume Down and Power Button at the same time on Android 4.0 and higher.
     validations:
       required: false

.github/workflows/android.yml

@@ -12,17 +12,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
 
       - name: Cache packages
         id: cache-packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -37,7 +37,7 @@ jobs:
 
       - name: AVD cache
         if: github.event_name != 'pull_request'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: avd-cache
         with:
           path: |
@@ -89,7 +89,7 @@ jobs:
         run: bash ./gradlew assembleBetaDebug --stacktrace
 
       - name: Upload betaDebug APK
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: betaDebugAPK
           path: app/build/outputs/apk/beta/debug/app-*.apk
@@ -98,7 +98,17 @@ jobs:
         run: bash ./gradlew assembleProdDebug --stacktrace
 
       - name: Upload prodDebug APK
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: prodDebugAPK
           path: app/build/outputs/apk/prod/debug/app-*.apk
+
+      - name: Create and PR number artifact
+        run: |
+          echo "{\"pr_number\": ${{ github.event.pull_request.number || 'null' }}}" > pr_number.json
+          
+      - name: Upload PR number artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: pr_number
+          path: ./pr_number.json

.github/workflows/build-beta.yml

@@ -0,0 +1,41 @@
+name: Build beta only
+
+on: [workflow_dispatch]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Access test login credentials
+      run: |
+        echo "TEST_USER_NAME=${{ secrets.TEST_USER_NAME }}" >> local.properties
+        echo "TEST_USER_PASSWORD=${{ secrets.TEST_USER_PASSWORD }}" >> local.properties
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Set env
+      run: echo "COMMIT_SHA=$(git log -n 1 --format='%h')" >> $GITHUB_ENV
+
+    - name: Generate betaDebug APK
+      run: ./gradlew assembleBetaDebug --stacktrace
+
+    - name: Rename betaDebug APK
+      run: mv app/build/outputs/apk/beta/debug/app-*.apk app/build/outputs/apk/beta/debug/apps-android-commons-betaDebug-$COMMIT_SHA.apk
+
+    - name: Upload betaDebug APK
+      uses: actions/upload-artifact@v4
+      with:
+        name: apps-android-commons-betaDebugAPK-${{ env.COMMIT_SHA }}
+        path: app/build/outputs/apk/beta/debug/*.apk
+        retention-days: 30

.github/workflows/comment_artifacts_on_PR.yml

@@ -0,0 +1,96 @@
+name: Comment Artifacts on PR
+
+on:
+  workflow_run:
+    workflows: [ "Android CI" ]
+    types: [ completed ]
+
+permissions:
+  pull-requests: write
+  contents: read
+
+concurrency:
+  group: comment-${{ github.event.workflow_run.id }}
+  cancel-in-progress: true
+
+jobs:
+  comment:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request' }}
+    steps:
+      - name: Download and process artifacts
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const fs = require('fs');
+            const runId = context.payload.workflow_run.id;
+
+            const allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: runId,
+            });
+
+            const prNumberArtifact = allArtifacts.data.artifacts.find(artifact => artifact.name === "pr_number");
+            if (!prNumberArtifact) {
+              console.log("pr_number artifact not found.");
+              return;
+            }
+
+            const download = await github.rest.actions.downloadArtifact({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              artifact_id: prNumberArtifact.id,
+              archive_format: 'zip',
+            });
+
+            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/pr_number.zip`, Buffer.from(download.data));
+            const { execSync } = require('child_process');
+            execSync('unzip -q pr_number.zip -d ./pr_number/');
+            fs.unlinkSync('pr_number.zip');
+
+            const prData = JSON.parse(fs.readFileSync('./pr_number/pr_number.json', 'utf8'));
+            const prNumber = prData.pr_number;
+
+            if (!prNumber || prNumber === 'null') {
+              console.log("No valid PR number found in pr_number.json. Skipping.");
+              return;
+            }
+
+            const artifactsToLink = allArtifacts.data.artifacts.filter(artifact => artifact.name !== "pr_number");
+            if (artifactsToLink.length === 0) {
+              console.log("No artifacts to link found.");
+              return;
+            }
+
+            const comments = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: Number(prNumber),
+            });
+            
+            const oldComments = comments.data.filter(comment => 
+              comment.body.startsWith("✅ Generated APK variants!")
+            );
+            for (const comment of oldComments) {
+              await github.rest.issues.deleteComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: comment.id,
+              });
+              console.log(`Deleted old comment ID: ${comment.id}`);
+            };
+            
+            const commentBody = `✅ Generated APK variants!\n` + 
+            artifactsToLink.map(artifact => {
+                const artifactUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${runId}/artifacts/${artifact.id}`;
+                return `- 🤖 [Download ${artifact.name}](${artifactUrl})`;
+            }).join('\n');
+
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: Number(prNumber),
+              body: commentBody
+            });

.gitignore

@@ -46,4 +46,5 @@ captures/*
 
 # Test and other output
 app/jacoco.exec
-app/CommonsContributions
+app/CommonsContributions
+app/.*

.idea/codeStyles/Project.xml

@@ -16,6 +16,7 @@
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
           <package name="" withSubpackages="true" static="true" />
           <emptyLine />
           <package name="" withSubpackages="true" static="false" />

.idea/inspectionProfiles/Project_Default.xml

@@ -1,16 +1,36 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="AndroidLintNewerVersionAvailable" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ClassWithOnlyPrivateConstructors" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="ConfusingElse" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="reportWhenNoStatementFollow" value="true" />
     </inspection_tool>
     <inspection_tool class="ControlFlowStatementWithoutBraces" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="DefaultNotLastCaseInSwitch" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ExplicitThis" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="FieldMayBeFinal" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="LocalCanBeFinal" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="REPORT_VARIABLES" value="true" />
       <option name="REPORT_PARAMETERS" value="true" />
@@ -24,14 +44,33 @@
     <inspection_tool class="OverlyStrongTypeCast" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreInMatchingInstanceof" value="false" />
     </inspection_tool>
+    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewParameterProviderOnFirstParameter" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="ProblematicWhitespace" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ProtectedMemberInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="RedundantFieldInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="RedundantImplements" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreSerializable" value="false" />
       <option name="ignoreCloneable" value="false" />
     </inspection_tool>
-    <inspection_tool class="RedundantMethodOverride" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SimplifiableEqualsExpression" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="TypeParameterExtendsFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnnecessarilyQualifiedStaticUsage" enabled="true" level="WARNING" enabled_by_default="true">
@@ -47,6 +86,5 @@
     <inspection_tool class="UnnecessaryQualifierForThis" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnnecessarySuperConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnnecessaryThis" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessaryToStringCall" enabled="true" level="WARNING" enabled_by_default="true" />
   </profile>
 </component>

CHANGELOG.md

@@ -1,5 +1,90 @@
 # Wikimedia Commons for Android
 
+## v6.0.2
+
+### What's changed
+* Addressed a bug that prevented the keyboard from appearing in various text fields, such as on the upload wizard
+* Links in the "File usages" list are now clickable and will take you to the correct page.
+* Titles for file usages are now clearer and easier to understand
+* Bug fixes and stability improvements
+
+## v6.0.1
+
+### What's changed
+* The app now supports Android 15 with an improved user interface
+* Enhanced Nearby with robust and more reliable labels
+* Bug fixes and stability improvements
+
+## v5.6.1
+
+### What's changed
+* The app no longer uploads images to Wikidata if one exists already for a given item
+* File usage displays correctly now
+* No more infinite circular progress bar on nominating an image for deletion
+* Enhanced location updates while using GPS
+* Author/uploader names are now available in Media Details for Commons licensing compliance
+* Improved usage of popups in Nearby
+* Bug fixes and stability improvements 
+
+## v5.5.0
+
+### What's changed
+* Explore images will now be shown based on the map location and not at your current location
+* Enhanced Wikidata feedback message
+* Green labels in Explore map will no longer be hidden by other pins thumbnails
+* Upload wizard's language drop-down now reflects the language used in the pin label
+* Users can now pick only one image at a time while using the custom selector
+* Bug fixes and stability improvements 
+
+## v5.4.1
+
+### What's changed
+* Custom picker now detects images that are already available on Commons
+* Improve credit line in image list
+* Show place cards with loaded names only in the Nearby list
+* Fix the error that occurs while loading images in Explore
+
+## v5.3.0
+
+### What's changed
+* Enable EmailAuth support
+* Explore map images no longer show "Unknown"
+* Fix crash when removing last two images of multiupload
+* Mark ❌ for closed locations (P3999) in Nearby
+* Fix two pin labels staying visible at the same time in Explore map
+* Refactoring and minor UI improvements
+
+## v5.2.0
+
+v5.2.0 boasts several new functionalities like:
+
+* A new refresh button lets you quickly reload the Nearby map
+* Bookmarks now support categories
+* Improved feedback and consistency in the user interface
+* Bug fixes and performance improvements
+
+### What's changed
+* Implement "Refresh" button to clear the cache and reload the Nearby map.
+* `CommonsApplication` migrate to kotlin & some lint fixes.
+* Revert back to MainScope for database and UI updates and make database operations thread safe.
+* Hide edit options for logged-out users in Explore screen.
+* Introduced a button to delete the current folder in custom selector.
+* Improve Unique File Name Search.
+* Migration of several modules from Java to Kotlin.
+* Fix modification on bottom sheet's data when coming from Nearby Banner and clicked on other pins.
+* Bug fixes and enhancement of Achievements screen.
+* Show where file is being used on Commons and other wikis.
+* Migrate android.media.ExifInterface to androidx.exifinterface.media.ExifInterface as android.media.ExifInterface had security flaws on older devices.
+* Make dialogs modal and always show the upload icon.
+* Fix unintentional deletion of subfolders and non-images by custom selector.
+* Bookmark categories.
+* Add pull down to refresh in the Contributions screen.
+* Fix race condition and lag when loading pin details, faster overlay management.
+* Show cached pins in Nearby even when internet is unavailable
+
+ Full changelog with the list of contributors: [`v5.1.2...v5.2.0`](https://github.com/commons-app/apps-android-commons/compare/v5.1.2...v5.2.0).
+
+
 ## v5.1.2
 
 ### What's changed

README.md

@@ -1,6 +1,6 @@
 # Wikimedia Commons Android app
 ![GitHub issue custom search](https://img.shields.io/github/issues-search?label=%22good%20first%20issue%22%20issues&query=repo%3Acommons-app%2Fapps-android-commons%20is%3Aissue%20is%3Aopen%20label%3A%22good%20first%20issue%22)
-[![Build status](https://github.com/commons-app/apps-android-commons/actions/workflows/android.yml/badge.svg?branch=master)](https://github.com/commons-app/apps-android-commons/actions?query=branch%3Amaster)
+[![Build status](https://github.com/commons-app/apps-android-commons/actions/workflows/android.yml/badge.svg?branch=main)](https://github.com/commons-app/apps-android-commons/actions?query=branch%3Amain)
 [![Preview the app](https://img.shields.io/badge/Preview-Appetize.io-orange.svg)](https://appetize.io/app/8ywtpe9f8tb8h6bey11c92vkcw)
 [![codecov](https://codecov.io/gh/commons-app/apps-android-commons/branch/master/graph/badge.svg)](https://codecov.io/gh/commons-app/apps-android-commons)
 
@@ -29,11 +29,12 @@ Thank you all for your work!
 
 | [<img src="https://avatars.githubusercontent.com/u/3611199?v=4" width="100px;"/><br /><sub><b>misaochan</b></sub>](https://github.com/misaochan) | [<img src="https://avatars.githubusercontent.com/u/24829418?v=4" width="100px;"/><br /><sub><b>translatewiki</b></sub>](https://github.com/translatewiki) | [<img src="https://avatars.githubusercontent.com/u/3127881?v=4" width="100px;"/><br /><sub><b>neslihanturan</b></sub>](https://github.com/neslihanturan) | [<img src="https://avatars.githubusercontent.com/u/30430?v=4" width="100px;"/><br /><sub><b>yuvipanda</b></sub>](https://github.com/yuvipanda) | [<img src="https://avatars.githubusercontent.com/u/99590?v=4" width="100px;"/><br /><sub><b>nicolas-raoul</b></sub>](https://github.com/nicolas-raoul) |
 | :---: | :---: | :---: | :---: | :---: |
-| [<img src="https://avatars.githubusercontent.com/u/4953590?v=4" width="100px;"/><br /><sub><b>domdomegg</b></sub>](https://github.com/domdomegg) | [<img src="https://avatars.githubusercontent.com/u/3069373?v=4" width="100px;"/><br /><sub><b>maskaravivek</b></sub>](https://github.com/maskaravivek) | [<img src="https://avatars.githubusercontent.com/u/407647?v=4" width="100px;"/><br /><sub><b>psh</b></sub>](https://github.com/psh) | [<img src="https://avatars.githubusercontent.com/u/30932899?v=4" width="100px;"/><br /><sub><b>madhurgupta10</b></sub>](https://github.com/madhurgupta10) | [<img src="https://avatars.githubusercontent.com/u/17375274?v=4" width="100px;"/><br /><sub><b>ashishkumar468</b></sub>](https://github.com/ashishkumar468) |
-| [<img src="https://avatars.githubusercontent.com/u/103075?v=4" width="100px;"/><br /><sub><b>bvibber</b></sub>](https://github.com/bvibber) | [<img src="https://avatars.githubusercontent.com/u/10674?v=4" width="100px;"/><br /><sub><b>whym</b></sub>](https://github.com/whym) | [<img src="https://avatars.githubusercontent.com/u/10153800?v=4" width="100px;"/><br /><sub><b>akaita</b></sub>](https://github.com/akaita) | [<img src="https://avatars.githubusercontent.com/u/6900601?v=4" width="100px;"/><br /><sub><b>veyndan</b></sub>](https://github.com/veyndan) | [<img src="https://avatars.githubusercontent.com/u/19607555?v=4" width="100px;"/><br /><sub><b>ujjwalagrawal17</b></sub>](https://github.com/ujjwalagrawal17) |
-| [<img src="https://avatars.githubusercontent.com/u/3358282?v=4" width="100px;"/><br /><sub><b>macgills</b></sub>](https://github.com/macgills) | [<img src="https://avatars.githubusercontent.com/u/1682214?v=4" width="100px;"/><br /><sub><b>dbrant</b></sub>](https://github.com/dbrant) | [<img src="https://avatars.githubusercontent.com/u/34261945?v=4" width="100px;"/><br /><sub><b>vanshikaarora</b></sub>](https://github.com/vanshikaarora) | [<img src="https://avatars.githubusercontent.com/u/12448084?v=4" width="100px;"/><br /><sub><b>sivaraam</b></sub>](https://github.com/sivaraam) | [<img src="https://avatars.githubusercontent.com/u/71203077?v=4" width="100px;"/><br /><sub><b>Ayan-10</b></sub>](https://github.com/Ayan-10) |
-| [<img src="https://avatars.githubusercontent.com/u/126143257?v=4" width="100px;"/><br /><sub><b>shashankiitbhu</b></sub>](https://github.com/shashankiitbhu) | [<img src="https://avatars.githubusercontent.com/u/54663429?v=4" width="100px;"/><br /><sub><b>Pratham2305</b></sub>](https://github.com/Pratham2305) | [<img src="https://avatars.githubusercontent.com/u/1345681?v=4" width="100px;"/><br /><sub><b>sandarumk</b></sub>](https://github.com/sandarumk) | [<img src="https://avatars.githubusercontent.com/u/29161745?v=4" width="100px;"/><br /><sub><b>tanvidadu</b></sub>](https://github.com/tanvidadu) | [<img src="https://avatars.githubusercontent.com/u/39745544?v=4" width="100px;"/><br /><sub><b>cypherop</b></sub>](https://github.com/cypherop) |
-| [<img src="https://avatars.githubusercontent.com/u/65972015?v=4" width="100px;"/><br /><sub><b>Prince-kushwaha</b></sub>](https://github.com/Prince-kushwaha) | [<img src="https://avatars.githubusercontent.com/u/6953323?v=4" width="100px;"/><br /><sub><b>tobias47n9e</b></sub>](https://github.com/tobias47n9e) | [<img src="https://avatars.githubusercontent.com/u/54016427?v=4" width="100px;"/><br /><sub><b>4D17Y4</b></sub>](https://github.com/4D17Y4) | [<img src="https://avatars.githubusercontent.com/u/25305892?v=4" width="100px;"/><br /><sub><b>hismaeel</b></sub>](https://github.com/hismaeel) | [<img src="https://avatars.githubusercontent.com/u/12574756?v=4" width="100px;"/><br /><sub><b>tshradheya</b></sub>](https://github.com/tshradheya) |
+| [<img src="https://avatars.githubusercontent.com/u/407647?v=4" width="100px;"/><br /><sub><b>psh</b></sub>](https://github.com/psh) | [<img src="https://avatars.githubusercontent.com/u/4953590?v=4" width="100px;"/><br /><sub><b>domdomegg</b></sub>](https://github.com/domdomegg) | [<img src="https://avatars.githubusercontent.com/u/3069373?v=4" width="100px;"/><br /><sub><b>maskaravivek</b></sub>](https://github.com/maskaravivek) | [<img src="https://avatars.githubusercontent.com/u/30932899?v=4" width="100px;"/><br /><sub><b>madhurgupta10</b></sub>](https://github.com/madhurgupta10) | [<img src="https://avatars.githubusercontent.com/u/17375274?v=4" width="100px;"/><br /><sub><b>ashishkumar468</b></sub>](https://github.com/ashishkumar468) |
+| [<img src="https://avatars.githubusercontent.com/u/103075?v=4" width="100px;"/><br /><sub><b>bvibber</b></sub>](https://github.com/bvibber) | [<img src="https://avatars.githubusercontent.com/u/10674?v=4" width="100px;"/><br /><sub><b>whym</b></sub>](https://github.com/whym) | [<img src="https://avatars.githubusercontent.com/u/10153800?v=4" width="100px;"/><br /><sub><b>akaita</b></sub>](https://github.com/akaita) | [<img src="https://avatars.githubusercontent.com/u/12448084?v=4" width="100px;"/><br /><sub><b>sivaraam</b></sub>](https://github.com/sivaraam) | [<img src="https://avatars.githubusercontent.com/u/6900601?v=4" width="100px;"/><br /><sub><b>veyndan</b></sub>](https://github.com/veyndan) |
+| [<img src="https://avatars.githubusercontent.com/u/19607555?v=4" width="100px;"/><br /><sub><b>ujjwalagrawal17</b></sub>](https://github.com/ujjwalagrawal17) | [<img src="https://avatars.githubusercontent.com/u/3358282?v=4" width="100px;"/><br /><sub><b>macgills</b></sub>](https://github.com/macgills) | [<img src="https://avatars.githubusercontent.com/u/346271?v=4" width="100px;"/><br /><sub><b>amire80</b></sub>](https://github.com/amire80) | [<img src="https://avatars.githubusercontent.com/u/1682214?v=4" width="100px;"/><br /><sub><b>dbrant</b></sub>](https://github.com/dbrant) | [<img src="https://avatars.githubusercontent.com/u/34261945?v=4" width="100px;"/><br /><sub><b>vanshikaarora</b></sub>](https://github.com/vanshikaarora) |
+| [<img src="https://avatars.githubusercontent.com/u/83745993?v=4" width="100px;"/><br /><sub><b>RitikaPahwa4444</b></sub>](https://github.com/RitikaPahwa4444) | [<img src="https://avatars.githubusercontent.com/u/71203077?v=4" width="100px;"/><br /><sub><b>Ayan-10</b></sub>](https://github.com/Ayan-10) | [<img src="https://avatars.githubusercontent.com/u/101377978?v=4" width="100px;"/><br /><sub><b>rohit9625</b></sub>](https://github.com/rohit9625) | [<img src="https://avatars.githubusercontent.com/u/126143257?v=4" width="100px;"/><br /><sub><b>shashankiitbhu</b></sub>](https://github.com/shashankiitbhu) | [<img src="https://avatars.githubusercontent.com/u/54663429?v=4" width="100px;"/><br /><sub><b>Pratham2305</b></sub>](https://github.com/Pratham2305) |
+| [<img src="https://avatars.githubusercontent.com/u/111801812?v=4" width="100px;"/><br /><sub><b>parneet-guraya</b></sub>](https://github.com/parneet-guraya) | [<img src="https://avatars.githubusercontent.com/u/1345681?v=4" width="100px;"/><br /><sub><b>sandarumk</b></sub>](https://github.com/sandarumk) | [<img src="https://avatars.githubusercontent.com/u/29161745?v=4" width="100px;"/><br /><sub><b>tanvidadu</b></sub>](https://github.com/tanvidadu) | [<img src="https://avatars.githubusercontent.com/u/39745544?v=4" width="100px;"/><br /><sub><b>cypherop</b></sub>](https://github.com/cypherop) | [<img src="https://avatars.githubusercontent.com/u/65972015?v=4" width="100px;"/><br /><sub><b>Prince-kushwaha</b></sub>](https://github.com/Prince-kushwaha) |
+
 
 
 .. and [many more](https://github.com/commons-app/apps-android-commons/graphs/contributors).
@@ -45,7 +46,7 @@ This software is open source, licensed under the [Apache License 2.0][10].
 
 [1]: https://play.google.com/store/apps/details?id=fr.free.nrw.commons
 [2]: https://commons-app.github.io/
-[3]: https://github.com/commons-app/apps-android-commons/issues
+[3]: https://github.com/commons-app/apps-android-commons/issues?q=is%3Aopen+is%3Aissue+no%3Aassignee+-label%3Adebated+label%3Abug+-label%3A%22low+priority%22+-label%3Aupstream
 
 [4]: https://github.com/commons-app/commons-app-documentation/blob/master/android/README.md#-android-documentation
 [5]: https://github.com/commons-app/commons-app-documentation/blob/master/android/README.md#-user-documentation

app/build.gradle

@@ -1,419 +0,0 @@
-plugins {
-    id 'com.github.triplet.play' version '2.7.2' apply false
-}
-apply from: '../gitutils.gradle'
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-parcelize'
-apply from: "$rootDir/jacoco.gradle"
-
-def isRunningOnTravisAndIsNotPRBuild = System.getenv("CI") == "true" && file('../play.p12').exists()
-
-if (isRunningOnTravisAndIsNotPRBuild) {
-    apply plugin: 'com.github.triplet.play'
-}
-
-dependencies {
-
-    // Utils
-    implementation 'in.yuvi:http.fluent:1.3'
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation ("com.squareup.okhttp3:okhttp:$OKHTTP_VERSION!!"){
-        // Forcing dependency versions using force = true on a first-level dependency has been deprecated.
-        //  Ref: https://docs.gradle.org/7.5/userguide/upgrading_version_5.html#forced_dependencies
-        //force = true //API 19 support
-    }
-    implementation 'com.squareup.retrofit2:retrofit:2.8.1'
-    implementation "com.squareup.retrofit2:converter-gson:2.8.1"
-    implementation "com.squareup.retrofit2:adapter-rxjava2:2.8.1"
-    implementation 'com.squareup.okio:okio:2.2.2'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.3'
-    implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
-    implementation 'com.jakewharton.rxbinding3:rxbinding-appcompat:3.0.0'
-    implementation 'com.jakewharton.rxbinding2:rxbinding-support-v4:2.1.1'
-    implementation 'com.jakewharton.rxbinding2:rxbinding-appcompat-v7:2.1.1'
-    implementation 'com.jakewharton.rxbinding2:rxbinding-design:2.1.1'
-    implementation 'com.facebook.fresco:fresco:1.13.0'
-    implementation 'org.apache.commons:commons-lang3:3.8.1'
-
-    // UI
-    implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
-    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
-    implementation 'com.github.pedrovgs:renderers:3.3.3'
-    implementation "org.maplibre.gl:android-sdk:$MAPLIBRE_VERSION"
-    implementation 'org.maplibre.gl:android-plugin-scalebar-v9:1.0.0'
-
-    implementation 'com.jakewharton.timber:timber:4.7.1'
-    implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
-    implementation "com.google.android.material:material:1.9.0"
-    implementation 'com.karumi:dexter:5.0.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-
-    // Jetpack Compose
-    def composeBom = platform('androidx.compose:compose-bom:2024.08.00')
-
-    implementation "androidx.activity:activity-compose:1.9.1"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.4"
-    implementation (composeBom)
-    implementation "androidx.compose.runtime:runtime"
-    implementation "androidx.compose.ui:ui"
-    implementation "androidx.compose.ui:ui-graphics"
-    implementation "androidx.compose.ui:ui-tooling"
-    implementation "androidx.compose.foundation:foundation"
-    implementation "androidx.compose.foundation:foundation-layout"
-    implementation "androidx.compose.material3:material3"
-    androidTestImplementation(composeBom)
-
-    implementation "com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:$ADAPTER_DELEGATES_VERSION"
-    implementation "com.hannesdorfmann:adapterdelegates4-pagination:$ADAPTER_DELEGATES_VERSION"
-    implementation "androidx.paging:paging-runtime-ktx:$PAGING_VERSION"
-    testImplementation "androidx.paging:paging-common-ktx:$PAGING_VERSION"
-    implementation "androidx.paging:paging-rxjava2-ktx:$PAGING_VERSION"
-    implementation "androidx.recyclerview:recyclerview:1.2.0-alpha02"
-    implementation "com.squareup.okhttp3:okhttp-ws:$OKHTTP_VERSION"
-
-    // Logging
-    implementation 'ch.acra:acra-dialog:5.8.4'
-    implementation 'ch.acra:acra-mail:5.8.4'
-    implementation 'org.slf4j:slf4j-api:1.7.25'
-    api('com.github.tony19:logback-android-classic:1.1.1-6') {
-        exclude group: 'com.google.android', module: 'android'
-    }
-    implementation "com.squareup.okhttp3:logging-interceptor:$OKHTTP_VERSION"
-
-    // Dependency injector
-    implementation "com.google.dagger:dagger-android:$DAGGER_VERSION"
-    implementation "com.google.dagger:dagger-android-support:$DAGGER_VERSION"
-    kapt "com.google.dagger:dagger-android-processor:$DAGGER_VERSION"
-    kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
-    annotationProcessor "com.google.dagger:dagger-android-processor:$DAGGER_VERSION"
-
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$KOTLIN_VERSION"
-
-    //Mocking
-    testImplementation("io.mockk:mockk:1.13.4")
-    testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
-    testImplementation 'org.mockito:mockito-inline:5.2.0'
-    testImplementation 'org.mockito:mockito-core:5.6.0'
-    testImplementation "org.powermock:powermock-module-junit4:2.0.9"
-    testImplementation "org.powermock:powermock-api-mockito2:2.0.9"
-
-    // Unit testing
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.11.1'
-    testImplementation 'androidx.test:core:1.5.0'
-    testImplementation "androidx.test:runner:1.5.2"
-    testImplementation 'androidx.test.ext:junit:1.1.5'
-    testImplementation "androidx.test:rules:1.5.0"
-    testImplementation "com.squareup.okhttp3:mockwebserver:$OKHTTP_VERSION"
-    testImplementation "com.jraska.livedata:testing-ktx:1.2.0"
-    testImplementation "androidx.arch.core:core-testing:2.2.0"
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.0"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.0"
-    testImplementation 'com.facebook.soloader:soloader:0.10.5'
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3"
-    debugImplementation("androidx.fragment:fragment-testing:1.6.2")
-    testImplementation "commons-io:commons-io:2.6"
-
-    // Android testing
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0-alpha04'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.0-alpha04'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test:rules:1.4.1-alpha04'
-    androidTestImplementation 'androidx.test:core:1.4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.annotation:annotation:1.3.0'
-    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.8.0'
-    androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
-    androidTestUtil 'androidx.test:orchestrator:1.4.1'
-
-    // Debugging
-    debugImplementation "com.squareup.leakcanary:leakcanary-android:$LEAK_CANARY_VERSION"
-
-    // Support libraries
-    implementation "com.google.android.material:material:1.1.0-alpha04"
-    implementation "androidx.browser:browser:1.3.0"
-    implementation "androidx.cardview:cardview:1.0.0"
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.exifinterface:exifinterface:1.3.7'
-    implementation "androidx.core:core-ktx:$CORE_KTX_VERSION"
-    implementation 'com.simplecityapps:recyclerview-fastscroll:2.0.1'
-
-    //swipe_layout
-    implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
-
-    //Room
-    implementation "androidx.room:room-runtime:$ROOM_VERSION"
-    implementation "androidx.room:room-ktx:$ROOM_VERSION"
-    implementation "androidx.room:room-rxjava2:$ROOM_VERSION"
-    kapt "androidx.room:room-compiler:$ROOM_VERSION"
-    // For Kotlin use kapt instead of annotationProcessor
-    testImplementation "androidx.arch.core:core-testing:2.1.0"
-
-    // Pref
-    // Java language implementation
-    implementation "androidx.preference:preference:$PREFERENCE_VERSION"
-    // Kotlin
-    implementation "androidx.preference:preference-ktx:$PREFERENCE_VERSION"
-    //Android Media
-    implementation 'com.github.juanitobananas:AndroidMediaUtil:v1.0-1'
-
-    implementation "androidx.multidex:multidex:$MULTIDEX_VERSION"
-
-    def work_version = "2.8.1"
-    // Kotlin + coroutines
-    implementation "androidx.work:work-runtime-ktx:$work_version"
-    implementation("androidx.work:work-runtime:$work_version")
-    testImplementation "androidx.work:work-testing:$work_version"
-
-    //Glide
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
-    kaptTest "androidx.databinding:databinding-compiler:8.0.2"
-    kaptAndroidTest "androidx.databinding:databinding-compiler:8.0.2"
-
-    implementation("io.github.coordinates2country:coordinates2country-android:1.8") {  exclude group: 'com.google.android', module: 'android' }
-
-    //OSMDroid
-    implementation ("org.osmdroid:osmdroid-android:$OSMDROID_VERSION")
-    constraints {
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
-            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
-        }
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
-            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
-        }
-    }
-}
-
-task disableAnimations(type: Exec) {
-    def adb = "$System.env.ANDROID_HOME/platform-tools/adb"
-    commandLine "$adb", 'shell', 'settings', 'put', 'global', 'window_animation_scale', '0'
-    commandLine "$adb", 'shell', 'settings', 'put', 'global', 'transition_animation_scale', '0'
-    commandLine "$adb", 'shell', 'settings', 'put', 'global', 'animator_duration_scale', '0'
-}
-
-project.gradle.taskGraph.whenReady {
-    connectedBetaDebugAndroidTest.dependsOn disableAnimations
-    connectedProdDebugAndroidTest.dependsOn disableAnimations
-}
-
-android {
-    compileSdkVersion 34
-
-    defaultConfig {
-        //applicationId 'fr.free.nrw.commons'
-
-        versionCode 1043
-        versionName '5.1.2'
-        setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
-
-        minSdkVersion 21
-        targetSdkVersion 34
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArguments clearPackageData: 'true'
-
-        multiDexEnabled true
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        vectorDrawables.useSupportLibrary = true
-    }
-    packagingOptions {
-        jniLibs {
-            excludes += ['META-INF/androidx.*']
-        }
-        resources {
-            excludes += ['META-INF/androidx.*', 'META-INF/proguard/androidx-annotations.pro', '/META-INF/LICENSE.md', '/META-INF/LICENSE-notice.md']
-        }
-    }
-
-
-    testOptions {
-        animationsDisabled true
-
-        unitTests {
-            returnDefaultValues = true
-            includeAndroidResources = true
-        }
-
-        unitTests.all {
-            jvmArgs '-noverify'
-        }
-    }
-
-    sourceSets {
-        // use kotlin only in tests (for now)
-        test.java.srcDirs += 'src/test/kotlin'
-
-        // use main assets and resources in test
-        test.assets.srcDirs += 'src/main/assets'
-        test.resources.srcDirs += 'src/main/resoures'
-    }
-
-    signingConfigs {
-        release
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-            testProguardFile 'test-proguard-rules.txt'
-            signingConfig signingConfigs.debug
-            if (isRunningOnTravisAndIsNotPRBuild) {
-                signingConfig signingConfigs.release
-            }
-        }
-        debug {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-            testProguardFile 'test-proguard-rules.txt'
-            versionNameSuffix "-debug-" + getBranchName()
-            enableUnitTestCoverage true
-            enableAndroidTestCoverage true
-        }
-    }
-
-    if (isRunningOnTravisAndIsNotPRBuild) {
-        // configure keystore based on env vars in Travis for automated alpha builds
-        signingConfigs.release.storeFile = file("../nr-commons.keystore")
-        signingConfigs.release.storePassword = System.getenv("keystore_password")
-        signingConfigs.release.keyAlias = System.getenv("key_alias")
-        signingConfigs.release.keyPassword = System.getenv("key_password")
-    }
-
-    configurations.all {
-        resolutionStrategy.force 'androidx.annotation:annotation:1.1.0'
-        resolutionStrategy.force 'com.jakewharton.timber:timber:4.7.1'
-        resolutionStrategy.force 'androidx.fragment:fragment:1.3.6'
-        exclude module: 'okhttp-ws'
-    }
-    flavorDimensions 'tier'
-    productFlavors {
-        prod {
-
-            applicationId 'fr.free.nrw.commons'
-
-            buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
-            buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.org/w/api.php\""
-            buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\""
-            buildConfigField "String", "WIKIDATA_URL", "\"https://www.wikidata.org\""
-            buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\""
-            buildConfigField "String", "WIKIMEDIA_CAMPAIGNS_URL", "\"https://raw.githubusercontent.com/commons-app/campaigns/master/campaigns.json\""
-            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://www.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\""
-            buildConfigField "String", "FORGOT_PASSWORD_URL", "\"https://commons.wikimedia.org/wiki/Special:PasswordReset\""
-            buildConfigField "String", "PRIVACY_POLICY_URL", "\"https://github.com/commons-app/commons-app-documentation/blob/master/android/Privacy-policy.md\""
-            buildConfigField "String", "ACCOUNT_TYPE", "\"fr.free.nrw.commons\""
-            buildConfigField "String", "CONTRIBUTION_AUTHORITY", "\"fr.free.nrw.commons.contributions.contentprovider\""
-            buildConfigField "String", "MODIFICATION_AUTHORITY", "\"fr.free.nrw.commons.modifications.contentprovider\""
-            buildConfigField "String", "CATEGORY_AUTHORITY", "\"fr.free.nrw.commons.categories.contentprovider\""
-            buildConfigField "String", "RECENT_SEARCH_AUTHORITY", "\"fr.free.nrw.commons.explore.recentsearches.contentprovider\""
-            buildConfigField "String", "RECENT_LANGUAGE_AUTHORITY", "\"fr.free.nrw.commons.recentlanguages.contentprovider\""
-            buildConfigField "String", "BOOKMARK_AUTHORITY", "\"fr.free.nrw.commons.bookmarks.contentprovider\""
-            buildConfigField "String", "BOOKMARK_LOCATIONS_AUTHORITY", "\"fr.free.nrw.commons.bookmarks.locations.contentprovider\""
-            buildConfigField "String", "BOOKMARK_ITEMS_AUTHORITY", "\"fr.free.nrw.commons.bookmarks.items.contentprovider\""
-            buildConfigField "String", "COMMIT_SHA", "\"" + getBuildVersion().toString() + "\""
-            buildConfigField "String", "TEST_USERNAME", "\"" + getTestUserName() + "\""
-            buildConfigField "String", "TEST_PASSWORD", "\"" + getTestPassword() + "\""
-            buildConfigField "String", "DEPICTS_PROPERTY", "\"P180\""
-            dimension 'tier'
-        }
-
-        beta {
-            applicationId 'fr.free.nrw.commons.beta'
-
-            // What values do we need to hit the BETA versions of the site / api ?
-            buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
-            buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.beta.wmflabs.org/w/api.php\""
-            buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\""
-            buildConfigField "String", "WIKIDATA_URL", "\"https://www.wikidata.org\""
-            buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\""
-            buildConfigField "String", "WIKIMEDIA_CAMPAIGNS_URL", "\"https://raw.githubusercontent.com/commons-app/campaigns/master/campaigns_beta_active.json\""
-            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://www.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\""
-            buildConfigField "String", "FORGOT_PASSWORD_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/Special:PasswordReset\""
-            buildConfigField "String", "PRIVACY_POLICY_URL", "\"https://github.com/commons-app/commons-app-documentation/blob/master/android/Privacy-policy.md\""
-            buildConfigField "String", "ACCOUNT_TYPE", "\"fr.free.nrw.commons.beta\""
-            buildConfigField "String", "CONTRIBUTION_AUTHORITY", "\"fr.free.nrw.commons.beta.contributions.contentprovider\""
-            buildConfigField "String", "MODIFICATION_AUTHORITY", "\"fr.free.nrw.commons.beta.modifications.contentprovider\""
-            buildConfigField "String", "CATEGORY_AUTHORITY", "\"fr.free.nrw.commons.beta.categories.contentprovider\""
-            buildConfigField "String", "RECENT_SEARCH_AUTHORITY", "\"fr.free.nrw.commons.beta.explore.recentsearches.contentprovider\""
-            buildConfigField "String", "RECENT_LANGUAGE_AUTHORITY", "\"fr.free.nrw.commons.beta.recentlanguages.contentprovider\""
-            buildConfigField "String", "BOOKMARK_AUTHORITY", "\"fr.free.nrw.commons.beta.bookmarks.contentprovider\""
-            buildConfigField "String", "BOOKMARK_LOCATIONS_AUTHORITY", "\"fr.free.nrw.commons.beta.bookmarks.locations.contentprovider\""
-            buildConfigField "String", "BOOKMARK_ITEMS_AUTHORITY", "\"fr.free.nrw.commons.beta.bookmarks.items.contentprovider\""
-            buildConfigField "String", "COMMIT_SHA", "\"" + getBuildVersion().toString() + "\""
-            buildConfigField "String", "TEST_USERNAME", "\"" + getTestUserName() + "\""
-            buildConfigField "String", "TEST_PASSWORD", "\"" + getTestPassword() + "\""
-            buildConfigField "String", "DEPICTS_PROPERTY", "\"P245962\""
-            dimension 'tier'
-        }
-    }
-
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
-    }
-
-    buildToolsVersion buildToolsVersion
-
-    buildFeatures {
-        viewBinding true
-        compose true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.3.2'
-    }
-    namespace 'fr.free.nrw.commons'
-    lint {
-        abortOnError false
-        disable 'MissingTranslation', 'ExtraTranslation'
-    }
-}
-
-String getTestUserName() {
-    def propFile = rootProject.file("./local.properties")
-    def properties = new Properties()
-    properties.load(new FileInputStream(propFile))
-    return properties['TEST_USER_NAME']
-}
-
-String getTestPassword() {
-    def propFile = rootProject.file("./local.properties")
-    def properties = new Properties()
-    properties.load(new FileInputStream(propFile))
-    return properties['TEST_USER_PASSWORD']
-}
-
-if (isRunningOnTravisAndIsNotPRBuild) {
-    play {
-        track = "alpha"
-        userFraction = 1
-        serviceAccountEmail = System.getenv("SERVICE_ACCOUNT_NAME")
-        serviceAccountCredentials = file("../play.p12")
-
-        resolutionStrategy = "auto"
-        outputProcessor { // this: ApkVariantOutput
-            versionNameOverride = "$versionNameOverride.$versionCode"
-        }
-    }
-}

app/build.gradle.kts

@@ -0,0 +1,447 @@
+import java.util.Properties
+import java.io.ByteArrayOutputStream
+
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.kotlin.parcelize)
+}
+
+apply(from = "$rootDir/jacoco.gradle")
+
+val isRunningOnTravisAndIsNotPRBuild = System.getenv("CI") == "true" && file("../play.p12").exists()
+
+if (isRunningOnTravisAndIsNotPRBuild) {
+    apply(plugin = "com.github.triplet.play")
+}
+
+android {
+    namespace = "fr.free.nrw.commons"
+    compileSdk = 35
+
+    defaultConfig {
+        applicationId = "fr.free.nrw.commons"
+        minSdk = 21
+        targetSdk = 35
+        versionCode = 1059
+        versionName = "6.1.0"
+
+        setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments["clearPackageData"] = "true"
+
+        multiDexEnabled = true
+
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+    }
+
+    sourceSets {
+        getByName("test") {
+            // Use kotlin only in tests (for now)
+            java.srcDirs("src/test/kotlin")
+
+            // Use main assets and resources in test
+            assets.srcDirs("src/main/assets")
+            resources.srcDirs("src/main/resources")
+        }
+    }
+
+    signingConfigs {
+        create("release") {
+            // Configure keystore based on env vars in Travis for automated alpha builds
+            if(isRunningOnTravisAndIsNotPRBuild) {
+                storeFile = file("../nr-commons.keystore")
+                storePassword = System.getenv("keystore_password")
+                keyAlias = System.getenv("key_alias")
+                keyPassword = System.getenv("key_password")
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.txt")
+            testProguardFile("test-proguard-rules.txt")
+
+            signingConfig = signingConfigs.getByName("debug")
+            if (isRunningOnTravisAndIsNotPRBuild) {
+                signingConfig = signingConfigs.getByName("release")
+            }
+        }
+        debug {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.txt")
+            testProguardFile("test-proguard-rules.txt")
+
+            versionNameSuffix = "-debug-" + getBranchName()
+            enableUnitTestCoverage = true
+            enableAndroidTestCoverage = true
+        }
+    }
+
+    configurations.all {
+        resolutionStrategy {
+            force("androidx.annotation:annotation:1.1.0")
+            force("com.jakewharton.timber:timber:4.7.1")
+            force("androidx.fragment:fragment:1.3.6")
+        }
+        exclude(module = "okhttp-ws")
+    }
+
+    flavorDimensions += "tier"
+    productFlavors {
+        create("prod") {
+            dimension = "tier"
+            applicationId = "fr.free.nrw.commons"
+
+            buildConfigField("String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\"")
+            buildConfigField("String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.org/w/api.php\"")
+            buildConfigField("String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\"")
+            buildConfigField("String", "WIKIDATA_URL", "\"https://www.wikidata.org\"")
+            buildConfigField("String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\"")
+            buildConfigField("String", "WIKIMEDIA_CAMPAIGNS_URL", "\"https://raw.githubusercontent.com/commons-app/campaigns/master/campaigns.json\"")
+            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://www.wikidata.org\"")
+            buildConfigField("String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.org/wiki/\"")
+            buildConfigField("String", "MOBILE_META_URL", "\"https://meta.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\"")
+            buildConfigField("String", "FORGOT_PASSWORD_URL", "\"https://commons.wikimedia.org/wiki/Special:PasswordReset\"")
+            buildConfigField("String", "PRIVACY_POLICY_URL", "\"https://github.com/commons-app/commons-app-documentation/blob/master/android/Privacy-policy.md\"")
+            buildConfigField("String", "FILE_USAGES_BASE_URL", "\"https://commons.wikimedia.org/w/api.php?action=query&format=json&formatversion=2\"")
+            buildConfigField("String", "ACCOUNT_TYPE", "\"fr.free.nrw.commons\"")
+            buildConfigField("String", "CONTRIBUTION_AUTHORITY", "\"fr.free.nrw.commons.contributions.contentprovider\"")
+            buildConfigField("String", "MODIFICATION_AUTHORITY", "\"fr.free.nrw.commons.modifications.contentprovider\"")
+            buildConfigField("String", "CATEGORY_AUTHORITY", "\"fr.free.nrw.commons.categories.contentprovider\"")
+            buildConfigField("String", "RECENT_SEARCH_AUTHORITY", "\"fr.free.nrw.commons.explore.recentsearches.contentprovider\"")
+            buildConfigField("String", "RECENT_LANGUAGE_AUTHORITY", "\"fr.free.nrw.commons.recentlanguages.contentprovider\"")
+            buildConfigField("String", "BOOKMARK_AUTHORITY", "\"fr.free.nrw.commons.bookmarks.contentprovider\"")
+            buildConfigField("String", "BOOKMARK_LOCATIONS_AUTHORITY", "\"fr.free.nrw.commons.bookmarks.locations.contentprovider\"")
+            buildConfigField("String", "BOOKMARK_ITEMS_AUTHORITY", "\"fr.free.nrw.commons.bookmarks.items.contentprovider\"")
+            buildConfigField("String", "COMMIT_SHA", "\"" + getBuildVersion().toString() + "\"")
+            buildConfigField("String", "TEST_USERNAME", "\"" + getTestUserName() + "\"")
+            buildConfigField("String", "TEST_PASSWORD", "\"" + getTestPassword() + "\"")
+            buildConfigField("String", "DEPICTS_PROPERTY", "\"P180\"")
+            buildConfigField("String", "CREATOR_PROPERTY", "\"P170\"")
+        }
+
+        create("beta") {
+            dimension = "tier"
+            applicationId = "fr.free.nrw.commons.beta"
+
+            // What values do we need to hit the BETA versions of the site / api ?
+            buildConfigField("String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\"")
+            buildConfigField("String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.beta.wmflabs.org/w/api.php\"")
+            buildConfigField("String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\"")
+            buildConfigField("String", "WIKIDATA_URL", "\"https://www.wikidata.org\"")
+            buildConfigField("String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\"")
+            buildConfigField("String", "WIKIMEDIA_CAMPAIGNS_URL", "\"https://raw.githubusercontent.com/commons-app/campaigns/master/campaigns_beta_active.json\"")
+            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://www.wikidata.org\"")
+            buildConfigField("String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/wiki/\"")
+            buildConfigField("String", "MOBILE_META_URL", "\"https://meta.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\"")
+            buildConfigField("String", "FORGOT_PASSWORD_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/Special:PasswordReset\"")
+            buildConfigField("String", "PRIVACY_POLICY_URL", "\"https://github.com/commons-app/commons-app-documentation/blob/master/android/Privacy-policy.md\"")
+            buildConfigField("String", "FILE_USAGES_BASE_URL", "\"https://commons.wikimedia.org/w/api.php?action=query&format=json&formatversion=2\"")
+            buildConfigField("String", "ACCOUNT_TYPE", "\"fr.free.nrw.commons.beta\"")
+            buildConfigField("String", "CONTRIBUTION_AUTHORITY", "\"fr.free.nrw.commons.beta.contributions.contentprovider\"")
+            buildConfigField("String", "MODIFICATION_AUTHORITY", "\"fr.free.nrw.commons.beta.modifications.contentprovider\"")
+            buildConfigField("String", "CATEGORY_AUTHORITY", "\"fr.free.nrw.commons.beta.categories.contentprovider\"")
+            buildConfigField("String", "RECENT_SEARCH_AUTHORITY", "\"fr.free.nrw.commons.beta.explore.recentsearches.contentprovider\"")
+            buildConfigField("String", "RECENT_LANGUAGE_AUTHORITY", "\"fr.free.nrw.commons.beta.recentlanguages.contentprovider\"")
+            buildConfigField("String", "BOOKMARK_AUTHORITY", "\"fr.free.nrw.commons.beta.bookmarks.contentprovider\"")
+            buildConfigField("String", "BOOKMARK_LOCATIONS_AUTHORITY", "\"fr.free.nrw.commons.beta.bookmarks.locations.contentprovider\"")
+            buildConfigField("String", "BOOKMARK_ITEMS_AUTHORITY", "\"fr.free.nrw.commons.beta.bookmarks.items.contentprovider\"")
+            buildConfigField("String", "COMMIT_SHA", "\"" + getBuildVersion().toString() + "\"")
+            buildConfigField("String", "TEST_USERNAME", "\"" + getTestUserName() + "\"")
+            buildConfigField("String", "TEST_PASSWORD", "\"" + getTestPassword() + "\"")
+            buildConfigField("String", "DEPICTS_PROPERTY", "\"P245962\"")
+            buildConfigField("String", "CREATOR_PROPERTY", "\"P253075\"")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+    buildFeatures {
+        buildConfig = true
+        viewBinding = true
+        compose = true
+    }
+    buildToolsVersion = buildToolsVersion
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.8"
+    }
+    packaging {
+        jniLibs {
+            excludes += listOf("META-INF/androidx.*")
+        }
+        resources {
+            excludes += listOf(
+                "META-INF/androidx.*",
+                "META-INF/proguard/androidx-annotations.pro",
+                "/META-INF/LICENSE.md",
+                "/META-INF/LICENSE-notice.md"
+            )
+        }
+    }
+    testOptions {
+        animationsDisabled = true
+        unitTests {
+            isReturnDefaultValues = true
+            isIncludeAndroidResources = true
+        }
+        unitTests.all {
+            it.jvmArgs("-noverify")
+        }
+    }
+    lint {
+        abortOnError = false
+        disable += listOf("MissingTranslation", "ExtraTranslation")
+    }
+}
+
+dependencies {
+    // Utils
+    implementation(libs.gson)
+    implementation(libs.okhttp)
+    implementation(libs.retrofit)
+    implementation(libs.retrofit.converter.gson)
+    implementation(libs.retrofit.adapter.rxjava)
+    implementation(libs.rxandroid)
+    implementation(libs.rxjava)
+    implementation(libs.rxbinding)
+    implementation(libs.rxbinding.appcompat)
+    implementation(libs.facebook.fresco)
+    implementation(libs.facebook.fresco.middleware)
+    implementation(libs.apache.commons.lang3)
+
+    // UI
+    implementation("${libs.viewpagerindicator.library.get()}@aar")
+    implementation(libs.photoview)
+    implementation(libs.android.sdk)
+    implementation(libs.android.plugin.scalebar)
+
+    implementation(libs.timber)
+    implementation(libs.android.material)
+    implementation(libs.dexter)
+
+    // Jetpack Compose
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.compose.runtime)
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.graphics)
+    implementation(libs.androidx.ui.tooling.preview)
+    implementation(libs.androidx.ui.viewbinding)
+    implementation(libs.androidx.material3)
+    implementation(libs.androidx.foundation)
+    implementation(libs.androidx.foundation.layout)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.ui.test.junit4)
+    debugImplementation(libs.androidx.ui.tooling)
+    debugImplementation(libs.androidx.ui.test.manifest)
+
+    implementation(libs.adapterdelegates4.kotlin.dsl.viewbinding)
+    implementation(libs.adapterdelegates4.pagination)
+    implementation(libs.androidx.paging.runtime.ktx)
+    testImplementation(libs.androidx.paging.common.ktx)
+    implementation(libs.androidx.paging.rxjava2.ktx)
+    implementation(libs.androidx.recyclerview)
+
+    // Logging
+    implementation(libs.acra.dialog)
+    implementation(libs.acra.mail)
+    implementation(libs.slf4j.api)
+    implementation(libs.logback.android.classic) {
+        exclude(group = "com.google.android", module = "android")
+    }
+    implementation(libs.logging.interceptor)
+
+    // Dependency injector
+    implementation(libs.dagger.android)
+    implementation(libs.dagger.android.support)
+    kapt(libs.dagger.android.processor)
+    kapt(libs.dagger.compiler)
+    annotationProcessor(libs.dagger.android.processor)
+
+    implementation(libs.kotlin.reflect)
+
+    //Mocking
+    testImplementation(libs.mockito.kotlin)
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.powermock.module.junit)
+    testImplementation(libs.powermock.api.mockito)
+    testImplementation(libs.mockk)
+
+    // Unit testing
+    testImplementation(libs.junit)
+    testImplementation(libs.robolectric)
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.androidx.runner)
+    testImplementation(libs.androidx.test.ext.junit)
+    testImplementation(libs.androidx.test.rules)
+    testImplementation(libs.mockwebserver)
+    testImplementation(libs.livedata.testing.ktx)
+    testImplementation(libs.androidx.core.testing)
+    testImplementation(libs.junit.jupiter.api)
+    testRuntimeOnly(libs.junit.jupiter.engine)
+    testImplementation(libs.soloader)
+    testImplementation(libs.kotlinx.coroutines.test)
+    debugImplementation(libs.androidx.fragment.testing)
+    testImplementation(libs.commons.io)
+
+    // Android testing
+    androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(libs.androidx.espresso.intents)
+    androidTestImplementation(libs.androidx.espresso.contrib)
+    androidTestImplementation(libs.androidx.runner)
+    androidTestImplementation(libs.androidx.test.rules)
+    androidTestImplementation(libs.androidx.test.core)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.annotation)
+    androidTestImplementation(libs.mockwebserver)
+    androidTestImplementation(libs.androidx.uiautomator)
+
+    // Debugging
+    debugImplementation(libs.leakcanary.android)
+
+    // Support libraries
+    implementation(libs.androidx.browser)
+    implementation(libs.androidx.cardview)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.exifinterface)
+    implementation(libs.recyclerview.fastscroll)
+
+    //swipe_layout
+    implementation(libs.swipelayout.library)
+
+    //Room
+    implementation(libs.androidx.room.runtime)
+    implementation(libs.androidx.room.ktx)
+    implementation(libs.androidx.room.rxjava)
+    kapt(libs.androidx.room.compiler)
+
+    // Preferences
+    implementation(libs.androidx.preference)
+    implementation(libs.androidx.preference.ktx)
+
+    //Android Media
+    implementation(libs.juanitobananas.androidDmediaUtil)
+    implementation(libs.androidx.multidex)
+
+    // Kotlin + coroutines
+    implementation(libs.androidx.work.runtime.ktx)
+    implementation(libs.androidx.work.runtime)
+    implementation(libs.kotlinx.coroutines.rx2)
+    testImplementation(libs.androidx.work.testing)
+
+    //Glide
+    implementation(libs.glide)
+    annotationProcessor(libs.glide.compiler)
+    kaptTest(libs.androidx.databinding.compiler)
+    kaptAndroidTest(libs.androidx.databinding.compiler)
+
+    implementation(libs.coordinates2country.android) {
+        exclude(group = "com.google.android", module = "android")
+    }
+
+    //OSMDroid
+    implementation(libs.osmdroid.android)
+    constraints {
+        implementation(libs.kotlin.stdlib.jdk7) {
+            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
+        }
+        implementation(libs.kotlin.stdlib.jdk8) {
+            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
+        }
+    }
+}
+
+tasks.register<Exec>("disableAnimations") {
+    val adb = "${System.getenv("ANDROID_HOME")}/platform-tools/adb"
+    commandLine(adb, "shell", "settings", "put", "global", "window_animation_scale", "0")
+    commandLine(adb, "shell", "settings", "put", "global", "transition_animation_scale", "0")
+    commandLine(adb, "shell", "settings", "put", "global", "animator_duration_scale", "0")
+}
+
+project.gradle.taskGraph.whenReady {
+    val connectedBetaDebugAndroidTest = tasks.named("connectedBetaDebugAndroidTest")
+    val connectedProdDebugAndroidTest = tasks.named("connectedProdDebugAndroidTest")
+
+    connectedBetaDebugAndroidTest.configure {
+        dependsOn("disableAnimations")
+    }
+    connectedProdDebugAndroidTest.configure {
+        dependsOn("disableAnimations")
+    }
+}
+
+fun getTestUserName(): String? {
+    val propFile = rootProject.file("./local.properties")
+    val properties = Properties()
+    propFile.inputStream().use { properties.load(it) }
+    return properties.getProperty("TEST_USER_NAME")
+}
+
+fun getTestPassword(): String? {
+    val propFile = rootProject.file("./local.properties")
+    val properties = Properties()
+    propFile.inputStream().use { properties.load(it) }
+    return properties.getProperty("TEST_USER_PASSWORD")
+}
+
+if (isRunningOnTravisAndIsNotPRBuild) {
+    configure<com.github.triplet.gradle.play.PlayPublisherExtension> {
+        track = "alpha"
+        userFraction = 1.0
+        serviceAccountEmail = System.getenv("SERVICE_ACCOUNT_NAME")
+        serviceAccountCredentials = file("../play.p12")
+
+        resolutionStrategy = "auto"
+        outputProcessor { // this: ApkVariantOutput
+            versionNameOverride = "$versionNameOverride.$versionCode"
+        }
+    }
+}
+
+fun getBuildVersion(): String? {
+    return try {
+        val stdout = ByteArrayOutputStream()
+        exec {
+            commandLine("git", "rev-parse", "--short", "HEAD")
+            standardOutput = stdout
+        }
+        stdout.toString().trim()
+    } catch (e: Exception) {
+        null
+    }
+}
+
+fun getBranchName(): String? {
+    return try {
+        val stdout = ByteArrayOutputStream()
+        exec {
+            commandLine("git", "rev-parse", "--abbrev-ref", "HEAD")
+            standardOutput = stdout
+        }
+        stdout.toString().trim()
+    } catch (e: Exception) {
+        null
+    }
+}

app/proguard-rules.txt

@@ -66,6 +66,9 @@
 # Application classes that will be serialized/deserialized over Gson
 -keep class com.google.gson.examples.android.model.** { *; }
 
+# Prevent R8 from obfuscating project classes used by Gson for parsing
+-keep class fr.free.nrw.commons.fileusages.** { *; }
+
 # Prevent proguard from stripping interface information from TypeAdapterFactory,
 # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
 -keep class * implements com.google.gson.TypeAdapterFactory

app/src/androidTest/java/fr/free/nrw/commons/AboutActivityTest.kt

@@ -105,7 +105,7 @@ class AboutActivityTest {
     fun testLaunchTranslate() {
         Espresso.onView(ViewMatchers.withId(R.id.about_translate)).perform(ViewActions.click())
         Espresso.onView(ViewMatchers.withId(android.R.id.button1)).perform(ViewActions.click())
-        val langCode = CommonsApplication.instance.languageLookUpTable!!.codes[0]
+        val langCode = CommonsApplication.instance.languageLookUpTable!!.getCodes()[0]
         Intents.intended(
             CoreMatchers.allOf(
                 IntentMatchers.hasAction(Intent.ACTION_VIEW),

app/src/androidTest/java/fr/free/nrw/commons/UploadCancelledTest.kt

@@ -18,7 +18,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
 import androidx.test.uiautomator.UiDevice
-import fr.free.nrw.commons.LocationPicker.LocationPickerActivity
+import fr.free.nrw.commons.locationpicker.LocationPickerActivity
 import fr.free.nrw.commons.UITestHelper.Companion.childAtPosition
 import fr.free.nrw.commons.auth.LoginActivity
 import org.hamcrest.CoreMatchers
@@ -49,7 +49,7 @@ class UploadCancelledTest {
     fun setup() {
         try {
             Intents.init()
-        } catch (ex: IllegalStateException) {
+        } catch (_: IllegalStateException) {
         }
         device.unfreezeRotation()
         device.setOrientationNatural()
@@ -65,7 +65,7 @@ class UploadCancelledTest {
     fun teardown() {
         try {
             Intents.release()
-        } catch (ex: IllegalStateException) {
+        } catch (_: IllegalStateException) {
         }
     }
 

app/src/androidTest/java/fr/free/nrw/commons/UploadTest.kt

@@ -71,7 +71,7 @@ class UploadTest {
     fun setup() {
         try {
             Intents.init()
-        } catch (ex: IllegalStateException) {
+        } catch (_: IllegalStateException) {
         }
         UITestHelper.loginUser()
         UITestHelper.skipWelcome()

app/src/androidTest/java/fr/free/nrw/commons/contributions/ContributionsListFragmentUnitTests.kt

@@ -89,7 +89,7 @@ class ContributionsListFragmentUnitTests {
         Shadows.shadowOf(Looper.getMainLooper()).idle()
         fragment.rvContributionsList = mock()
         fragment.scrollToTop()
-        verify(fragment.rvContributionsList).smoothScrollToPosition(0)
+        verify(fragment.rvContributionsList)?.smoothScrollToPosition(0)
     }
 
     @Test

app/src/androidTest/java/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditTextTest.kt

@@ -17,7 +17,7 @@ class PasteSensitiveTextInputEditTextTest {
     @Before
     fun setup() {
         context = ApplicationProvider.getApplicationContext()
-        textView = PasteSensitiveTextInputEditText(context)
+        textView = PasteSensitiveTextInputEditText(context!!)
     }
 
     // this test has no real value, just % for test code coverage

app/src/main/AndroidManifest.xml

@@ -55,6 +55,9 @@
     android:theme="@style/LightAppTheme"
     tools:ignore="GoogleAppIndexingWarning"
     tools:replace="android:appComponentFactory">
+    <activity
+      android:name=".activity.SingleWebViewActivity"
+      android:exported="false" />
     <activity
       android:name=".nearby.WikidataFeedback"
       android:exported="false" />
@@ -81,6 +84,7 @@
       android:parentActivityName=".customselector.ui.selector.CustomSelectorActivity" />
     <activity
       android:name=".auth.LoginActivity"
+      android:windowSoftInputMode="adjustPan"
       android:exported="true">
       <intent-filter>
         <category android:name="android.intent.category.LAUNCHER" />
@@ -99,7 +103,7 @@
       android:exported="true"
       android:hardwareAccelerated="false"
       android:icon="@mipmap/ic_launcher"
-      android:windowSoftInputMode="adjustResize">
+      android:windowSoftInputMode="adjustPan">
       <intent-filter android:label="@string/intent_share_upload_label">
         <action android:name="android.intent.action.SEND" />
 
@@ -171,7 +175,7 @@
       android:name=".review.ReviewActivity"
       android:label="@string/title_activity_review" />
     <activity
-      android:name=".LocationPicker.LocationPickerActivity"
+      android:name=".locationpicker.LocationPickerActivity"
       android:label="Location Picker" />
 
     <service
@@ -228,12 +232,6 @@
       android:exported="false"
       android:label="@string/provider_bookmarks"
       android:syncable="false" />
-    <provider
-      android:name=".bookmarks.locations.BookmarkLocationsContentProvider"
-      android:authorities="${applicationId}.bookmarks.locations.contentprovider"
-      android:exported="false"
-      android:label="@string/provider_bookmarks_location"
-      android:syncable="false" />
     <provider
       android:name=".bookmarks.items.BookmarkItemsContentProvider"
       android:authorities="${applicationId}.bookmarks.items.contentprovider"
@@ -258,4 +256,4 @@
       android:required="false" />
   </application>
 
-</manifest>
+</manifest>

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

@@ -1,187 +0,0 @@
-package fr.free.nrw.commons;
-
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
-import androidx.annotation.NonNull;
-import fr.free.nrw.commons.databinding.ActivityAboutBinding;
-import fr.free.nrw.commons.theme.BaseActivity;
-import fr.free.nrw.commons.utils.ConfigUtils;
-import fr.free.nrw.commons.utils.DialogUtil;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Represents about screen of this app
- */
-public class AboutActivity extends BaseActivity {
-
-    /*
-      This View Binding class is auto-generated for each xml file. The format is usually the name
-      of the file with PascalCasing (The underscore characters will be ignored).
-      More information is available at https://developer.android.com/topic/libraries/view-binding
-     */
-    private ActivityAboutBinding binding;
-
-    /**
-     * This method helps in the creation About screen
-     *
-     * @param savedInstanceState Data bundle
-     */
-    @Override
-    @SuppressLint("StringFormatInvalid")
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        /*
-          Instead of just setting the view with the xml file. We need to use View Binding class.
-         */
-        binding = ActivityAboutBinding.inflate(getLayoutInflater());
-        final View view = binding.getRoot();
-        setContentView(view);
-
-        setSupportActionBar(binding.toolbarBinding.toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        final String aboutText = getString(R.string.about_license);
-        /*
-          We can then access all the views by just using the id names like this.
-          camelCasing is used with underscore characters being ignored.
-         */
-        binding.aboutLicense.setHtmlText(aboutText);
-
-        @SuppressLint("StringFormatMatches")
-        String improveText = String.format(getString(R.string.about_improve), Urls.NEW_ISSUE_URL);
-        binding.aboutImprove.setHtmlText(improveText);
-        binding.aboutVersion.setText(ConfigUtils.getVersionNameWithSha(getApplicationContext()));
-
-        Utils.setUnderlinedText(binding.aboutFaq, R.string.about_faq, getApplicationContext());
-        Utils.setUnderlinedText(binding.aboutRateUs, R.string.about_rate_us, getApplicationContext());
-        Utils.setUnderlinedText(binding.aboutUserGuide, R.string.user_guide, getApplicationContext());
-        Utils.setUnderlinedText(binding.aboutPrivacyPolicy, R.string.about_privacy_policy, getApplicationContext());
-        Utils.setUnderlinedText(binding.aboutTranslate, R.string.about_translate, getApplicationContext());
-        Utils.setUnderlinedText(binding.aboutCredits, R.string.about_credits, getApplicationContext());
-
-        /*
-          To set listeners, we can create a separate method and use lambda syntax.
-        */
-        binding.facebookLaunchIcon.setOnClickListener(this::launchFacebook);
-        binding.githubLaunchIcon.setOnClickListener(this::launchGithub);
-        binding.websiteLaunchIcon.setOnClickListener(this::launchWebsite);
-        binding.aboutRateUs.setOnClickListener(this::launchRatings);
-        binding.aboutCredits.setOnClickListener(this::launchCredits);
-        binding.aboutPrivacyPolicy.setOnClickListener(this::launchPrivacyPolicy);
-        binding.aboutUserGuide.setOnClickListener(this::launchUserGuide);
-        binding.aboutFaq.setOnClickListener(this::launchFrequentlyAskedQuesions);
-        binding.aboutTranslate.setOnClickListener(this::launchTranslate);
-    }
-
-    @Override
-    public boolean onSupportNavigateUp() {
-        onBackPressed();
-        return true;
-    }
-
-    public void launchFacebook(View view) {
-        Intent intent;
-        try {
-            intent = new Intent(Intent.ACTION_VIEW, Uri.parse(Urls.FACEBOOK_APP_URL));
-            intent.setPackage(Urls.FACEBOOK_PACKAGE_NAME);
-            startActivity(intent);
-        } catch (Exception e) {
-            Utils.handleWebUrl(this, Uri.parse(Urls.FACEBOOK_WEB_URL));
-        }
-    }
-
-    public void launchGithub(View view) {
-        Intent intent;
-        try {
-            intent = new Intent(Intent.ACTION_VIEW, Uri.parse(Urls.GITHUB_REPO_URL));
-            intent.setPackage(Urls.GITHUB_PACKAGE_NAME);
-            startActivity(intent);
-        } catch (Exception e) {
-            Utils.handleWebUrl(this, Uri.parse(Urls.GITHUB_REPO_URL));
-        }
-    }
-
-    public void launchWebsite(View view) {
-        Utils.handleWebUrl(this, Uri.parse(Urls.WEBSITE_URL));
-    }
-
-    public void launchRatings(View view){
-        Utils.rateApp(this);
-    }
-
-    public void launchCredits(View view) {
-        Utils.handleWebUrl(this, Uri.parse(Urls.CREDITS_URL));
-    }
-
-    public void launchUserGuide(View view) {
-        Utils.handleWebUrl(this, Uri.parse(Urls.USER_GUIDE_URL));
-    }
-
-    public void launchPrivacyPolicy(View view) {
-        Utils.handleWebUrl(this, Uri.parse(BuildConfig.PRIVACY_POLICY_URL));
-    }
-
-    public void launchFrequentlyAskedQuesions(View view) {
-        Utils.handleWebUrl(this, Uri.parse(Urls.FAQ_URL));
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.menu_about, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.share_app_icon:
-                String shareText = String.format(getString(R.string.share_text), Urls.PLAY_STORE_URL_PREFIX + this.getPackageName());
-                Intent sendIntent = new Intent();
-                sendIntent.setAction(Intent.ACTION_SEND);
-                sendIntent.putExtra(Intent.EXTRA_TEXT, shareText);
-                sendIntent.setType("text/plain");
-                startActivity(Intent.createChooser(sendIntent, getString(R.string.share_via)));
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    public void launchTranslate(View view) {
-        @NonNull List<String> sortedLocalizedNamesRef = CommonsApplication.getInstance().getLanguageLookUpTable().getCanonicalNames();
-        Collections.sort(sortedLocalizedNamesRef);
-        final ArrayAdapter<String> languageAdapter = new ArrayAdapter<>(AboutActivity.this,
-                android.R.layout.simple_spinner_dropdown_item, sortedLocalizedNamesRef);
-        final Spinner spinner = new Spinner(AboutActivity.this);
-        spinner.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
-        spinner.setAdapter(languageAdapter);
-        spinner.setGravity(17);
-        spinner.setPadding(50,0,0,0);
-
-        Runnable positiveButtonRunnable = () -> {
-            String langCode = CommonsApplication.getInstance().getLanguageLookUpTable().getCodes().get(spinner.getSelectedItemPosition());
-            Utils.handleWebUrl(AboutActivity.this, Uri.parse(Urls.TRANSLATE_WIKI_URL + langCode));
-        };
-        DialogUtil.showAlertDialog(this,
-            getString(R.string.about_translate_title),
-            getString(R.string.about_translate_message),
-            getString(R.string.about_translate_proceed),
-            getString(R.string.about_translate_cancel),
-            positiveButtonRunnable,
-            () -> {},
-            spinner,
-            true);
-    }
-
-}

app/src/main/java/fr/free/nrw/commons/AboutActivity.kt

@@ -0,0 +1,207 @@
+package fr.free.nrw.commons
+
+import android.annotation.SuppressLint
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.content.Intent.ACTION_VIEW
+import android.net.Uri
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.ArrayAdapter
+import android.widget.LinearLayout
+import android.widget.Spinner
+import fr.free.nrw.commons.CommonsApplication.Companion.instance
+import fr.free.nrw.commons.databinding.ActivityAboutBinding
+import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.ConfigUtils.getVersionNameWithSha
+import fr.free.nrw.commons.utils.DialogUtil.showAlertDialog
+import java.util.Collections
+import androidx.core.net.toUri
+import fr.free.nrw.commons.utils.applyEdgeToEdgeTopInsets
+import fr.free.nrw.commons.utils.handleWebUrl
+import fr.free.nrw.commons.utils.setUnderlinedText
+
+/**
+ * Represents about screen of this app
+ */
+class AboutActivity : BaseActivity() {
+    /*
+         This View Binding class is auto-generated for each xml file. The format is usually the name
+         of the file with PascalCasing (The underscore characters will be ignored).
+         More information is available at https://developer.android.com/topic/libraries/view-binding
+        */
+    private var binding: ActivityAboutBinding? = null
+
+    /**
+     * This method helps in the creation About screen
+     *
+     * @param savedInstanceState Data bundle
+     */
+    @SuppressLint("StringFormatInvalid")  //TODO:
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        /*
+          Instead of just setting the view with the xml file. We need to use View Binding class.
+         */
+        binding = ActivityAboutBinding.inflate(layoutInflater)
+        val view: View = binding!!.root
+        applyEdgeToEdgeTopInsets(binding!!.toolbarLayout)
+        setContentView(view)
+
+        setSupportActionBar(binding!!.toolbarBinding.toolbar)
+        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+        val aboutText = getString(R.string.about_license)
+        /*
+          We can then access all the views by just using the id names like this.
+          camelCasing is used with underscore characters being ignored.
+         */
+        binding!!.aboutLicense.setHtmlText(aboutText)
+
+        @SuppressLint("StringFormatMatches") // TODO:
+        val improveText =
+            String.format(getString(R.string.about_improve), Urls.NEW_ISSUE_URL)
+        binding!!.aboutImprove.setHtmlText(improveText)
+        binding!!.aboutVersion.text = applicationContext.getVersionNameWithSha()
+
+        binding!!.aboutFaq.setUnderlinedText(R.string.about_faq)
+        binding!!.aboutRateUs.setUnderlinedText(R.string.about_rate_us)
+        binding!!.aboutUserGuide.setUnderlinedText(R.string.user_guide)
+        binding!!.aboutPrivacyPolicy.setUnderlinedText(R.string.about_privacy_policy)
+        binding!!.aboutTranslate.setUnderlinedText(R.string.about_translate)
+        binding!!.aboutCredits.setUnderlinedText(R.string.about_credits)
+
+        /*
+          To set listeners, we can create a separate method and use lambda syntax.
+        */
+        binding!!.facebookLaunchIcon.setOnClickListener(::launchFacebook)
+        binding!!.githubLaunchIcon.setOnClickListener(::launchGithub)
+        binding!!.websiteLaunchIcon.setOnClickListener(::launchWebsite)
+        binding!!.aboutRateUs.setOnClickListener(::launchRatings)
+        binding!!.aboutCredits.setOnClickListener(::launchCredits)
+        binding!!.aboutPrivacyPolicy.setOnClickListener(::launchPrivacyPolicy)
+        binding!!.aboutUserGuide.setOnClickListener(::launchUserGuide)
+        binding!!.aboutFaq.setOnClickListener(::launchFrequentlyAskedQuesions)
+        binding!!.aboutTranslate.setOnClickListener(::launchTranslate)
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed()
+        return true
+    }
+
+    fun launchFacebook(view: View?) {
+        val intent: Intent
+        try {
+            intent = Intent(ACTION_VIEW, Urls.FACEBOOK_APP_URL.toUri())
+            intent.setPackage(Urls.FACEBOOK_PACKAGE_NAME)
+            startActivity(intent)
+        } catch (e: Exception) {
+            handleWebUrl(this, Urls.FACEBOOK_WEB_URL.toUri())
+        }
+    }
+
+    fun launchGithub(view: View?) {
+        val intent: Intent
+        try {
+            intent = Intent(ACTION_VIEW, Urls.GITHUB_REPO_URL.toUri())
+            intent.setPackage(Urls.GITHUB_PACKAGE_NAME)
+            startActivity(intent)
+        } catch (e: Exception) {
+            handleWebUrl(this, Urls.GITHUB_REPO_URL.toUri())
+        }
+    }
+
+    fun launchWebsite(view: View?) {
+        handleWebUrl(this, Urls.WEBSITE_URL.toUri())
+    }
+
+    fun launchRatings(view: View?) {
+        try {
+            startActivity(
+                Intent(
+                    ACTION_VIEW,
+                    (Urls.PLAY_STORE_PREFIX + packageName).toUri()
+                )
+            )
+        } catch (_: ActivityNotFoundException) {
+            handleWebUrl(this, (Urls.PLAY_STORE_URL_PREFIX + packageName).toUri())
+        }
+    }
+
+    fun launchCredits(view: View?) {
+        handleWebUrl(this, Urls.CREDITS_URL.toUri())
+    }
+
+    fun launchUserGuide(view: View?) {
+        handleWebUrl(this, Urls.USER_GUIDE_URL.toUri())
+    }
+
+    fun launchPrivacyPolicy(view: View?) {
+        handleWebUrl(this, BuildConfig.PRIVACY_POLICY_URL.toUri())
+    }
+
+    fun launchFrequentlyAskedQuesions(view: View?) {
+        handleWebUrl(this, Urls.FAQ_URL.toUri())
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        val inflater = menuInflater
+        inflater.inflate(R.menu.menu_about, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.share_app_icon -> {
+                val shareText = String.format(
+                    getString(R.string.share_text),
+                    Urls.PLAY_STORE_URL_PREFIX + this.packageName
+                )
+                val sendIntent = Intent()
+                sendIntent.setAction(Intent.ACTION_SEND)
+                sendIntent.putExtra(Intent.EXTRA_TEXT, shareText)
+                sendIntent.setType("text/plain")
+                startActivity(Intent.createChooser(sendIntent, getString(R.string.share_via)))
+                return true
+            }
+
+            else -> return super.onOptionsItemSelected(item)
+        }
+    }
+
+    fun launchTranslate(view: View?) {
+        val sortedLocalizedNamesRef = instance.languageLookUpTable!!.getCanonicalNames()
+        Collections.sort(sortedLocalizedNamesRef)
+        val languageAdapter = ArrayAdapter(
+            this@AboutActivity,
+            android.R.layout.simple_spinner_dropdown_item, sortedLocalizedNamesRef
+        )
+        val spinner = Spinner(this@AboutActivity)
+        spinner.layoutParams =
+            LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.WRAP_CONTENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+            )
+        spinner.adapter = languageAdapter
+        spinner.gravity = 17
+        spinner.setPadding(50, 0, 0, 0)
+
+        val positiveButtonRunnable = Runnable {
+            val langCode = instance.languageLookUpTable!!.getCodes()[spinner.selectedItemPosition]
+            handleWebUrl(this@AboutActivity, (Urls.TRANSLATE_WIKI_URL + langCode).toUri())
+        }
+        showAlertDialog(
+            this,
+            getString(R.string.about_translate_title),
+            getString(R.string.about_translate_message),
+            getString(R.string.about_translate_proceed),
+            getString(R.string.about_translate_cancel),
+            positiveButtonRunnable,
+            {},
+            spinner
+        )
+    }
+}

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

@@ -1,18 +0,0 @@
-package fr.free.nrw.commons;
-
-import androidx.annotation.NonNull;
-
-/**
- * Base presenter, enforcing contracts to atach and detach view
- */
-public interface BasePresenter<T> {
-    /**
-     * Until a view is attached, it is open to listen events from the presenter
-     */
-    void onAttachView(@NonNull T view);
-
-    /**
-     * Detaching a view makes sure that the view no more receives events from the presenter
-     */
-    void onDetachView();
-}

app/src/main/java/fr/free/nrw/commons/BasePresenter.kt

@@ -0,0 +1,10 @@
+package fr.free.nrw.commons
+
+/**
+ * Base presenter, enforcing contracts to attach and detach view
+ */
+interface BasePresenter<T> {
+    fun onAttachView(view: T)
+
+    fun onDetachView()
+}

app/src/main/java/fr/free/nrw/commons/CommonsApplication.kt

@@ -15,9 +15,8 @@ import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.core.ImagePipelineConfig
 import fr.free.nrw.commons.auth.LoginActivity
 import fr.free.nrw.commons.auth.SessionManager
-import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao
-import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao
-import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable
+import fr.free.nrw.commons.bookmarks.pictures.BookmarksTable
 import fr.free.nrw.commons.category.CategoryDao
 import fr.free.nrw.commons.concurrency.BackgroundPoolExceptionHandler
 import fr.free.nrw.commons.concurrency.ThreadPoolService
@@ -247,14 +246,18 @@ class CommonsApplication : MultiDexApplication() {
             DBOpenHelper.CONTRIBUTIONS_TABLE
         ) //Delete the contributions table in the existing db on older versions
 
+        dbOpenHelper.deleteTable(
+            db,
+            DBOpenHelper.BOOKMARKS_LOCATIONS
+        )
+
         try {
             contributionDao.deleteAll()
         } catch (e: SQLiteException) {
             Timber.e(e)
         }
-        BookmarkPicturesDao.Table.onDelete(db)
-        BookmarkLocationsDao.Table.onDelete(db)
-        BookmarkItemsDao.Table.onDelete(db)
+        BookmarksTable.onDelete(db)
+        BookmarkItemsTable.onDelete(db)
     }
 
 

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

@@ -1,79 +0,0 @@
-package fr.free.nrw.commons;
-
-import androidx.annotation.Nullable;
-
-/**
- * represents Licence object
- */
-public class License {
-    private String key;
-    private String template;
-    private String url;
-    private String name;
-
-    /**
-     * Constructs a new instance of License.
-     *
-     * @param key       license key
-     * @param template  license template
-     * @param url       license URL
-     * @param name      licence name
-     *
-     * @throws RuntimeException if License.key or Licence.template is null
-     */
-    public License(String key, String template, String url, String name) {
-        if (key == null) {
-            throw new RuntimeException("License.key must not be null");
-        }
-        if (template == null) {
-            throw new RuntimeException("License.template must not be null");
-        }
-        this.key = key;
-        this.template = template;
-        this.url = url;
-        this.name = name;
-    }
-
-    /**
-     * Gets the license key.
-     * @return license key as a String.
-     */
-    public String getKey() {
-        return key;
-    }
-
-    /**
-     * Gets the license template.
-     * @return license template as a String.
-     */
-    public String getTemplate() {
-        return template;
-    }
-
-    /**
-     * Gets the license name. If name is null, return license key.
-     * @return license name as string. if name null, license key as String
-     */
-    public String getName() {
-        if (name == null) {
-            // hack
-            return getKey();
-        } else {
-            return name;
-        }
-    }
-
-    /**
-     * Gets the license URL
-     *
-     * @param language license language
-     * @return URL
-     */
-    public @Nullable String getUrl(String language) {
-        if (url == null) {
-            return null;
-        } else {
-            return url.replace("$lang", language);
-        }
-    }
-}

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

@@ -1,77 +0,0 @@
-package fr.free.nrw.commons.LocationPicker;
-
-import android.app.Activity;
-import android.content.Intent;
-import fr.free.nrw.commons.CameraPosition;
-import fr.free.nrw.commons.Media;
-
-/**
- * Helper class for starting the activity
- */
-public final class LocationPicker {
-
-    /**
-     * Getting camera position from the intent using constants
-     *
-     * @param data intent
-     * @return CameraPosition
-     */
-    public static CameraPosition getCameraPosition(final Intent data) {
-        return data.getParcelableExtra(LocationPickerConstants.MAP_CAMERA_POSITION);
-    }
-
-    public static class IntentBuilder {
-
-        private final Intent intent;
-
-        /**
-         * Creates a new builder that creates an intent to launch the place picker activity.
-         */
-        public IntentBuilder() {
-            intent = new Intent();
-        }
-
-        /**
-         * Gets and puts location in intent
-         * @param position CameraPosition
-         * @return LocationPicker.IntentBuilder
-         */
-        public LocationPicker.IntentBuilder defaultLocation(
-            final CameraPosition position) {
-          intent.putExtra(LocationPickerConstants.MAP_CAMERA_POSITION, position);
-          return this;
-        }
-
-        /**
-         * Gets and puts activity name in intent
-         * @param activity activity key
-         * @return LocationPicker.IntentBuilder
-         */
-        public LocationPicker.IntentBuilder activityKey(
-            final String activity) {
-          intent.putExtra(LocationPickerConstants.ACTIVITY_KEY, activity);
-          return this;
-        }
-
-        /**
-         * Gets and puts media in intent
-         * @param media Media
-         * @return LocationPicker.IntentBuilder
-         */
-        public LocationPicker.IntentBuilder media(
-                final Media media) {
-              intent.putExtra(LocationPickerConstants.MEDIA, media);
-              return this;
-            }
-
-        /**
-         * Gets and sets the activity
-         * @param activity Activity
-         * @return Intent
-         */
-       public Intent build(final Activity activity) {
-          intent.setClass(activity, LocationPickerActivity.class);
-          return intent;
-        }
-    }
-}

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

@@ -1,681 +0,0 @@
-package fr.free.nrw.commons.LocationPicker;
-
-import static fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment.LAST_LOCATION;
-import static fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment.LAST_ZOOM;
-import static fr.free.nrw.commons.utils.MapUtils.ZOOM_LEVEL;
-
-import android.Manifest.permission;
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.drawable.Drawable;
-import android.location.LocationManager;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.animation.OvershootInterpolator;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatTextView;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.core.app.ActivityCompat;
-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.coordinates.CoordinateEditHelper;
-import fr.free.nrw.commons.filepicker.Constants;
-import fr.free.nrw.commons.kvstore.BasicKvStore;
-import fr.free.nrw.commons.kvstore.JsonKvStore;
-import fr.free.nrw.commons.location.LocationPermissionsHelper;
-import fr.free.nrw.commons.location.LocationPermissionsHelper.LocationPermissionCallback;
-import fr.free.nrw.commons.location.LocationServiceManager;
-import fr.free.nrw.commons.theme.BaseActivity;
-import fr.free.nrw.commons.utils.DialogUtil;
-import fr.free.nrw.commons.utils.SystemThemeUtils;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
-import java.util.List;
-import java.util.Locale;
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
-import org.osmdroid.util.GeoPoint;
-import org.osmdroid.util.constants.GeoConstants;
-import org.osmdroid.views.CustomZoomButtonsController;
-import org.osmdroid.views.overlay.Marker;
-import org.osmdroid.views.overlay.Overlay;
-import org.osmdroid.views.overlay.ScaleDiskOverlay;
-import org.osmdroid.views.overlay.TilesOverlay;
-import timber.log.Timber;
-
-/**
- * Helps to pick location and return the result with an intent
- */
-public class LocationPickerActivity extends BaseActivity implements
-    LocationPermissionCallback {
-    /**
-     * coordinateEditHelper: helps to edit coordinates
-     */
-    @Inject
-    CoordinateEditHelper coordinateEditHelper;
-    /**
-     * media : Media object
-     */
-    private Media media;
-    /**
-     * cameraPosition : position of picker
-     */
-    private CameraPosition cameraPosition;
-    /**
-     * markerImage : picker image
-     */
-    private ImageView markerImage;
-    /**
-     * mapView : OSM Map
-     */
-    private org.osmdroid.views.MapView mapView;
-    /**
-     * tvAttribution : credit
-     */
-    private AppCompatTextView tvAttribution;
-    /**
-     * activity : activity key
-     */
-    private String activity;
-    /**
-     * modifyLocationButton : button for start editing location
-     */
-    Button modifyLocationButton;
-    /**
-     * removeLocationButton : button to remove location metadata
-     */
-    Button removeLocationButton;
-    /**
-     * showInMapButton : button for showing in map
-     */
-    TextView showInMapButton;
-    /**
-     * placeSelectedButton : fab for selecting location
-     */
-    FloatingActionButton placeSelectedButton;
-    /**
-     * fabCenterOnLocation: button for center on location;
-     */
-    FloatingActionButton fabCenterOnLocation;
-    /**
-     * shadow : imageview of shadow
-     */
-    private ImageView shadow;
-    /**
-     * largeToolbarText : textView of shadow
-     */
-    private TextView largeToolbarText;
-    /**
-     * smallToolbarText : textView of shadow
-     */
-    private TextView smallToolbarText;
-    /**
-     * applicationKvStore : for storing values
-     */
-    @Inject
-    @Named("default_preferences")
-    public
-    JsonKvStore applicationKvStore;
-    BasicKvStore store;
-    /**
-     * isDarkTheme: for keeping a track of the device theme and modifying the map theme accordingly
-     */
-    @Inject
-    SystemThemeUtils systemThemeUtils;
-    private boolean isDarkTheme;
-    private boolean moveToCurrentLocation;
-
-    @Inject
-    LocationServiceManager locationManager;
-    LocationPermissionsHelper locationPermissionsHelper;
-
-    @Inject
-    SessionManager sessionManager;
-
-    /**
-     * Constants
-     */
-    private static final String CAMERA_POS = "cameraPosition";
-    private static final String ACTIVITY = "activity";
-
-
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    protected void onCreate(@Nullable final Bundle savedInstanceState) {
-        getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
-        super.onCreate(savedInstanceState);
-
-        isDarkTheme = systemThemeUtils.isDeviceInNightMode();
-        moveToCurrentLocation = false;
-        store = new BasicKvStore(this, "LocationPermissions");
-
-        getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
-        final ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.hide();
-        }
-        setContentView(R.layout.activity_location_picker);
-
-        if (savedInstanceState == null) {
-            cameraPosition = getIntent()
-                .getParcelableExtra(LocationPickerConstants.MAP_CAMERA_POSITION);
-            activity = getIntent().getStringExtra(LocationPickerConstants.ACTIVITY_KEY);
-            media = getIntent().getParcelableExtra(LocationPickerConstants.MEDIA);
-        }else{
-            cameraPosition = savedInstanceState.getParcelable(CAMERA_POS);
-            activity = savedInstanceState.getString(ACTIVITY);
-            media = savedInstanceState.getParcelable("sMedia");
-        }
-        bindViews();
-        addBackButtonListener();
-        addPlaceSelectedButton();
-        addCredits();
-        getToolbarUI();
-        addCenterOnGPSButton();
-
-        org.osmdroid.config.Configuration.getInstance().load(getApplicationContext(),
-            PreferenceManager.getDefaultSharedPreferences(getApplicationContext()));
-
-        mapView.setTileSource(TileSourceFactory.WIKIMEDIA);
-        mapView.setTilesScaledToDpi(true);
-        mapView.setMultiTouchControls(true);
-
-        org.osmdroid.config.Configuration.getInstance().getAdditionalHttpRequestProperties().put(
-            "Referer", "http://maps.wikimedia.org/"
-        );
-        mapView.getZoomController().setVisibility(CustomZoomButtonsController.Visibility.NEVER);
-        mapView.getController().setZoom(ZOOM_LEVEL);
-        mapView.setOnTouchListener((v, event) -> {
-            if (event.getAction() == MotionEvent.ACTION_MOVE) {
-                if (markerImage.getTranslationY() == 0) {
-                    markerImage.animate().translationY(-75)
-                        .setInterpolator(new OvershootInterpolator()).setDuration(250).start();
-                }
-            } else if (event.getAction() == MotionEvent.ACTION_UP) {
-                markerImage.animate().translationY(0)
-                    .setInterpolator(new OvershootInterpolator()).setDuration(250).start();
-            }
-            return false;
-        });
-
-        if ("UploadActivity".equals(activity)) {
-            placeSelectedButton.setVisibility(View.GONE);
-            modifyLocationButton.setVisibility(View.VISIBLE);
-            removeLocationButton.setVisibility(View.VISIBLE);
-            showInMapButton.setVisibility(View.VISIBLE);
-            largeToolbarText.setText(getResources().getString(R.string.image_location));
-            smallToolbarText.setText(getResources().
-                getString(R.string.check_whether_location_is_correct));
-            fabCenterOnLocation.setVisibility(View.GONE);
-            markerImage.setVisibility(View.GONE);
-            shadow.setVisibility(View.GONE);
-            assert cameraPosition != null;
-            showSelectedLocationMarker(new GeoPoint(cameraPosition.getLatitude(),
-                cameraPosition.getLongitude()));
-        }
-        setupMapView();
-    }
-
-    /**
-     * Moves the center of the map to the specified coordinates
-     *
-     */
-    private void moveMapTo(double latitude, double longitude){
-        if(mapView != null && mapView.getController() != null){
-            GeoPoint point = new GeoPoint(latitude, longitude);
-
-            mapView.getController().setCenter(point);
-            mapView.getController().animateTo(point);
-        }
-    }
-
-    /**
-     * Moves the center of the map to the specified coordinates
-     * @param point The GeoPoint object which contains the coordinates to move to
-     */
-    private void moveMapTo(GeoPoint point){
-        if(point != null){
-            moveMapTo(point.getLatitude(), point.getLongitude());
-        }
-    }
-
-    /**
-     * For showing credits
-     */
-    private void addCredits() {
-        tvAttribution.setText(Html.fromHtml(getString(R.string.map_attribution)));
-        tvAttribution.setMovementMethod(LinkMovementMethod.getInstance());
-    }
-
-    /**
-     * For setting up Dark Theme
-     */
-    private void darkThemeSetup() {
-        if (isDarkTheme) {
-            shadow.setColorFilter(Color.argb(255, 255, 255, 255));
-            mapView.getOverlayManager().getTilesOverlay()
-                .setColorFilter(TilesOverlay.INVERT_COLORS);
-        }
-    }
-
-    /**
-     * Clicking back button destroy locationPickerActivity
-     */
-    private void addBackButtonListener() {
-        final ImageView backButton = findViewById(R.id.maplibre_place_picker_toolbar_back_button);
-        backButton.setOnClickListener(v -> {
-            finish();
-        });
-
-    }
-
-    /**
-     * Binds mapView and location picker icon
-     */
-    private void bindViews() {
-        mapView = findViewById(R.id.map_view);
-        markerImage = findViewById(R.id.location_picker_image_view_marker);
-        tvAttribution = findViewById(R.id.tv_attribution);
-        modifyLocationButton = findViewById(R.id.modify_location);
-        removeLocationButton = findViewById(R.id.remove_location);
-        showInMapButton = findViewById(R.id.show_in_map);
-        showInMapButton.setText(getResources().getString(R.string.show_in_map_app).toUpperCase(
-            Locale.ROOT));
-        shadow = findViewById(R.id.location_picker_image_view_shadow);
-    }
-
-    /**
-     * Gets toolbar color
-     */
-    private void getToolbarUI() {
-        final ConstraintLayout toolbar = findViewById(R.id.location_picker_toolbar);
-        largeToolbarText = findViewById(R.id.location_picker_toolbar_primary_text_view);
-        smallToolbarText = findViewById(R.id.location_picker_toolbar_secondary_text_view);
-        toolbar.setBackgroundColor(getResources().getColor(R.color.primaryColor));
-    }
-
-    private void setupMapView() {
-        requestLocationPermissions();
-
-        //If location metadata is available, move map to that location.
-        if(activity.equals("UploadActivity") || activity.equals("MediaActivity")){
-            moveMapToMediaLocation();
-        } else {
-            //If location metadata is not available, move map to device GPS location.
-            moveMapToGPSLocation();
-        }
-
-        modifyLocationButton.setOnClickListener(v -> onClickModifyLocation());
-        removeLocationButton.setOnClickListener(v -> onClickRemoveLocation());
-        showInMapButton.setOnClickListener(v -> showInMapApp());
-        darkThemeSetup();
-    }
-
-    /**
-     * Handles onclick event of modifyLocationButton
-     */
-    private void onClickModifyLocation() {
-        placeSelectedButton.setVisibility(View.VISIBLE);
-        modifyLocationButton.setVisibility(View.GONE);
-        removeLocationButton.setVisibility(View.GONE);
-        showInMapButton.setVisibility(View.GONE);
-        markerImage.setVisibility(View.VISIBLE);
-        shadow.setVisibility(View.VISIBLE);
-        largeToolbarText.setText(getResources().getString(R.string.choose_a_location));
-        smallToolbarText.setText(getResources().getString(R.string.pan_and_zoom_to_adjust));
-        fabCenterOnLocation.setVisibility(View.VISIBLE);
-        removeSelectedLocationMarker();
-        moveMapToMediaLocation();
-    }
-
-    /**
-     * Handles onclick event of removeLocationButton
-     */
-    private void onClickRemoveLocation() {
-        DialogUtil.showAlertDialog(this,
-            getString(R.string.remove_location_warning_title),
-            getString(R.string.remove_location_warning_desc),
-            getString(R.string.continue_message),
-            getString(R.string.cancel), () -> removeLocationFromImage(), null);
-    }
-
-    /**
-     * Method to remove the location from the picture
-     */
-    private void removeLocationFromImage() {
-        if (media != null) {
-            compositeDisposable.add(coordinateEditHelper.makeCoordinatesEdit(getApplicationContext()
-                    , media, "0.0", "0.0", "0.0f")
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(s -> {
-                    Timber.d("Coordinates are removed from the image");
-                }));
-        }
-        final Intent returningIntent = new Intent();
-        setResult(AppCompatActivity.RESULT_OK, returningIntent);
-        finish();
-    }
-
-    /**
-     * Show the location in map app. Map will center on the location metadata, if available.
-     * If there is no location metadata, the map will center on the commons app map center.
-     */
-    private void showInMapApp() {
-        fr.free.nrw.commons.location.LatLng position = null;
-
-        if(activity.equals("UploadActivity") && cameraPosition != null){
-            //location metadata is available
-            position = new fr.free.nrw.commons.location.LatLng(cameraPosition.getLatitude(),
-                cameraPosition.getLongitude(), 0.0f);
-        } else if(mapView != null){
-            //location metadata is not available
-            position = new fr.free.nrw.commons.location.LatLng(mapView.getMapCenter().getLatitude(),
-                mapView.getMapCenter().getLongitude(), 0.0f);
-        }
-
-        if(position != null){
-            Utils.handleGeoCoordinates(this, position);
-        }
-    }
-
-    /**
-     * Moves the center of the map to the media's location, if that data
-     * is available.
-     */
-    private void moveMapToMediaLocation() {
-        if (cameraPosition != null) {
-
-            GeoPoint point = new GeoPoint(cameraPosition.getLatitude(),
-                cameraPosition.getLongitude());
-
-            moveMapTo(point);
-        }
-    }
-
-    /**
-     * Moves the center of the map to the device's GPS location, if that data is available.
-     */
-    private void moveMapToGPSLocation(){
-        if(locationManager != null){
-            fr.free.nrw.commons.location.LatLng location = locationManager.getLastLocation();
-
-            if(location != null){
-                GeoPoint point = new GeoPoint(location.getLatitude(), location.getLongitude());
-
-                moveMapTo(point);
-            }
-        }
-    }
-
-    /**
-     * Select the preferable location
-     */
-    private void addPlaceSelectedButton() {
-        placeSelectedButton = findViewById(R.id.location_chosen_button);
-        placeSelectedButton.setOnClickListener(view -> placeSelected());
-    }
-
-    /**
-     * Return the intent with required data
-     */
-    void placeSelected() {
-        if (activity.equals("NoLocationUploadActivity")) {
-            applicationKvStore.putString(LAST_LOCATION,
-                mapView.getMapCenter().getLatitude()
-                    + ","
-                    + mapView.getMapCenter().getLongitude());
-            applicationKvStore.putString(LAST_ZOOM, mapView.getZoomLevel() + "");
-        }
-
-        if (media == null) {
-            final Intent returningIntent = new Intent();
-            returningIntent.putExtra(LocationPickerConstants.MAP_CAMERA_POSITION,
-                new CameraPosition(mapView.getMapCenter().getLatitude(),
-                    mapView.getMapCenter().getLongitude(), 14.0));
-            setResult(AppCompatActivity.RESULT_OK, returningIntent);
-        } else {
-            updateCoordinates(String.valueOf(mapView.getMapCenter().getLatitude()),
-                String.valueOf(mapView.getMapCenter().getLongitude()),
-                String.valueOf(0.0f));
-        }
-
-        finish();
-    }
-
-    /**
-     * Fetched coordinates are replaced with existing coordinates by a POST API call.
-     * @param Latitude to be added
-     * @param Longitude to be added
-     * @param Accuracy to be added
-     */
-    public void updateCoordinates(final String Latitude, final String Longitude,
-        final String Accuracy) {
-        if (media == null) {
-            return;
-        }
-
-        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);
-            }
-        }
-    }
-
-    /**
-     * Center the camera on the last saved location
-     */
-    private void addCenterOnGPSButton() {
-        fabCenterOnLocation = findViewById(R.id.center_on_gps);
-        fabCenterOnLocation.setOnClickListener(view -> {
-            moveToCurrentLocation = true;
-            requestLocationPermissions();
-        });
-    }
-
-    /**
-     * Adds selected location marker on the map
-     */
-    private void showSelectedLocationMarker(GeoPoint point) {
-        Drawable icon = ContextCompat.getDrawable(this, R.drawable.map_default_map_marker);
-        Marker marker = new Marker(mapView);
-        marker.setPosition(point);
-        marker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM);
-        marker.setIcon(icon);
-        marker.setInfoWindow(null);
-        mapView.getOverlays().add(marker);
-        mapView.invalidate();
-    }
-
-    /**
-     * Removes selected location marker from the map
-     */
-    private void removeSelectedLocationMarker() {
-        List<Overlay> overlays = mapView.getOverlays();
-        for (int i = 0; i < overlays.size(); i++) {
-            if (overlays.get(i) instanceof Marker) {
-                Marker item = (Marker) overlays.get(i);
-                if (cameraPosition.getLatitude() == item.getPosition().getLatitude()
-                    && cameraPosition.getLongitude() == item.getPosition().getLongitude()) {
-                    mapView.getOverlays().remove(i);
-                    mapView.invalidate();
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Center the map at user's current location
-     */
-    private void requestLocationPermissions() {
-        locationPermissionsHelper = new LocationPermissionsHelper(
-            this, locationManager, this);
-        locationPermissionsHelper.requestForLocationAccess(R.string.location_permission_title,
-            R.string.upload_map_location_access);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(final int requestCode,
-        @NonNull final String[] permissions,
-        @NonNull final int[] grantResults) {
-        if (requestCode == Constants.RequestCodes.LOCATION
-            && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-            onLocationPermissionGranted();
-        } else {
-            onLocationPermissionDenied(getString(R.string.upload_map_location_access));
-        }
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mapView.onResume();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        mapView.onPause();
-    }
-
-    @Override
-    public void onLocationPermissionDenied(String toastMessage) {
-        if (!ActivityCompat.shouldShowRequestPermissionRationale(this,
-            permission.ACCESS_FINE_LOCATION)) {
-            if (!locationPermissionsHelper.checkLocationPermission(this)) {
-                if (store.getBoolean("isPermissionDenied", false)) {
-                    // means user has denied location permission twice or checked the "Don't show again"
-                    locationPermissionsHelper.showAppSettingsDialog(this,
-                        R.string.upload_map_location_access);
-                } else {
-                    Toast.makeText(getBaseContext(), toastMessage, Toast.LENGTH_LONG).show();
-                }
-                store.putBoolean("isPermissionDenied", true);
-            }
-        } else {
-            Toast.makeText(getBaseContext(), toastMessage, Toast.LENGTH_LONG).show();
-        }
-    }
-
-    @Override
-    public void onLocationPermissionGranted() {
-        if (moveToCurrentLocation || !(activity.equals("MediaActivity"))) {
-            if (locationPermissionsHelper.isLocationAccessToAppsTurnedOn()) {
-                locationManager.requestLocationUpdatesFromProvider(
-                    LocationManager.NETWORK_PROVIDER);
-                locationManager.requestLocationUpdatesFromProvider(LocationManager.GPS_PROVIDER);
-                addMarkerAtGPSLocation();
-            } else {
-                addMarkerAtGPSLocation();
-                locationPermissionsHelper.showLocationOffDialog(this,
-                    R.string.ask_to_turn_location_on_text);
-            }
-        }
-    }
-
-    /**
-     * Adds a marker to the map at the most recent GPS location
-     * (which may be the current GPS location).
-     */
-    private void addMarkerAtGPSLocation() {
-        fr.free.nrw.commons.location.LatLng currLocation = locationManager.getLastLocation();
-        if (currLocation != null) {
-            GeoPoint currLocationGeopoint = new GeoPoint(currLocation.getLatitude(),
-                currLocation.getLongitude());
-            addLocationMarker(currLocationGeopoint);
-            markerImage.setTranslationY(0);
-        }
-    }
-
-    private void addLocationMarker(GeoPoint geoPoint) {
-        if (moveToCurrentLocation) {
-            mapView.getOverlays().clear();
-        }
-        ScaleDiskOverlay diskOverlay =
-            new ScaleDiskOverlay(this,
-                geoPoint, 2000, GeoConstants.UnitOfMeasure.foot);
-        Paint circlePaint = new Paint();
-        circlePaint.setColor(Color.rgb(128, 128, 128));
-        circlePaint.setStyle(Paint.Style.STROKE);
-        circlePaint.setStrokeWidth(2f);
-        diskOverlay.setCirclePaint2(circlePaint);
-        Paint diskPaint = new Paint();
-        diskPaint.setColor(Color.argb(40, 128, 128, 128));
-        diskPaint.setStyle(Paint.Style.FILL_AND_STROKE);
-        diskOverlay.setCirclePaint1(diskPaint);
-        diskOverlay.setDisplaySizeMin(900);
-        diskOverlay.setDisplaySizeMax(1700);
-        mapView.getOverlays().add(diskOverlay);
-        org.osmdroid.views.overlay.Marker startMarker = new org.osmdroid.views.overlay.Marker(
-            mapView);
-        startMarker.setPosition(geoPoint);
-        startMarker.setAnchor(org.osmdroid.views.overlay.Marker.ANCHOR_CENTER,
-            org.osmdroid.views.overlay.Marker.ANCHOR_BOTTOM);
-        startMarker.setIcon(
-            ContextCompat.getDrawable(this, R.drawable.current_location_marker));
-        startMarker.setTitle("Your Location");
-        startMarker.setTextLabelFontSize(24);
-        mapView.getOverlays().add(startMarker);
-    }
-
-    /**
-     * Saves the state of the activity
-     * @param outState Bundle
-     */
-    @Override
-    public void onSaveInstanceState(@NonNull final Bundle outState) {
-        super.onSaveInstanceState(outState);
-        if(cameraPosition!=null){
-            outState.putParcelable(CAMERA_POS, cameraPosition);
-        }
-        if(activity!=null){
-            outState.putString(ACTIVITY, activity);
-        }
-
-        if(media!=null){
-            outState.putParcelable("sMedia", media);
-        }
-    }
-}

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

@@ -1,20 +0,0 @@
-package fr.free.nrw.commons.LocationPicker;
-
-/**
- * Constants need for location picking
- */
-public final class LocationPickerConstants {
-
-    public static final String ACTIVITY_KEY
-        = "location.picker.activity";
-
-    public static final String MAP_CAMERA_POSITION
-        = "location.picker.cameraPosition";
-
-    public static final String MEDIA
-        = "location.picker.media";
-
-
-    private LocationPickerConstants() {
-    }
-}

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

@@ -1,63 +0,0 @@
-package fr.free.nrw.commons.LocationPicker;
-
-import android.app.Application;
-import androidx.annotation.NonNull;
-import androidx.lifecycle.AndroidViewModel;
-import androidx.lifecycle.MutableLiveData;
-import fr.free.nrw.commons.CameraPosition;
-import org.jetbrains.annotations.NotNull;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-import timber.log.Timber;
-
-/**
- * Observes live camera position data
- */
-public class LocationPickerViewModel extends AndroidViewModel implements Callback<CameraPosition> {
-
-    /**
-     * Wrapping CameraPosition with MutableLiveData
-     */
-    private final MutableLiveData<CameraPosition> result = new MutableLiveData<>();
-
-    /**
-     * Constructor for this class
-     *
-     * @param application Application
-     */
-    public LocationPickerViewModel(@NonNull final Application application) {
-        super(application);
-    }
-
-    /**
-     * Responses on camera position changing
-     *
-     * @param call     Call<CameraPosition>
-     * @param response Response<CameraPosition>
-     */
-    @Override
-    public void onResponse(final @NotNull Call<CameraPosition> call,
-        final Response<CameraPosition> response) {
-        if (response.body() == null) {
-            result.setValue(null);
-            return;
-        }
-        result.setValue(response.body());
-    }
-
-    @Override
-    public void onFailure(final @NotNull Call<CameraPosition> call, final @NotNull Throwable t) {
-        Timber.e(t);
-    }
-
-    /**
-     * Gets live CameraPosition
-     *
-     * @return MutableLiveData<CameraPosition>
-     */
-    public MutableLiveData<CameraPosition> getResult() {
-        return result;
-    }
-
-}

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

@@ -1,30 +0,0 @@
-package fr.free.nrw.commons;
-
-import fr.free.nrw.commons.location.LatLng;
-import fr.free.nrw.commons.nearby.Place;
-import java.util.List;
-
-public abstract class MapController {
-
-    /**
-     * We pass this variable as a group of placeList and boundaryCoordinates
-     */
-    public class NearbyPlacesInfo {
-        public List<Place> placeList; // List of nearby places
-        public LatLng[] boundaryCoordinates; // Corners of nearby area
-        public LatLng currentLatLng; // Current location when this places are populated
-        public LatLng searchLatLng; // Search location for finding this places
-        public List<Media> mediaList; // Search location for finding this places
-    }
-
-    /**
-     * We pass this variable as a group of placeList and boundaryCoordinates
-     */
-    public class ExplorePlacesInfo {
-        public List<Place> explorePlaceList; // List of nearby places
-        public LatLng[] boundaryCoordinates; // Corners of nearby area
-        public LatLng currentLatLng; // Current location when this places are populated
-        public LatLng searchLatLng; // Search location for finding this places
-        public List<Media> mediaList; // Search location for finding this places
-    }
-}

app/src/main/java/fr/free/nrw/commons/MapController.kt

@@ -0,0 +1,46 @@
+package fr.free.nrw.commons
+
+import fr.free.nrw.commons.location.LatLng
+import fr.free.nrw.commons.nearby.Place
+
+abstract class MapController {
+    /**
+     * We pass this variable as a group of placeList and boundaryCoordinates
+     */
+    inner class NearbyPlacesInfo {
+        @JvmField
+        var placeList: List<Place> = emptyList() // List of nearby places
+
+        @JvmField
+        var boundaryCoordinates: Array<LatLng> = emptyArray() // Corners of nearby area
+
+        @JvmField
+        var currentLatLng: LatLng? = null // Current location when this places are populated
+
+        @JvmField
+        var searchLatLng: LatLng? = null // Search location for finding this places
+
+        @JvmField
+        var mediaList: List<Media>? = null // Search location for finding this places
+    }
+
+    /**
+     * We pass this variable as a group of placeList and boundaryCoordinates
+     */
+    inner class ExplorePlacesInfo {
+        @JvmField
+        var explorePlaceList: List<Place> = emptyList() // List of nearby places
+
+        @JvmField
+        var boundaryCoordinates: Array<LatLng> = emptyArray() // Corners of nearby area
+
+        @JvmField
+        var currentLatLng: LatLng? = null // Current location when this places are populated
+
+        @JvmField
+        var searchLatLng: LatLng? = null // Search location for finding this places
+
+        @JvmField
+        var mediaList: List<Media> = emptyList() // Search location for finding this places
+    }
+}

app/src/main/java/fr/free/nrw/commons/Media.kt

@@ -1,7 +1,9 @@
 package fr.free.nrw.commons
 
 import android.os.Parcelable
+import fr.free.nrw.commons.BuildConfig.COMMONS_URL
 import fr.free.nrw.commons.location.LatLng
+import fr.free.nrw.commons.wikidata.model.WikiSite
 import fr.free.nrw.commons.wikidata.model.page.PageTitle
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
@@ -28,9 +30,7 @@ class Media constructor(
      */
     var filename: String? = null,
     /**
-     * Gets or sets the file description.
-     * @return file description as a string
-     * @param fallbackDescription the new description of the file
+     * The fallback description of the file, used if no other description is provided.
      */
     var fallbackDescription: String? = null,
     /**
@@ -40,19 +40,25 @@ class Media constructor(
      */
     var dateUploaded: Date? = null,
     /**
-     * Gets or sets the license name of the file.
-     * @return license as a String
-     * @param license license name as a String
+     * The license name of the file.
      */
     var license: String? = null,
+    /**
+     * The URL corresponding to the license.
+     */
     var licenseUrl: String? = null,
     /**
-     * Gets or sets the name of the creator of the file.
-     * @return author name as a String
-     * @param author creator name as a string
+     * The name of the creator of the file.
      */
     var author: String? = null,
+    /**
+     * The username of the uploader.
+     */
     var user: String? = null,
+    /**
+     * The full name of the file's creator, if different from username.
+     */
+    var creatorName: String? = null,
     /**
      * Gets the categories the file falls under.
      * @return file categories as an ArrayList of Strings
@@ -66,6 +72,7 @@ class Media constructor(
     var captions: Map<String, String> = emptyMap(),
     var descriptions: Map<String, String> = emptyMap(),
     var depictionIds: List<String> = emptyList(),
+    var creatorIds: List<String> = emptyList(),
     /**
      * This field was added to find non-hidden categories
      * Stores the mapping of category title to hidden attribute
@@ -90,6 +97,68 @@ class Media constructor(
         captions = captions,
     )
 
+    constructor(
+        captions: Map<String, String>,
+        categories: List<String>?,
+        filename: String?,
+        fallbackDescription: String?,
+        author: String?,
+        user: String?,
+        dateUploaded: Date? = Date(),
+        license: String? = null,
+        licenseUrl: String? = null,
+        imageUrl: String? = null,
+        thumbUrl: String? = null,
+        coordinates: LatLng? = null,
+        descriptions: Map<String, String> = emptyMap(),
+        depictionIds: List<String> = emptyList(),
+        categoriesHiddenStatus: Map<String, Boolean> = emptyMap()
+    ) : this(
+        pageId = UUID.randomUUID().toString(),
+        filename = filename,
+        fallbackDescription = fallbackDescription,
+        dateUploaded = dateUploaded,
+        author = author,
+        user = user,
+        categories = categories,
+        captions = captions,
+        license = license,
+        licenseUrl = licenseUrl,
+        imageUrl = imageUrl,
+        thumbUrl = thumbUrl,
+        coordinates = coordinates,
+        descriptions = descriptions,
+        depictionIds = depictionIds,
+        categoriesHiddenStatus = categoriesHiddenStatus
+    )
+
+    /**
+     * Returns Author if it's not null or empty, otherwise
+     * returns user
+     * @return Author or User
+     */
+    @Deprecated("Use user for uploader username. Use attributedAuthor() for attribution. Note that the uploader may not be the creator/author.")
+    fun getAuthorOrUser(): String? {
+        return if (!author.isNullOrEmpty()) {
+            author
+        } else{
+            user
+        }
+    }
+
+    /**
+     * Returns author if it's not null or empty, otherwise
+     * returns creator name
+     * @return name of author or creator
+     */
+    fun getAttributedAuthor(): String? {
+        return if (!author.isNullOrEmpty()) {
+            author
+        } else{
+            creatorName
+        }
+    }
+
     /**
      * Gets media display title
      * @return Media title
@@ -106,7 +175,8 @@ class Media constructor(
      * Gets file page title
      * @return New media page title
      */
-    val pageTitle: PageTitle get() = Utils.getPageTitle(filename!!)
+    val pageTitle: PageTitle
+        get() = PageTitle(filename!!, WikiSite(COMMONS_URL))
 
     /**
      * Returns wikicode to use the media file on a MediaWiki site

app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.kt

@@ -1,7 +1,7 @@
 package fr.free.nrw.commons
 
 import androidx.core.text.HtmlCompat
-import fr.free.nrw.commons.media.IdAndCaptions
+import fr.free.nrw.commons.media.IdAndLabels
 import fr.free.nrw.commons.media.MediaClient
 import fr.free.nrw.commons.media.PAGE_ID_PREFIX
 import io.reactivex.Single
@@ -23,13 +23,23 @@ class MediaDataExtractor
         private val mediaClient: MediaClient,
     ) {
         fun fetchDepictionIdsAndLabels(media: Media) =
-            mediaClient
+                mediaClient
                 .getEntities(media.depictionIds)
                 .map {
                     it
                         .entities()
                         .mapValues { entry -> entry.value.labels().mapValues { it.value.value() } }
-                }.map { it.map { (key, value) -> IdAndCaptions(key, value) } }
+                }.map { it.map { (key, value) -> IdAndLabels(key, value) } }
+                .onErrorReturn { emptyList() }
+
+        fun fetchCreatorIdsAndLabels(media: Media) =
+            mediaClient
+                .getEntities(media.creatorIds)
+                .map {
+                    it
+                        .entities()
+                        .mapValues { entry -> entry.value.labels().mapValues { it.value.value() } }
+                }.map { it.map { (key, value) -> IdAndLabels(key, value) } }
                 .onErrorReturn { emptyList() }
 
         fun checkDeletionRequestExists(media: Media) = mediaClient.checkPageExistsUsingTitle("Commons:Deletion_requests/" + media.filename)

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

@@ -1,8 +0,0 @@
-package fr.free.nrw.commons;
-
-/**
- * Base interface for all the views
- */
-public interface MvpView {
-    void showMessage(String message);
-}

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

@@ -1,154 +0,0 @@
-package fr.free.nrw.commons;
-
-import androidx.annotation.NonNull;
-import fr.free.nrw.commons.wikidata.cookies.CommonsCookieJar;
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import okhttp3.Cache;
-import okhttp3.Interceptor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import okhttp3.logging.HttpLoggingInterceptor;
-import okhttp3.logging.HttpLoggingInterceptor.Level;
-import timber.log.Timber;
-
-public final class OkHttpConnectionFactory {
-    private static final String CACHE_DIR_NAME = "okhttp-cache";
-    private static final long NET_CACHE_SIZE = 64 * 1024 * 1024;
-
-    public static OkHttpClient CLIENT;
-
-    @NonNull public static OkHttpClient getClient(final CommonsCookieJar cookieJar) {
-        if (CLIENT == null) {
-            CLIENT = createClient(cookieJar);
-        }
-        return CLIENT;
-    }
-
-    @NonNull
-    private static OkHttpClient createClient(final CommonsCookieJar cookieJar) {
-        return new OkHttpClient.Builder()
-                .cookieJar(cookieJar)
-                .cache((CommonsApplication.getInstance()!=null) ? new Cache(new File(CommonsApplication.getInstance().getCacheDir(), CACHE_DIR_NAME), NET_CACHE_SIZE) : null)
-                .connectTimeout(120, TimeUnit.SECONDS)
-                .writeTimeout(120, TimeUnit.SECONDS)
-                .readTimeout(120, TimeUnit.SECONDS)
-                .addInterceptor(getLoggingInterceptor())
-                .addInterceptor(new UnsuccessfulResponseInterceptor())
-                .addInterceptor(new CommonHeaderRequestInterceptor())
-                .build();
-    }
-
-    private static HttpLoggingInterceptor getLoggingInterceptor() {
-        final HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor()
-            .setLevel(Level.BASIC);
-
-        httpLoggingInterceptor.redactHeader("Authorization");
-        httpLoggingInterceptor.redactHeader("Cookie");
-
-        return httpLoggingInterceptor;
-    }
-
-    private static class CommonHeaderRequestInterceptor implements Interceptor {
-
-        @Override
-        @NonNull
-        public Response intercept(@NonNull final Chain chain) throws IOException {
-            final Request request = chain.request().newBuilder()
-                    .header("User-Agent", CommonsApplication.getInstance().getUserAgent())
-                    .build();
-            return chain.proceed(request);
-        }
-    }
-
-    public static class UnsuccessfulResponseInterceptor implements Interceptor {
-        private static final String SUPPRESS_ERROR_LOG = "x-commons-suppress-error-log";
-        public static final String SUPPRESS_ERROR_LOG_HEADER = SUPPRESS_ERROR_LOG+": true";
-        private static final List<String> DO_NOT_INTERCEPT = Collections.singletonList(
-            "api.php?format=json&formatversion=2&errorformat=plaintext&action=upload&ignorewarnings=1");
-
-        private static final String ERRORS_PREFIX = "{\"error";
-
-        @Override
-        @NonNull
-        public Response intercept(@NonNull final Chain chain) throws IOException {
-            final Request rq = chain.request();
-
-            // If the request contains our special "suppress errors" header, make note of it
-            // but don't pass that on to the server.
-            final boolean suppressErrors = rq.headers().names().contains(SUPPRESS_ERROR_LOG);
-            final Request request = rq.newBuilder()
-                .removeHeader(SUPPRESS_ERROR_LOG)
-                .build();
-
-            final Response rsp = chain.proceed(request);
-
-            // Do not intercept certain requests and let the caller handle the errors
-            if(isExcludedUrl(chain.request())) {
-                return rsp;
-            }
-            if (rsp.isSuccessful()) {
-                try (final ResponseBody responseBody = rsp.peekBody(ERRORS_PREFIX.length())) {
-                    if (ERRORS_PREFIX.equals(responseBody.string())) {
-                        try (final ResponseBody body = rsp.body()) {
-                            throw new IOException(body.string());
-                        }
-                    }
-                } catch (final IOException e) {
-                    // Log the error as debug (and therefore, "expected") or at error level
-                    if (suppressErrors) {
-                        Timber.d(e, "Suppressed (known / expected) error");
-                    } else {
-                        Timber.e(e);
-                    }
-                }
-                return rsp;
-            }
-            throw new HttpStatusException(rsp);
-        }
-
-        private boolean isExcludedUrl(final Request request) {
-            final String requestUrl = request.url().toString();
-            for(final String url: DO_NOT_INTERCEPT) {
-                if(requestUrl.contains(url)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-
-    private OkHttpConnectionFactory() {
-    }
-
-    public static class HttpStatusException extends IOException {
-        private final int code;
-        private final String url;
-        public HttpStatusException(@NonNull Response rsp) {
-            this.code = rsp.code();
-            this.url = rsp.request().url().uri().toString();
-            try {
-                if (rsp.body() != null && rsp.body().contentType() != null
-                        && rsp.body().contentType().toString().contains("json")) {
-                }
-            } catch (Exception e) {
-                // Log?
-            }
-        }
-
-        public int code() {
-            return code;
-        }
-
-        @Override
-        public String getMessage() {
-            String str = "Code: " + code + ", URL: " + url;
-            return str;
-        }
-    }
-}

app/src/main/java/fr/free/nrw/commons/OkHttpConnectionFactory.kt

@@ -0,0 +1,135 @@
+package fr.free.nrw.commons
+
+import androidx.annotation.VisibleForTesting
+import fr.free.nrw.commons.wikidata.GsonUtil
+import fr.free.nrw.commons.wikidata.cookies.CommonsCookieJar
+import fr.free.nrw.commons.wikidata.mwapi.MwErrorResponse
+import fr.free.nrw.commons.wikidata.mwapi.MwIOException
+import fr.free.nrw.commons.wikidata.mwapi.MwLegacyServiceError
+import okhttp3.Cache
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.logging.HttpLoggingInterceptor
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.util.concurrent.TimeUnit
+
+object OkHttpConnectionFactory {
+    private const val CACHE_DIR_NAME = "okhttp-cache"
+    private const val NET_CACHE_SIZE = (64 * 1024 * 1024).toLong()
+
+    @VisibleForTesting
+    var CLIENT: OkHttpClient? = null
+
+    fun getClient(cookieJar: CommonsCookieJar): OkHttpClient {
+        if (CLIENT == null) {
+            CLIENT = createClient(cookieJar)
+        }
+        return CLIENT!!
+    }
+
+    private fun createClient(cookieJar: CommonsCookieJar): OkHttpClient {
+        return OkHttpClient.Builder()
+            .cookieJar(cookieJar)
+            .cache(
+                if (CommonsApplication.instance != null) Cache(
+                    File(CommonsApplication.instance.cacheDir, CACHE_DIR_NAME),
+                    NET_CACHE_SIZE
+                ) else null
+            )
+            .connectTimeout(120, TimeUnit.SECONDS)
+            .writeTimeout(120, TimeUnit.SECONDS)
+            .readTimeout(120, TimeUnit.SECONDS)
+            .addInterceptor(HttpLoggingInterceptor().apply {
+                setLevel(HttpLoggingInterceptor.Level.BASIC)
+                redactHeader("Authorization")
+                redactHeader("Cookie")
+            })
+            .addInterceptor(UnsuccessfulResponseInterceptor())
+            .addInterceptor(CommonHeaderRequestInterceptor())
+            .build()
+    }
+}
+
+class CommonHeaderRequestInterceptor : Interceptor {
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val request = chain.request().newBuilder()
+            .header("User-Agent", CommonsApplication.instance.userAgent)
+            .build()
+        return chain.proceed(request)
+    }
+}
+
+private const val SUPPRESS_ERROR_LOG = "x-commons-suppress-error-log"
+const val SUPPRESS_ERROR_LOG_HEADER: String = "$SUPPRESS_ERROR_LOG: true"
+
+private class UnsuccessfulResponseInterceptor : Interceptor {
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val rq = chain.request()
+
+        // If the request contains our special "suppress errors" header, make note of it
+        // but don't pass that on to the server.
+        val suppressErrors = rq.headers.names().contains(SUPPRESS_ERROR_LOG)
+        val request = rq.newBuilder()
+            .removeHeader(SUPPRESS_ERROR_LOG)
+            .build()
+
+        val rsp = chain.proceed(request)
+
+        // Do not intercept certain requests and let the caller handle the errors
+        if (isExcludedUrl(chain.request())) {
+            return rsp
+        }
+        if (rsp.isSuccessful) {
+            try {
+                rsp.peekBody(ERRORS_PREFIX.length.toLong()).use { responseBody ->
+                    if (ERRORS_PREFIX == responseBody.string()) {
+                        rsp.body.use { body ->
+                            val bodyString = body!!.string()
+
+                            throw MwIOException(
+                                "MediaWiki API returned error: $bodyString",
+                                GsonUtil.defaultGson.fromJson(
+                                    bodyString,
+                                    MwErrorResponse::class.java
+                                ).error!!,
+                            )
+                        }
+                    }
+                }
+            } catch (e: MwIOException) {
+                // Log the error as debug (and therefore, "expected") or at error level
+                if (suppressErrors) {
+                    Timber.d(e, "Suppressed (known / expected) error")
+                } else {
+                    Timber.e(e)
+                    throw e
+                }
+            }
+            return rsp
+        }
+        throw IOException("Unsuccessful response")
+    }
+
+    private fun isExcludedUrl(request: Request): Boolean {
+        val requestUrl = request.url.toString()
+        for (url in DO_NOT_INTERCEPT) {
+            if (requestUrl.contains(url)) {
+                return true
+            }
+        }
+        return false
+    }
+
+    companion object {
+        val DO_NOT_INTERCEPT = listOf(
+            "api.php?format=json&formatversion=2&errorformat=plaintext&action=upload&ignorewarnings=1"
+        )
+        const val ERRORS_PREFIX = "{\"error"
+    }
+}

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

@@ -1,250 +0,0 @@
-package fr.free.nrw.commons;
-
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.text.SpannableString;
-import android.text.style.UnderlineSpan;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.browser.customtabs.CustomTabColorSchemeParams;
-import androidx.browser.customtabs.CustomTabsIntent;
-import androidx.core.content.ContextCompat;
-
-import java.util.Calendar;
-import java.util.Date;
-import fr.free.nrw.commons.wikidata.model.WikiSite;
-import fr.free.nrw.commons.wikidata.model.page.PageTitle;
-
-import java.util.Locale;
-import java.util.regex.Pattern;
-
-import fr.free.nrw.commons.location.LatLng;
-import fr.free.nrw.commons.settings.Prefs;
-import fr.free.nrw.commons.utils.ViewUtil;
-import timber.log.Timber;
-
-public class Utils {
-
-    public static PageTitle getPageTitle(@NonNull String title) {
-        return new PageTitle(title, new WikiSite(BuildConfig.COMMONS_URL));
-    }
-
-    /**
-     * Generates licence name with given ID
-     * @param license License ID
-     * @return Name of license
-     */
-    public static int licenseNameFor(String license) {
-        switch (license) {
-            case Prefs.Licenses.CC_BY_3:
-                return R.string.license_name_cc_by;
-            case Prefs.Licenses.CC_BY_4:
-                return R.string.license_name_cc_by_four;
-            case Prefs.Licenses.CC_BY_SA_3:
-                return R.string.license_name_cc_by_sa;
-            case Prefs.Licenses.CC_BY_SA_4:
-                return R.string.license_name_cc_by_sa_four;
-            case Prefs.Licenses.CC0:
-                return R.string.license_name_cc0;
-        }
-        throw new IllegalStateException("Unrecognized license value: " + license);
-    }
-
-    /**
-     * Generates license url with given ID
-     * @param license License ID
-     * @return Url of license
-     */
-
-
-    @NonNull
-    public static String licenseUrlFor(String license) {
-        switch (license) {
-            case Prefs.Licenses.CC_BY_3:
-                return "https://creativecommons.org/licenses/by/3.0/";
-            case Prefs.Licenses.CC_BY_4:
-                return "https://creativecommons.org/licenses/by/4.0/";
-            case Prefs.Licenses.CC_BY_SA_3:
-                return "https://creativecommons.org/licenses/by-sa/3.0/";
-            case Prefs.Licenses.CC_BY_SA_4:
-                return "https://creativecommons.org/licenses/by-sa/4.0/";
-            case Prefs.Licenses.CC0:
-                return "https://creativecommons.org/publicdomain/zero/1.0/";
-            default:
-                throw new IllegalStateException("Unrecognized license value: " + license);
-        }
-    }
-
-    /**
-     * Adds extension to filename. Converts to .jpg if system provides .jpeg, adds .jpg if no extension detected
-     * @param title File name
-     * @param extension Correct extension
-     * @return File with correct extension
-     */
-    public static String fixExtension(String title, String extension) {
-        Pattern jpegPattern = Pattern.compile("\\.jpeg$", Pattern.CASE_INSENSITIVE);
-
-        // People are used to ".jpg" more than ".jpeg" which the system gives us.
-        if (extension != null && extension.toLowerCase(Locale.ENGLISH).equals("jpeg")) {
-            extension = "jpg";
-        }
-        title = jpegPattern.matcher(title).replaceFirst(".jpg");
-        if (extension != null && !title.toLowerCase(Locale.getDefault())
-                .endsWith("." + extension.toLowerCase(Locale.ENGLISH))) {
-            title += "." + extension;
-        }
-
-        // If extension is still null, make it jpg. (Hotfix for https://github.com/commons-app/apps-android-commons/issues/228)
-        // If title has an extension in it, if won't be true
-        if (extension == null && title.lastIndexOf(".")<=0) {
-           extension = "jpg";
-           title += "." + extension;
-        }
-
-        return title;
-    }
-
-    /**
-     * Launches intent to rate app
-     * @param context
-     */
-    public static void rateApp(Context context) {
-        final String appPackageName = context.getPackageName();
-        try {
-            context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Urls.PLAY_STORE_PREFIX + appPackageName)));
-        }
-        catch (android.content.ActivityNotFoundException anfe) {
-            handleWebUrl(context, Uri.parse(Urls.PLAY_STORE_URL_PREFIX + appPackageName));
-        }
-    }
-
-    /**
-     * Opens Custom Tab Activity with in-app browser for the specified URL.
-     * Launches intent for web URL
-     * @param context
-     * @param url
-     */
-    public static void handleWebUrl(Context context, Uri url) {
-        Timber.d("Launching web url %s", url.toString());
-
-        final CustomTabColorSchemeParams color = new CustomTabColorSchemeParams.Builder()
-            .setToolbarColor(ContextCompat.getColor(context, R.color.primaryColor))
-            .setSecondaryToolbarColor(ContextCompat.getColor(context, R.color.primaryDarkColor))
-            .build();
-
-        CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
-        builder.setDefaultColorSchemeParams(color);
-        builder.setExitAnimations(context, android.R.anim.slide_in_left, android.R.anim.slide_out_right);
-        CustomTabsIntent customTabsIntent = builder.build();
-        // Clear previous browser tasks, so that back/exit buttons work as intended.
-        customTabsIntent.intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        customTabsIntent.launchUrl(context, url);
-    }
-
-    /**
-     * Util function to handle geo coordinates
-     * It no longer depends on google maps and any app capable of handling the map intent can handle it
-     * @param context
-     * @param latLng
-     */
-    public static void handleGeoCoordinates(Context context, LatLng latLng) {
-        Intent mapIntent = new Intent(Intent.ACTION_VIEW, latLng.getGmmIntentUri());
-        if (mapIntent.resolveActivity(context.getPackageManager()) != null) {
-            context.startActivity(mapIntent);
-        } else {
-            ViewUtil.showShortToast(context, context.getString(R.string.map_application_missing));
-        }
-    }
-
-    /**
-     * To take screenshot of the screen and return it in Bitmap format
-     *
-     * @param view
-     * @return
-     */
-    public static Bitmap getScreenShot(View view) {
-        View screenView = view.getRootView();
-        screenView.setDrawingCacheEnabled(true);
-        Bitmap drawingCache = screenView.getDrawingCache();
-        if (drawingCache != null) {
-            Bitmap bitmap = Bitmap.createBitmap(drawingCache);
-            screenView.setDrawingCacheEnabled(false);
-            return bitmap;
-        }
-        return null;
-    }
-
-    /*
-    *Copies the content to the clipboard
-    *
-    */
-    public static void copy(String label,String text, Context context){
-        ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-        ClipData clip = ClipData.newPlainText(label, text);
-        clipboard.setPrimaryClip(clip);
-    }
-
-    /**
-     * This method sets underlined string text to a TextView
-     *
-     * @param textView TextView associated with string resource
-     * @param stringResourceName string resource name
-     * @param context
-     */
-    public static void setUnderlinedText(TextView textView, int stringResourceName, Context context) {
-        SpannableString content = new SpannableString(context.getString(stringResourceName));
-        content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
-        textView.setText(content);
-    }
-
-    /**
-     * For now we are enabling the monuments only when the date lies between 1 Sept & 31 OCt
-     * @param date
-     * @return
-     */
-    public static boolean isMonumentsEnabled(final Date date) {
-        if (date.getMonth() == 8) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Util function to get the start date of wlm monument
-     * For this release we are hardcoding it to be 1st September
-     * @return
-     */
-    public static String getWLMStartDate() {
-        return "1 Sep";
-    }
-
-    /***
-     * Util function to get the end date of wlm monument
-     * For this release we are hardcoding it to be 31st October
-     * @return
-     */
-    public static String getWLMEndDate() {
-        return "30 Sep";
-    }
-
-    /***
-     * Function to get the current WLM year
-     * It increments at the start of September in line with the other WLM functions
-     * (No consideration of locales for now)
-     * @param calendar
-     * @return
-     */
-    public static int getWikiLovesMonumentsYear(Calendar calendar) {
-        int year = calendar.get(Calendar.YEAR);
-        if (calendar.get(Calendar.MONTH) < Calendar.SEPTEMBER) {
-            year -= 1;
-        }
-        return year;
-    }
-}

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

@@ -1,7 +0,0 @@
-package fr.free.nrw.commons;
-
-import android.content.Context;
-
-public interface ViewHolder<T> {
-    void bindModel(Context context, T model);
-}

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

@@ -1,57 +0,0 @@
-package fr.free.nrw.commons;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This adapter will be used to display fragments in a ViewPager
- */
-public class ViewPagerAdapter extends FragmentPagerAdapter {
-    private List<Fragment> fragmentList = new ArrayList<>();
-    private List<String> fragmentTitleList = new ArrayList<>();
-
-    public ViewPagerAdapter(FragmentManager manager) {
-        super(manager);
-    }
-
-    /**
-     * This method returns the fragment of the viewpager at a particular position
-     * @param position
-     */
-    @Override
-    public Fragment getItem(int position) {
-        return fragmentList.get(position);
-    }
-
-    /**
-     * This method returns the total number of fragments in the viewpager.
-     * @return size
-     */
-    @Override
-    public int getCount() {
-        return fragmentList.size();
-    }
-
-    /**
-     * This method sets the fragment and title list in the viewpager
-     * @param fragmentList List of all fragments to be displayed in the viewpager
-     * @param fragmentTitleList List of all titles of the fragments
-     */
-    public void setTabData(List<Fragment> fragmentList, List<String> fragmentTitleList) {
-        this.fragmentList = fragmentList;
-        this.fragmentTitleList = fragmentTitleList;
-    }
-
-    /**
-     * This method returns the title of the page at a particular position
-     * @param position
-     */
-    @Override
-    public CharSequence getPageTitle(int position) {
-        return fragmentTitleList.get(position);
-    }
-}

app/src/main/java/fr/free/nrw/commons/ViewPagerAdapter.kt

@@ -0,0 +1,44 @@
+package fr.free.nrw.commons
+
+import android.content.Context
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentPagerAdapter
+import java.util.Locale
+
+/**
+ * This adapter will be used to display fragments in a ViewPager
+ */
+class ViewPagerAdapter : FragmentPagerAdapter {
+    private val context: Context
+    private var fragmentList: List<Fragment> = emptyList()
+    private var fragmentTitleList: List<String> = emptyList()
+
+    constructor(context: Context, manager: FragmentManager) : super(manager) {
+        this.context = context
+    }
+
+    constructor(context: Context, manager: FragmentManager, behavior: Int) : super(manager, behavior) {
+        this.context = context
+    }
+
+    override fun getItem(position: Int): Fragment = fragmentList[position]
+
+    override fun getPageTitle(position: Int): CharSequence = fragmentTitleList[position]
+
+    override fun getCount(): Int = fragmentList.size
+
+    fun setTabs(vararg titlesToFragments: Pair<Int, Fragment>) {
+        // Enforce that every title must come from strings.xml and all will consistently be uppercase
+        fragmentTitleList = titlesToFragments.map {
+            context.getString(it.first).uppercase(Locale.ROOT)
+        }
+        fragmentList = titlesToFragments.map { it.second }
+    }
+
+    companion object {
+        // Convenience method for Java callers, can be removed when everything is migrated
+        @JvmStatic
+        fun pairOf(first: Int, second: Fragment) = first to second
+    }
+}

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

@@ -1,108 +0,0 @@
-package fr.free.nrw.commons;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import fr.free.nrw.commons.databinding.ActivityWelcomeBinding;
-import fr.free.nrw.commons.databinding.PopupForCopyrightBinding;
-import fr.free.nrw.commons.quiz.QuizActivity;
-import fr.free.nrw.commons.theme.BaseActivity;
-import fr.free.nrw.commons.utils.ConfigUtils;
-
-public class WelcomeActivity extends BaseActivity {
-
-    private ActivityWelcomeBinding binding;
-    private PopupForCopyrightBinding copyrightBinding;
-
-    private final WelcomePagerAdapter adapter = new WelcomePagerAdapter();
-    private boolean isQuiz;
-    private AlertDialog.Builder dialogBuilder;
-    private AlertDialog dialog;
-
-    /**
-     * Initialises exiting fields and dependencies
-     *
-     * @param savedInstanceState WelcomeActivity bundled data
-     */
-    @Override
-    public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        binding = ActivityWelcomeBinding.inflate(getLayoutInflater());
-        final View view = binding.getRoot();
-        setContentView(view);
-
-        if (getIntent() != null) {
-            final Bundle bundle = getIntent().getExtras();
-            if (bundle != null) {
-                isQuiz = bundle.getBoolean("isQuiz");
-            }
-        } else {
-            isQuiz = false;
-        }
-
-        // Enable skip button if beta flavor
-        if (ConfigUtils.isBetaFlavour()) {
-            binding.finishTutorialButton.setVisibility(View.VISIBLE);
-
-            dialogBuilder = new AlertDialog.Builder(this);
-            copyrightBinding = PopupForCopyrightBinding.inflate(getLayoutInflater());
-            final View contactPopupView = copyrightBinding.getRoot();
-            dialogBuilder.setView(contactPopupView);
-            dialog = dialogBuilder.create();
-            dialog.show();
-
-            copyrightBinding.buttonOk.setOnClickListener(v -> dialog.dismiss());
-        }
-
-        binding.welcomePager.setAdapter(adapter);
-        binding.welcomePagerIndicator.setViewPager(binding.welcomePager);
-
-        binding.finishTutorialButton.setOnClickListener(v -> finishTutorial());
-
-    }
-
-    /**
-     * References WelcomePageAdapter to null before the activity is destroyed
-     */
-    @Override
-    public void onDestroy() {
-        if (isQuiz) {
-            final Intent i = new Intent(this, QuizActivity.class);
-            startActivity(i);
-        }
-        super.onDestroy();
-    }
-
-    /**
-     * Creates a way to change current activity to WelcomeActivity
-     *
-     * @param context Activity context
-     */
-    public static void startYourself(final Context context) {
-        final Intent welcomeIntent = new Intent(context, WelcomeActivity.class);
-        context.startActivity(welcomeIntent);
-    }
-
-    /**
-     * Override onBackPressed() to go to previous tutorial 'pages' if not on first page
-     */
-    @Override
-    public void onBackPressed() {
-        if (binding.welcomePager.getCurrentItem() != 0) {
-            binding.welcomePager.setCurrentItem(binding.welcomePager.getCurrentItem() - 1, true);
-        } else {
-            if (defaultKvStore.getBoolean("firstrun", true)) {
-                finishAffinity();
-            } else {
-                super.onBackPressed();
-            }
-        }
-    }
-
-    public void finishTutorial() {
-        defaultKvStore.putBoolean("firstrun", false);
-        finish();
-    }
-}

app/src/main/java/fr/free/nrw/commons/WelcomeActivity.kt

@@ -0,0 +1,80 @@
+package fr.free.nrw.commons
+
+import android.app.AlertDialog
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import fr.free.nrw.commons.databinding.ActivityWelcomeBinding
+import fr.free.nrw.commons.databinding.PopupForCopyrightBinding
+import fr.free.nrw.commons.quiz.QuizActivity
+import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.applyEdgeToEdgeAllInsets
+import fr.free.nrw.commons.utils.ConfigUtils.isBetaFlavour
+
+class WelcomeActivity : BaseActivity() {
+    private var binding: ActivityWelcomeBinding? = null
+    private var isQuiz = false
+
+    /**
+     * Initialises exiting fields and dependencies
+     *
+     * @param savedInstanceState WelcomeActivity bundled data
+     */
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityWelcomeBinding.inflate(layoutInflater)
+        applyEdgeToEdgeAllInsets(binding!!.welcomePager.rootView)
+        setContentView(binding!!.root)
+
+        isQuiz = intent?.extras?.getBoolean("isQuiz", false) ?: false
+
+        // Enable skip button if beta flavor
+        if (isBetaFlavour) {
+            binding!!.finishTutorialButton.visibility = View.VISIBLE
+
+            val copyrightBinding = PopupForCopyrightBinding.inflate(layoutInflater)
+
+            val dialog = AlertDialog.Builder(this)
+                .setView(copyrightBinding.root)
+                .setCancelable(false)
+                .create()
+            dialog.show()
+
+            copyrightBinding.buttonOk.setOnClickListener { v: View? -> dialog.dismiss() }
+        }
+
+        val adapter = WelcomePagerAdapter()
+        binding!!.welcomePager.adapter = adapter
+        binding!!.welcomePagerIndicator.setViewPager(binding!!.welcomePager)
+        binding!!.finishTutorialButton.setOnClickListener { v: View? -> finishTutorial() }
+    }
+
+    public override fun onDestroy() {
+        if (isQuiz) {
+            startActivity(Intent(this, QuizActivity::class.java))
+        }
+        super.onDestroy()
+    }
+
+    override fun onBackPressed() {
+        if (binding!!.welcomePager.currentItem != 0) {
+            binding!!.welcomePager.setCurrentItem(binding!!.welcomePager.currentItem - 1, true)
+        } else {
+            if (defaultKvStore.getBoolean("firstrun", true)) {
+                finishAffinity()
+            } else {
+                super.onBackPressed()
+            }
+        }
+    }
+
+    fun finishTutorial() {
+        defaultKvStore.putBoolean("firstrun", false)
+        finish()
+    }
+}
+
+fun Context.startWelcome() {
+    startActivity(Intent(this, WelcomeActivity::class.java))
+}

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

@@ -1,74 +0,0 @@
-package fr.free.nrw.commons;
-
-import android.net.Uri;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.viewpager.widget.PagerAdapter;
-
-public class WelcomePagerAdapter extends PagerAdapter {
-    private static final int[] PAGE_LAYOUTS = new int[]{
-            R.layout.welcome_wikipedia,
-            R.layout.welcome_do_upload,
-            R.layout.welcome_dont_upload,
-            R.layout.welcome_image_example,
-            R.layout.welcome_final
-    };
-
-    /**
-     * Gets total number of layouts
-     * @return Number of layouts
-     */
-    @Override
-    public int getCount() {
-        return PAGE_LAYOUTS.length;
-    }
-
-    /**
-     * Compares given view with provided object
-     * @param view Adapter view
-     * @param object Adapter object
-     * @return Equality between view and object
-     */
-    @Override
-    public boolean isViewFromObject(View view, Object object) {
-        return (view == object);
-    }
-
-    @Override
-    public Object instantiateItem(ViewGroup container, int position) {
-        LayoutInflater inflater = LayoutInflater.from(container.getContext());
-        ViewGroup layout = (ViewGroup) inflater.inflate(PAGE_LAYOUTS[position], container, false);
-
-        // If final page
-        if (position == PAGE_LAYOUTS.length - 1) {
-            // Add link to more information
-            TextView moreInfo = layout.findViewById(R.id.welcomeInfo);
-            Utils.setUnderlinedText(moreInfo, R.string.welcome_help_button_text, container.getContext());
-            moreInfo.setOnClickListener(view -> Utils.handleWebUrl(
-                    container.getContext(),
-                    Uri.parse("https://commons.wikimedia.org/wiki/Help:Contents")
-            ));
-
-            // Handle click of finishTutorialButton ("YES!" button) inside layout
-            layout.findViewById(R.id.finishTutorialButton)
-                    .setOnClickListener(view -> ((WelcomeActivity) container.getContext()).finishTutorial());
-        }
-
-        container.addView(layout);
-        return layout;
-    }
-
-    /**
-     * Provides a way to remove an item from container
-     * @param container Adapter view group container
-     * @param position Index of item
-     * @param obj Adapter object
-     */
-    @Override
-    public void destroyItem(ViewGroup container, int position, Object obj) {
-        container.removeView((View) obj);
-    }
-}

app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.kt

@@ -0,0 +1,70 @@
+package fr.free.nrw.commons
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.core.net.toUri
+import androidx.viewpager.widget.PagerAdapter
+import fr.free.nrw.commons.utils.UnderlineUtils.setUnderlinedText
+import fr.free.nrw.commons.utils.handleWebUrl
+
+class WelcomePagerAdapter : PagerAdapter() {
+    /**
+     * Gets total number of layouts
+     * @return Number of layouts
+     */
+    override fun getCount(): Int = PAGE_LAYOUTS.size
+
+    /**
+     * Compares given view with provided object
+     * @param view Adapter view
+     * @param obj Adapter object
+     * @return Equality between view and object
+     */
+    override fun isViewFromObject(view: View, obj: Any): Boolean = (view === obj)
+
+    /**
+     * Provides a way to remove an item from container
+     * @param container Adapter view group container
+     * @param position Index of item
+     * @param obj Adapter object
+     */
+    override fun destroyItem(container: ViewGroup, position: Int, obj: Any) =
+        container.removeView(obj as View)
+
+    override fun instantiateItem(container: ViewGroup, position: Int): Any {
+        val inflater = LayoutInflater.from(container.context)
+        val layout = inflater.inflate(PAGE_LAYOUTS[position], container, false) as ViewGroup
+
+        // If final page
+        if (position == PAGE_LAYOUTS.size - 1) {
+            // Add link to more information
+            val moreInfo = layout.findViewById<TextView>(R.id.welcomeInfo)
+            setUnderlinedText(moreInfo, R.string.welcome_help_button_text)
+            moreInfo.setOnClickListener {
+                handleWebUrl(
+                    container.context,
+                    "https://commons.wikimedia.org/wiki/Help:Contents".toUri()
+                )
+            }
+
+            // Handle click of finishTutorialButton ("YES!" button) inside layout
+            layout.findViewById<View>(R.id.finishTutorialButton)
+                .setOnClickListener { view: View? -> (container.context as WelcomeActivity).finishTutorial() }
+        }
+
+        container.addView(layout)
+        return layout
+    }
+
+    companion object {
+        private val PAGE_LAYOUTS = intArrayOf(
+            R.layout.welcome_wikipedia,
+            R.layout.welcome_do_upload,
+            R.layout.welcome_dont_upload,
+            R.layout.welcome_image_example,
+            R.layout.welcome_final
+        )
+    }
+}

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

@@ -129,9 +129,10 @@ interface PageEditInterface {
     ): Observable<Entities>
 
     /**
-     * Get wiki text for provided file names
-     * @param titles : Name of the file
-     * @return Single<MwQueryResult>
+     * Gets the wiki text for the provided file name.
+     *
+     * @param title The title (name) of the file to fetch wiki text for.
+     * @return A Single emitting the wiki query response.
      */
     @GET(MW_API_PREFIX + "action=query&prop=revisions&rvprop=content|timestamp&rvlimit=1&converttitles=")
     fun getWikiText(

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

@@ -3,7 +3,7 @@ package fr.free.nrw.commons.actions
 import fr.free.nrw.commons.CommonsApplication
 import fr.free.nrw.commons.auth.csrf.CsrfTokenClient
 import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException
-import fr.free.nrw.commons.di.NetworkingModule.NAMED_COMMONS_CSRF
+import fr.free.nrw.commons.di.NetworkingModule.Companion.NAMED_COMMONS_CSRF
 import io.reactivex.Observable
 import javax.inject.Inject
 import javax.inject.Named

app/src/main/java/fr/free/nrw/commons/activity/SingleWebViewActivity.kt

@@ -0,0 +1,218 @@
+package fr.free.nrw.commons.activity
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.webkit.ConsoleMessage
+import android.webkit.CookieManager
+import android.webkit.WebChromeClient
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.viewinterop.AndroidView
+import fr.free.nrw.commons.CommonsApplication
+import fr.free.nrw.commons.CommonsApplication.ActivityLogoutListener
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.di.ApplicationlessInjection
+import fr.free.nrw.commons.wikidata.cookies.CommonsCookieJar
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import timber.log.Timber
+import javax.inject.Inject
+
+/**
+ * SingleWebViewActivity is a reusable activity webView based on a given url(initial url) and
+ * closes itself when a specified success URL is reached to success url.
+ */
+class SingleWebViewActivity : ComponentActivity() {
+    @Inject
+    lateinit var cookieJar: CommonsCookieJar
+
+    @OptIn(ExperimentalMaterial3Api::class)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val url = intent.getStringExtra(VANISH_ACCOUNT_URL)
+        val successUrl = intent.getStringExtra(VANISH_ACCOUNT_SUCCESS_URL)
+        if (url == null || successUrl == null) {
+            finish()
+            return
+        }
+        ApplicationlessInjection
+            .getInstance(applicationContext)
+            .commonsApplicationComponent
+            .inject(this)
+        setCookies(url)
+        enableEdgeToEdge()
+        setContent {
+            Scaffold(
+                topBar = {
+                    TopAppBar(
+                        modifier = Modifier,
+                        title = { Text(getString(R.string.vanish_account)) },
+                        navigationIcon = {
+                            IconButton(
+                                onClick = {
+                                    // Close the WebView Activity if the user taps the back button
+                                    finish()
+                                },
+                            ) {
+                                Icon(
+                                    imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                                    // TODO("Add contentDescription)
+                                    contentDescription = ""
+                                )
+                            }
+                        }
+                    )
+                },
+                content = {
+                    WebViewComponent(
+                        url = url,
+                        successUrl = successUrl,
+                        onSuccess = {
+                            //Redirect the user to login screen like we do when the user logout's
+                            val app = applicationContext as CommonsApplication
+                            app.clearApplicationData(
+                                applicationContext,
+                                ActivityLogoutListener(activity = this, ctx = applicationContext)
+                            )
+                            finish()
+                        },
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(it)
+                    )
+                }
+            )
+        }
+    }
+
+
+    /**
+     * @param url The initial URL which we are loading in the WebView.
+     * @param successUrl The URL that, when reached, triggers the `onSuccess` callback.
+     * @param onSuccess A callback that is invoked when the current url of webView is successUrl.
+     * This is used when we want to close when the webView once a success url is hit.
+     * @param modifier An optional [Modifier] to customize the layout or appearance of the WebView.
+     */
+    @SuppressLint("SetJavaScriptEnabled")
+    @Composable
+    private fun WebViewComponent(
+        url: String,
+        successUrl: String,
+        onSuccess: () -> Unit,
+        modifier: Modifier = Modifier
+    ) {
+        val webView = remember { mutableStateOf<WebView?>(null) }
+        AndroidView(
+            modifier = modifier,
+            factory = {
+                WebView(it).apply {
+                    settings.apply {
+                        javaScriptEnabled = true
+                        domStorageEnabled = true
+                        javaScriptCanOpenWindowsAutomatically = true
+
+                    }
+                    webViewClient = object : WebViewClient() {
+                        override fun shouldOverrideUrlLoading(
+                            view: WebView?,
+                            request: WebResourceRequest?
+                        ): Boolean {
+
+                            request?.url?.let { url ->
+                                Timber.d("URL Loading: $url")
+                                if (url.toString() == successUrl) {
+                                    Timber.d("Success URL detected. Closing WebView.")
+                                    onSuccess() // Close the activity
+                                    return true
+                                }
+                                return false
+                            }
+                            return false
+                        }
+
+                        override fun onPageFinished(view: WebView?, url: String?) {
+                            super.onPageFinished(view, url)
+                            setCookies(url.orEmpty())
+                        }
+
+                    }
+
+                    webChromeClient = object : WebChromeClient() {
+                        override fun onConsoleMessage(message: ConsoleMessage): Boolean {
+                            Timber.d("%s%s",
+                                "Console: ${message.message()} -- From line ",
+                                "${message.lineNumber()} of ${message.sourceId()}")
+                            return true
+                        }
+                    }
+
+                    loadUrl(url)
+                }
+            },
+            update = {
+                webView.value = it
+            }
+        )
+
+    }
+
+    /**
+     * Sets cookies for the given URL using the cookies stored in the `CommonsCookieJar`.
+     *
+     * @param url The URL for which cookies need to be set.
+     */
+    private fun setCookies(url: String) {
+        CookieManager.getInstance().let {
+            val cookies = cookieJar.loadForRequest(url.toHttpUrl())
+            for (cookie in cookies) {
+                it.setCookie(url, cookie.toString())
+            }
+        }
+    }
+
+    companion object {
+        private const val VANISH_ACCOUNT_URL = "VanishAccountUrl"
+        private const val VANISH_ACCOUNT_SUCCESS_URL = "vanishAccountSuccessUrl"
+
+        /**
+         * Launch the WebViewActivity with the specified URL and success URL.
+         * @param context The context from which the activity is launched.
+         * @param url The initial URL to load in the WebView.
+         * @param successUrl The URL that triggers the WebView to close when matched.
+         */
+        fun showWebView(
+            context: Context,
+            url: String,
+            successUrl: String
+        ) {
+            val intent = Intent(
+                context,
+                SingleWebViewActivity::class.java
+            ).apply {
+                putExtra(VANISH_ACCOUNT_URL, url)
+                putExtra(VANISH_ACCOUNT_SUCCESS_URL, successUrl)
+            }
+            context.startActivity(intent)
+        }
+    }
+}
+

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

@@ -1,44 +0,0 @@
-package fr.free.nrw.commons.auth;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.content.Context;
-
-import androidx.annotation.Nullable;
-
-import fr.free.nrw.commons.BuildConfig;
-import timber.log.Timber;
-
-public class AccountUtil {
-
-    public static final String AUTH_TOKEN_TYPE = "CommonsAndroid";
-
-    public AccountUtil() {
-    }
-
-    /**
-     * @return Account|null
-     */
-    @Nullable
-    public static Account account(Context context) {
-        try {
-            Account[] accounts = accountManager(context).getAccountsByType(BuildConfig.ACCOUNT_TYPE);
-            if (accounts.length > 0) {
-                return accounts[0];
-            }
-        } catch (SecurityException e) {
-            Timber.e(e);
-        }
-        return null;
-    }
-
-    @Nullable
-    public static String getUserName(Context context) {
-        Account account = account(context);
-        return account == null ? null : account.name;
-    }
-
-    private static AccountManager accountManager(Context context) {
-        return AccountManager.get(context);
-    }
-}

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

@@ -0,0 +1,24 @@
+package fr.free.nrw.commons.auth
+
+import android.accounts.Account
+import android.accounts.AccountManager
+import android.content.Context
+import androidx.annotation.VisibleForTesting
+import fr.free.nrw.commons.BuildConfig.ACCOUNT_TYPE
+import timber.log.Timber
+
+const val AUTH_TOKEN_TYPE: String = "CommonsAndroid"
+
+fun getUserName(context: Context): String? {
+    return account(context)?.name
+}
+
+@VisibleForTesting
+fun account(context: Context): Account? = try {
+    val accountManager = AccountManager.get(context)
+    val accounts = accountManager.getAccountsByType(ACCOUNT_TYPE)
+    if (accounts.isNotEmpty()) accounts[0] else null
+} catch (e: SecurityException) {
+    Timber.e(e)
+    null
+}

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

@@ -1,456 +0,0 @@
-package fr.free.nrw.commons.auth;
-
-import android.accounts.AccountAuthenticatorActivity;
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.KeyEvent;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
-
-import android.widget.TextView;
-import androidx.annotation.ColorRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.core.app.NavUtils;
-import androidx.core.content.ContextCompat;
-import fr.free.nrw.commons.auth.login.LoginClient;
-import fr.free.nrw.commons.auth.login.LoginResult;
-import fr.free.nrw.commons.databinding.ActivityLoginBinding;
-import fr.free.nrw.commons.utils.ActivityUtils;
-import java.util.Locale;
-import fr.free.nrw.commons.auth.login.LoginCallback;
-
-import java.util.Objects;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import fr.free.nrw.commons.BuildConfig;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.contributions.MainActivity;
-import fr.free.nrw.commons.di.ApplicationlessInjection;
-import fr.free.nrw.commons.kvstore.JsonKvStore;
-import fr.free.nrw.commons.utils.ConfigUtils;
-import fr.free.nrw.commons.utils.SystemThemeUtils;
-import fr.free.nrw.commons.utils.ViewUtil;
-import io.reactivex.disposables.CompositeDisposable;
-import timber.log.Timber;
-
-import static android.view.KeyEvent.KEYCODE_ENTER;
-import static android.view.View.VISIBLE;
-import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
-import static fr.free.nrw.commons.CommonsApplication.LOGIN_MESSAGE_INTENT_KEY;
-import static fr.free.nrw.commons.CommonsApplication.LOGIN_USERNAME_INTENT_KEY;
-
-public class LoginActivity extends AccountAuthenticatorActivity {
-
-    @Inject
-    SessionManager sessionManager;
-
-    @Inject
-    @Named("default_preferences")
-    JsonKvStore applicationKvStore;
-
-    @Inject
-    LoginClient loginClient;
-
-    @Inject
-    SystemThemeUtils systemThemeUtils;
-
-    private ActivityLoginBinding binding;
-    ProgressDialog progressDialog;
-    private AppCompatDelegate delegate;
-    private LoginTextWatcher textWatcher = new LoginTextWatcher();
-    private CompositeDisposable compositeDisposable = new CompositeDisposable();
-    final  String saveProgressDailog="ProgressDailog_state";
-    final String saveErrorMessage ="errorMessage";
-    final String saveUsername="username";
-    final  String savePassword="password";
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ApplicationlessInjection
-                .getInstance(this.getApplicationContext())
-                .getCommonsApplicationComponent()
-                .inject(this);
-
-        boolean isDarkTheme = systemThemeUtils.isDeviceInNightMode();
-        setTheme(isDarkTheme ? R.style.DarkAppTheme : R.style.LightAppTheme);
-        getDelegate().installViewFactory();
-        getDelegate().onCreate(savedInstanceState);
-
-        binding = ActivityLoginBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-
-        String message = getIntent().getStringExtra(LOGIN_MESSAGE_INTENT_KEY);
-        String username = getIntent().getStringExtra(LOGIN_USERNAME_INTENT_KEY);
-
-        binding.loginUsername.addTextChangedListener(textWatcher);
-        binding.loginPassword.addTextChangedListener(textWatcher);
-        binding.loginTwoFactor.addTextChangedListener(textWatcher);
-
-        binding.skipLogin.setOnClickListener(view -> skipLogin());
-        binding.forgotPassword.setOnClickListener(view -> forgotPassword());
-        binding.aboutPrivacyPolicy.setOnClickListener(view -> onPrivacyPolicyClicked());
-        binding.signUpButton.setOnClickListener(view -> signUp());
-        binding.loginButton.setOnClickListener(view -> performLogin());
-
-        binding.loginPassword.setOnEditorActionListener(this::onEditorAction);
-        binding.loginPassword.setOnFocusChangeListener(this::onPasswordFocusChanged);
-
-        if (ConfigUtils.isBetaFlavour()) {
-            binding.loginCredentials.setText(getString(R.string.login_credential));
-        } else {
-            binding.loginCredentials.setVisibility(View.GONE);
-        }
-        if (message != null) {
-            showMessage(message, R.color.secondaryDarkColor);
-        }
-        if (username != null) {
-            binding.loginUsername.setText(username);
-        }
-    }
-    /**
-     * Hides the keyboard if the user's focus is not on the password (hasFocus is false).
-     * @param view The keyboard
-     * @param hasFocus Set to true if the keyboard has focus
-     */
-    void onPasswordFocusChanged(View view, boolean hasFocus) {
-        if (!hasFocus) {
-            ViewUtil.hideKeyboard(view);
-        }
-    }
-
-    boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
-        if (binding.loginButton.isEnabled()) {
-            if (actionId == IME_ACTION_DONE) {
-                performLogin();
-                return true;
-            } else if ((keyEvent != null) && keyEvent.getKeyCode() == KEYCODE_ENTER) {
-                performLogin();
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    protected void skipLogin() {
-        new AlertDialog.Builder(this).setTitle(R.string.skip_login_title)
-                .setMessage(R.string.skip_login_message)
-                .setCancelable(false)
-                .setPositiveButton(R.string.yes, (dialog, which) -> {
-                    dialog.cancel();
-                    performSkipLogin();
-                })
-                .setNegativeButton(R.string.no, (dialog, which) -> dialog.cancel())
-                .show();
-    }
-
-    protected void forgotPassword() {
-        Utils.handleWebUrl(this, Uri.parse(BuildConfig.FORGOT_PASSWORD_URL));
-    }
-
-    protected void onPrivacyPolicyClicked() {
-        Utils.handleWebUrl(this, Uri.parse(BuildConfig.PRIVACY_POLICY_URL));
-    }
-
-    protected void signUp() {
-        Intent intent = new Intent(this, SignupActivity.class);
-        startActivity(intent);
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        getDelegate().onPostCreate(savedInstanceState);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        if (sessionManager.getCurrentAccount() != null
-                && sessionManager.isUserLoggedIn()) {
-            applicationKvStore.putBoolean("login_skipped", false);
-            startMainActivity();
-        }
-
-        if (applicationKvStore.getBoolean("login_skipped", false)) {
-            performSkipLogin();
-        }
-
-    }
-
-    @Override
-    protected void onDestroy() {
-        compositeDisposable.clear();
-        try {
-            // To prevent leaked window when finish() is called, see http://stackoverflow.com/questions/32065854/activity-has-leaked-window-at-alertdialog-show-method
-            if (progressDialog != null && progressDialog.isShowing()) {
-                progressDialog.dismiss();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        binding.loginUsername.removeTextChangedListener(textWatcher);
-        binding.loginPassword.removeTextChangedListener(textWatcher);
-        binding.loginTwoFactor.removeTextChangedListener(textWatcher);
-        delegate.onDestroy();
-        if(null!=loginClient) {
-            loginClient.cancel();
-        }
-        binding = null;
-        super.onDestroy();
-    }
-
-    public void performLogin() {
-        Timber.d("Login to start!");
-        final String username = Objects.requireNonNull(binding.loginUsername.getText()).toString();
-        final String password = Objects.requireNonNull(binding.loginPassword.getText()).toString();
-        final String twoFactorCode = Objects.requireNonNull(binding.loginTwoFactor.getText()).toString();
-
-        showLoggingProgressBar();
-        loginClient.doLogin(username, password, twoFactorCode, Locale.getDefault().getLanguage(),
-            new LoginCallback() {
-                @Override
-                public void success(@NonNull LoginResult loginResult) {
-                    runOnUiThread(()->{
-                        Timber.d("Login Success");
-                        hideProgress();
-                        onLoginSuccess(loginResult);
-                    });
-                }
-
-                @Override
-                public void twoFactorPrompt(@NonNull Throwable caught, @Nullable String token) {
-                    runOnUiThread(()->{
-                        Timber.d("Requesting 2FA prompt");
-                        hideProgress();
-                        askUserForTwoFactorAuth();
-                    });
-                }
-
-                @Override
-                public void passwordResetPrompt(@Nullable String token) {
-                    runOnUiThread(()->{
-                        Timber.d("Showing password reset prompt");
-                        hideProgress();
-                        showPasswordResetPrompt();
-                    });
-                }
-
-                @Override
-                public void error(@NonNull Throwable caught) {
-                    runOnUiThread(()->{
-                        Timber.e(caught);
-                        hideProgress();
-                        showMessageAndCancelDialog(caught.getLocalizedMessage());
-                    });
-                }
-            });
-    }
-
-
-
-    private void hideProgress() {
-        progressDialog.dismiss();
-    }
-
-    private void showPasswordResetPrompt() {
-        showMessageAndCancelDialog(getString(R.string.you_must_reset_your_passsword));
-    }
-
-
-    /**
-     * This function is called when user skips the login.
-     * It redirects the user to Explore Activity.
-     */
-    private void performSkipLogin() {
-        applicationKvStore.putBoolean("login_skipped", true);
-        MainActivity.startYourself(this);
-        finish();
-    }
-
-    private void showLoggingProgressBar() {
-        progressDialog = new ProgressDialog(this);
-        progressDialog.setIndeterminate(true);
-        progressDialog.setTitle(getString(R.string.logging_in_title));
-        progressDialog.setMessage(getString(R.string.logging_in_message));
-        progressDialog.setCanceledOnTouchOutside(false);
-        progressDialog.show();
-    }
-
-    private void onLoginSuccess(LoginResult loginResult) {
-        compositeDisposable.clear();
-        sessionManager.setUserLoggedIn(true);
-        sessionManager.updateAccount(loginResult);
-        progressDialog.dismiss();
-        showSuccessAndDismissDialog();
-        startMainActivity();
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        delegate.onStart();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        delegate.onStop();
-    }
-
-    @Override
-    protected void onPostResume() {
-        super.onPostResume();
-        getDelegate().onPostResume();
-    }
-
-    @Override
-    public void setContentView(View view, ViewGroup.LayoutParams params) {
-        getDelegate().setContentView(view, params);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                NavUtils.navigateUpFromSameTask(this);
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    @NonNull
-    public MenuInflater getMenuInflater() {
-        return getDelegate().getMenuInflater();
-    }
-
-    public void askUserForTwoFactorAuth() {
-        progressDialog.dismiss();
-        binding.twoFactorContainer.setVisibility(VISIBLE);
-        binding.loginTwoFactor.setVisibility(VISIBLE);
-        binding.loginTwoFactor.requestFocus();
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY);
-        showMessageAndCancelDialog(R.string.login_failed_2fa_needed);
-    }
-
-    public void showMessageAndCancelDialog(@StringRes int resId) {
-        showMessage(resId, R.color.secondaryDarkColor);
-        if (progressDialog != null) {
-            progressDialog.cancel();
-        }
-    }
-
-    public void showMessageAndCancelDialog(String error) {
-        showMessage(error, R.color.secondaryDarkColor);
-        if (progressDialog != null) {
-            progressDialog.cancel();
-        }
-    }
-
-    public void showSuccessAndDismissDialog() {
-        showMessage(R.string.login_success, R.color.primaryDarkColor);
-        progressDialog.dismiss();
-    }
-
-    public void startMainActivity() {
-        ActivityUtils.startActivityWithFlags(this, MainActivity.class, Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        finish();
-    }
-
-    private void showMessage(@StringRes int resId, @ColorRes int colorResId) {
-        binding.errorMessage.setText(getString(resId));
-        binding.errorMessage.setTextColor(ContextCompat.getColor(this, colorResId));
-        binding.errorMessageContainer.setVisibility(VISIBLE);
-    }
-
-    private void showMessage(String message, @ColorRes int colorResId) {
-        binding.errorMessage.setText(message);
-        binding.errorMessage.setTextColor(ContextCompat.getColor(this, colorResId));
-        binding.errorMessageContainer.setVisibility(VISIBLE);
-    }
-
-    private AppCompatDelegate getDelegate() {
-        if (delegate == null) {
-            delegate = AppCompatDelegate.create(this, null);
-        }
-        return delegate;
-    }
-
-    private class LoginTextWatcher implements TextWatcher {
-        @Override
-        public void beforeTextChanged(CharSequence charSequence, int start, int count, int after) {
-        }
-
-        @Override
-        public void onTextChanged(CharSequence charSequence, int start, int count, int after) {
-        }
-
-        @Override
-        public void afterTextChanged(Editable editable) {
-            boolean enabled = binding.loginUsername.getText().length() != 0 &&
-                binding.loginPassword.getText().length() != 0 &&
-                (BuildConfig.DEBUG || binding.loginTwoFactor.getText().length() != 0 ||
-                    binding.loginTwoFactor.getVisibility() != VISIBLE);
-            binding.loginButton.setEnabled(enabled);
-        }
-    }
-
-    public static void startYourself(Context context) {
-        Intent intent = new Intent(context, LoginActivity.class);
-        context.startActivity(intent);
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        // if progressDialog is visible during the configuration change  then store state as  true else false so that
-        // we maintain visibility of progressDailog after configuration change
-        if(progressDialog!=null&&progressDialog.isShowing()) {
-            outState.putBoolean(saveProgressDailog,true);
-        } else {
-            outState.putBoolean(saveProgressDailog,false);
-        }
-        outState.putString(saveErrorMessage,binding.errorMessage.getText().toString()); //Save the errorMessage
-        outState.putString(saveUsername,getUsername()); // Save the username
-        outState.putString(savePassword,getPassword()); // Save the password
-    }
-    private String getUsername() {
-        return binding.loginUsername.getText().toString();
-    }
-    private String getPassword(){
-        return  binding.loginPassword.getText().toString();
-  }
-
-    @Override
-    protected void onRestoreInstanceState(final Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        binding.loginUsername.setText(savedInstanceState.getString(saveUsername));
-        binding.loginPassword.setText(savedInstanceState.getString(savePassword));
-        if(savedInstanceState.getBoolean(saveProgressDailog)) {
-            performLogin();
-        }
-        String errorMessage=savedInstanceState.getString(saveErrorMessage);
-        if(sessionManager.isUserLoggedIn()) {
-            showMessage(R.string.login_success, R.color.primaryDarkColor);
-        } else {
-            showMessage(errorMessage, R.color.secondaryDarkColor);
-        }
-    }
-}

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

@@ -0,0 +1,489 @@
+package fr.free.nrw.commons.auth
+
+import android.accounts.AccountAuthenticatorActivity
+import android.app.ProgressDialog
+import android.content.Context
+import android.content.DialogInterface
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
+import android.widget.TextView
+import androidx.annotation.ColorRes
+import androidx.annotation.StringRes
+import androidx.annotation.VisibleForTesting
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.app.NavUtils
+import androidx.core.content.ContextCompat
+import androidx.core.view.WindowCompat
+import fr.free.nrw.commons.BuildConfig
+import fr.free.nrw.commons.CommonsApplication
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.auth.login.LoginCallback
+import fr.free.nrw.commons.auth.login.LoginClient
+import fr.free.nrw.commons.auth.login.LoginResult
+import fr.free.nrw.commons.contributions.MainActivity
+import fr.free.nrw.commons.databinding.ActivityLoginBinding
+import fr.free.nrw.commons.di.ApplicationlessInjection
+import fr.free.nrw.commons.kvstore.JsonKvStore
+import fr.free.nrw.commons.utils.applyEdgeToEdgeAllInsets
+import fr.free.nrw.commons.utils.AbstractTextWatcher
+import fr.free.nrw.commons.utils.ActivityUtils.startActivityWithFlags
+import fr.free.nrw.commons.utils.ConfigUtils.isBetaFlavour
+import fr.free.nrw.commons.utils.SystemThemeUtils
+import fr.free.nrw.commons.utils.ViewUtil.hideKeyboard
+import fr.free.nrw.commons.utils.handleKeyboardInsets
+import fr.free.nrw.commons.utils.handleWebUrl
+import io.reactivex.disposables.CompositeDisposable
+import timber.log.Timber
+import java.util.Locale
+import javax.inject.Inject
+import javax.inject.Named
+
+class LoginActivity : AccountAuthenticatorActivity() {
+    @Inject
+    lateinit var sessionManager: SessionManager
+
+    @Inject
+    @field:Named("default_preferences")
+    lateinit var applicationKvStore: JsonKvStore
+
+    @Inject
+    lateinit var loginClient: LoginClient
+
+    @Inject
+    lateinit var systemThemeUtils: SystemThemeUtils
+
+    private var binding: ActivityLoginBinding? = null
+    private var progressDialog: ProgressDialog? = null
+    private val textWatcher = AbstractTextWatcher(::onTextChanged)
+    private val compositeDisposable = CompositeDisposable()
+    private val delegate: AppCompatDelegate by lazy {
+        AppCompatDelegate.create(this, null)
+    }
+    private var lastLoginResult: LoginResult? = null
+
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        ApplicationlessInjection
+            .getInstance(this.applicationContext)
+            .commonsApplicationComponent
+            .inject(this)
+
+        val isDarkTheme = systemThemeUtils.isDeviceInNightMode()
+        setTheme(if (isDarkTheme) R.style.DarkAppTheme else R.style.LightAppTheme)
+        delegate.installViewFactory()
+        delegate.onCreate(savedInstanceState)
+
+        WindowCompat.getInsetsController(window, window.decorView)
+            .isAppearanceLightStatusBars = !isDarkTheme
+
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        binding = ActivityLoginBinding.inflate(layoutInflater)
+        applyEdgeToEdgeAllInsets(binding!!.root)
+        binding!!.root.handleKeyboardInsets()
+        with(binding!!) {
+            setContentView(root)
+
+            loginUsername.addTextChangedListener(textWatcher)
+            loginPassword.addTextChangedListener(textWatcher)
+            loginTwoFactor.addTextChangedListener(textWatcher)
+
+            skipLogin.setOnClickListener { skipLogin() }
+            forgotPassword.setOnClickListener { forgotPassword() }
+            aboutPrivacyPolicy.setOnClickListener { onPrivacyPolicyClicked() }
+            signUpButton.setOnClickListener { signUp() }
+            loginButton.setOnClickListener { performLogin() }
+            loginPassword.setOnEditorActionListener { textView, actionId, keyEvent ->
+                if (binding!!.loginButton.isEnabled && isTriggerAction(actionId, keyEvent)) {
+                    if (actionId == EditorInfo.IME_ACTION_NEXT && lastLoginResult != null) {
+                        askUserForTwoFactorAuthWithKeyboard()
+                        true
+                    } else {
+                        performLogin()
+                        true
+                    }
+                } else {
+                    false
+                }
+            }
+
+            loginPassword.onFocusChangeListener =
+                View.OnFocusChangeListener(::onPasswordFocusChanged)
+
+            if (isBetaFlavour) {
+                loginCredentials.text = getString(R.string.login_credential)
+            } else {
+                loginCredentials.visibility = View.GONE
+            }
+
+            intent.getStringExtra(CommonsApplication.LOGIN_MESSAGE_INTENT_KEY)?.let {
+                showMessage(it, R.color.secondaryDarkColor)
+            }
+
+            intent.getStringExtra(CommonsApplication.LOGIN_USERNAME_INTENT_KEY)?.let {
+                loginUsername.setText(it)
+            }
+        }
+    }
+
+    @VisibleForTesting
+    fun askUserForTwoFactorAuthWithKeyboard() {
+        if (binding == null) {
+            Timber.w("Binding is null, reinitializing in askUserForTwoFactorAuthWithKeyboard")
+            binding = ActivityLoginBinding.inflate(layoutInflater)
+            setContentView(binding!!.root)
+        }
+        progressDialog!!.dismiss()
+        if (binding != null) {
+            with(binding!!) {
+                twoFactorContainer.visibility = View.VISIBLE
+                twoFactorContainer.hint = getString(if (lastLoginResult is LoginResult.EmailAuthResult) R.string.email_auth_code else R.string._2fa_code)
+                loginTwoFactor.visibility = View.VISIBLE
+                loginTwoFactor.requestFocus()
+
+                val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
+                imm.showSoftInput(loginTwoFactor, InputMethodManager.SHOW_IMPLICIT)
+
+                loginTwoFactor.setOnEditorActionListener { _, actionId, event ->
+                    if (actionId == EditorInfo.IME_ACTION_DONE ||
+                        (event != null && event.keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_DOWN)) {
+                        performLogin()
+                        true
+                    } else {
+                        false
+                    }
+                }
+            }
+        } else {
+            Timber.e("Binding is null in askUserForTwoFactorAuthWithKeyboard after reinitialization attempt")
+        }
+        showMessageAndCancelDialog(getString(if (lastLoginResult is LoginResult.EmailAuthResult) R.string.login_failed_email_auth_needed else R.string.login_failed_2fa_needed))
+    }
+    override fun onPostCreate(savedInstanceState: Bundle?) {
+        super.onPostCreate(savedInstanceState)
+        delegate.onPostCreate(savedInstanceState)
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        if (sessionManager.currentAccount != null && sessionManager.isUserLoggedIn) {
+            applicationKvStore.putBoolean("login_skipped", false)
+            startMainActivity()
+        }
+
+        if (applicationKvStore.getBoolean("login_skipped", false)) {
+            performSkipLogin()
+        }
+    }
+
+    override fun onDestroy() {
+        compositeDisposable.clear()
+        try {
+            // To prevent leaked window when finish() is called, see http://stackoverflow.com/questions/32065854/activity-has-leaked-window-at-alertdialog-show-method
+            if (progressDialog?.isShowing == true) {
+                progressDialog!!.dismiss()
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+        with(binding!!) {
+            loginUsername.removeTextChangedListener(textWatcher)
+            loginPassword.removeTextChangedListener(textWatcher)
+            loginTwoFactor.removeTextChangedListener(textWatcher)
+        }
+        delegate.onDestroy()
+        loginClient.cancel()
+        binding = null
+        super.onDestroy()
+    }
+
+    override fun onStart() {
+        super.onStart()
+        delegate.onStart()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        delegate.onStop()
+    }
+
+    override fun onPostResume() {
+        super.onPostResume()
+        delegate.onPostResume()
+    }
+
+    override fun setContentView(view: View, params: ViewGroup.LayoutParams) {
+        delegate.setContentView(view, params)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> {
+                NavUtils.navigateUpFromSameTask(this)
+                return true
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        // if progressDialog is visible during the configuration change  then store state as  true else false so that
+        // we maintain visibility of progressDialog after configuration change
+        if (progressDialog != null && progressDialog!!.isShowing) {
+            outState.putBoolean(SAVE_PROGRESS_DIALOG, true)
+        } else {
+            outState.putBoolean(SAVE_PROGRESS_DIALOG, false)
+        }
+        outState.putString(
+            SAVE_ERROR_MESSAGE,
+            binding!!.errorMessage.text.toString()
+        ) //Save the errorMessage
+        outState.putString(
+            SAVE_USERNAME,
+            binding!!.loginUsername.text.toString()
+        ) // Save the username
+        outState.putString(
+            SAVE_PASSWORD,
+            binding!!.loginPassword.text.toString()
+        ) // Save the password
+    }
+
+    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
+        super.onRestoreInstanceState(savedInstanceState)
+        binding!!.loginUsername.setText(savedInstanceState.getString(SAVE_USERNAME))
+        binding!!.loginPassword.setText(savedInstanceState.getString(SAVE_PASSWORD))
+        if (savedInstanceState.getBoolean(SAVE_PROGRESS_DIALOG)) {
+            performLogin()
+        }
+        val errorMessage = savedInstanceState.getString(SAVE_ERROR_MESSAGE)
+        if (sessionManager.isUserLoggedIn) {
+            showMessage(R.string.login_success, R.color.primaryDarkColor)
+        } else {
+            showMessage(errorMessage, R.color.secondaryDarkColor)
+        }
+    }
+
+    /**
+     * Hides the keyboard if the user's focus is not on the password (hasFocus is false).
+     * @param view The keyboard
+     * @param hasFocus Set to true if the keyboard has focus
+     */
+    private fun onPasswordFocusChanged(view: View, hasFocus: Boolean) {
+        if (!hasFocus) {
+            hideKeyboard(view)
+        }
+    }
+
+    private fun onEditorAction(textView: TextView, actionId: Int, keyEvent: KeyEvent?) =
+        if (binding!!.loginButton.isEnabled && isTriggerAction(actionId, keyEvent)) {
+            performLogin()
+            true
+        } else false
+
+    private fun isTriggerAction(actionId: Int, keyEvent: KeyEvent?) =
+        actionId == EditorInfo.IME_ACTION_NEXT || actionId == EditorInfo.IME_ACTION_DONE || keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER
+
+    private fun skipLogin() {
+        AlertDialog.Builder(this)
+            .setTitle(R.string.skip_login_title)
+            .setMessage(R.string.skip_login_message)
+            .setCancelable(false)
+            .setPositiveButton(R.string.yes) { dialog: DialogInterface, which: Int ->
+                dialog.cancel()
+                performSkipLogin()
+            }
+            .setNegativeButton(R.string.no) { dialog: DialogInterface, which: Int ->
+                dialog.cancel()
+            }
+            .show()
+    }
+
+    private fun forgotPassword() =
+        handleWebUrl(this, Uri.parse(BuildConfig.FORGOT_PASSWORD_URL))
+
+    private fun onPrivacyPolicyClicked() =
+        handleWebUrl(this, Uri.parse(BuildConfig.PRIVACY_POLICY_URL))
+
+    private fun signUp() =
+        startActivity(Intent(this, SignupActivity::class.java))
+
+    @VisibleForTesting
+    fun performLogin() {
+        Timber.d("Login to start!")
+        val username = binding!!.loginUsername.text.toString()
+        val password = binding!!.loginPassword.text.toString()
+        val twoFactorCode = binding!!.loginTwoFactor.text.toString()
+
+        showLoggingProgressBar()
+        loginClient.doLogin(username,
+            password,
+            lastLoginResult,
+            twoFactorCode,
+            Locale.getDefault().language,
+            object : LoginCallback {
+                override fun success(loginResult: LoginResult) = runOnUiThread {
+                    Timber.d("Login Success")
+                    progressDialog!!.dismiss()
+                    onLoginSuccess(loginResult)
+                }
+
+                override fun twoFactorPrompt(loginResult: LoginResult, caught: Throwable, token: String?) = runOnUiThread {
+                    Timber.d("Requesting 2FA prompt")
+                    progressDialog!!.dismiss()
+                    lastLoginResult = loginResult
+                    askUserForTwoFactorAuthWithKeyboard()
+                }
+
+                override fun emailAuthPrompt(loginResult: LoginResult, caught: Throwable, token: String?) = runOnUiThread {
+                    Timber.d("Requesting email auth prompt")
+                    progressDialog!!.dismiss()
+                    lastLoginResult = loginResult
+                    askUserForTwoFactorAuthWithKeyboard()
+                }
+
+                override fun passwordResetPrompt(token: String?) = runOnUiThread {
+                    Timber.d("Showing password reset prompt")
+                    progressDialog!!.dismiss()
+                    showPasswordResetPrompt()
+                }
+
+                override fun error(caught: Throwable) = runOnUiThread {
+                    Timber.e(caught)
+                    progressDialog!!.dismiss()
+                    showMessageAndCancelDialog(caught.localizedMessage ?: "")
+                }
+            }
+        )
+    }
+
+    private fun showPasswordResetPrompt() =
+        showMessageAndCancelDialog(getString(R.string.you_must_reset_your_passsword))
+
+    /**
+     * This function is called when user skips the login.
+     * It redirects the user to Explore Activity.
+     */
+    private fun performSkipLogin() {
+        applicationKvStore.putBoolean("login_skipped", true)
+        MainActivity.startYourself(this)
+        finish()
+    }
+
+    private fun showLoggingProgressBar() {
+        progressDialog = ProgressDialog(this).apply {
+            isIndeterminate = true
+            setTitle(getString(R.string.logging_in_title))
+            setMessage(getString(R.string.logging_in_message))
+            setCancelable(false)
+        }
+        progressDialog!!.show()
+    }
+
+    private fun onLoginSuccess(loginResult: LoginResult) {
+        compositeDisposable.clear()
+        sessionManager.setUserLoggedIn(true)
+        sessionManager.updateAccount(loginResult)
+        progressDialog!!.dismiss()
+        showSuccessAndDismissDialog()
+        startMainActivity()
+    }
+
+    override fun getMenuInflater(): MenuInflater =
+        delegate.menuInflater
+
+    @VisibleForTesting
+    fun askUserForTwoFactorAuth() {
+        if (binding == null) {
+            Timber.w("Binding is null, reinitializing in askUserForTwoFactorAuth")
+            binding = ActivityLoginBinding.inflate(layoutInflater)
+            setContentView(binding!!.root)
+        }
+        progressDialog!!.dismiss()
+        if (binding != null) {
+            with(binding!!) {
+                twoFactorContainer.visibility = View.VISIBLE
+                twoFactorContainer.hint = getString(if (lastLoginResult is LoginResult.EmailAuthResult) R.string.email_auth_code else R.string._2fa_code)
+                loginTwoFactor.visibility = View.VISIBLE
+                loginTwoFactor.requestFocus()
+
+                loginTwoFactor.setOnEditorActionListener { _, actionId, event ->
+                    if (actionId == EditorInfo.IME_ACTION_DONE ||
+                        (event != null && event.keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_DOWN)) {
+                        performLogin()
+                        true
+                    } else {
+                        false
+                    }
+                }
+            }
+        } else {
+            Timber.e("Binding is null in askUserForTwoFactorAuth after reinitialization attempt")
+        }
+        val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
+        imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY)
+        showMessageAndCancelDialog(getString(if (lastLoginResult is LoginResult.EmailAuthResult) R.string.login_failed_email_auth_needed else R.string.login_failed_2fa_needed))
+    }
+
+    @VisibleForTesting
+    fun showMessageAndCancelDialog(@StringRes resId: Int) {
+        showMessage(resId, R.color.secondaryDarkColor)
+        progressDialog?.cancel()
+    }
+
+    @VisibleForTesting
+    fun showMessageAndCancelDialog(error: String) {
+        showMessage(error, R.color.secondaryDarkColor)
+        progressDialog?.cancel()
+    }
+
+    @VisibleForTesting
+    fun showSuccessAndDismissDialog() {
+        showMessage(R.string.login_success, R.color.primaryDarkColor)
+        progressDialog!!.dismiss()
+    }
+
+    @VisibleForTesting
+    fun startMainActivity() {
+        startActivityWithFlags(this, MainActivity::class.java, Intent.FLAG_ACTIVITY_SINGLE_TOP)
+        finish()
+    }
+
+    private fun showMessage(@StringRes resId: Int, @ColorRes colorResId: Int) = with(binding!!) {
+        errorMessage.text = getString(resId)
+        errorMessage.setTextColor(ContextCompat.getColor(this@LoginActivity, colorResId))
+        errorMessageContainer.visibility = View.VISIBLE
+    }
+
+    private fun showMessage(message: String?, @ColorRes colorResId: Int) = with(binding!!) {
+        errorMessage.text = message
+        errorMessage.setTextColor(ContextCompat.getColor(this@LoginActivity, colorResId))
+        errorMessageContainer.visibility = View.VISIBLE
+    }
+
+    private fun onTextChanged(text: String) {
+        val enabled =
+            binding!!.loginUsername.text!!.length != 0 && binding!!.loginPassword.text!!.length != 0 &&
+                    (BuildConfig.DEBUG || binding!!.loginTwoFactor.text!!.length != 0 || binding!!.loginTwoFactor.visibility != View.VISIBLE)
+        binding!!.loginButton.isEnabled = enabled
+    }
+
+    companion object {
+        fun startYourself(context: Context) =
+            context.startActivity(Intent(context, LoginActivity::class.java))
+
+        const val SAVE_PROGRESS_DIALOG: String = "ProgressDialog_state"
+        const val SAVE_ERROR_MESSAGE: String = "errorMessage"
+        const val SAVE_USERNAME: String = "username"
+        const val SAVE_PASSWORD: String = "password"
+    }
+}

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

@@ -1,148 +0,0 @@
-package fr.free.nrw.commons.auth;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.content.Context;
-import android.os.Build;
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import fr.free.nrw.commons.auth.login.LoginResult;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import fr.free.nrw.commons.BuildConfig;
-import fr.free.nrw.commons.kvstore.JsonKvStore;
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-
-/**
- * Manage the current logged in user session.
- */
-@Singleton
-public class SessionManager {
-    private final Context context;
-    private Account currentAccount; // Unlike a savings account...  ;-)
-    private JsonKvStore defaultKvStore;
-
-    @Inject
-    public SessionManager(Context context,
-                          @Named("default_preferences") JsonKvStore defaultKvStore) {
-        this.context = context;
-        this.currentAccount = null;
-        this.defaultKvStore = defaultKvStore;
-    }
-
-    private boolean createAccount(@NonNull String userName, @NonNull String password) {
-        Account account = getCurrentAccount();
-        if (account == null || TextUtils.isEmpty(account.name) || !account.name.equals(userName)) {
-            removeAccount();
-            account = new Account(userName, BuildConfig.ACCOUNT_TYPE);
-            return accountManager().addAccountExplicitly(account, password, null);
-        }
-        return true;
-    }
-
-    private void removeAccount() {
-        Account account = getCurrentAccount();
-        if (account != null) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-                accountManager().removeAccountExplicitly(account);
-            } else {
-                //noinspection deprecation
-                accountManager().removeAccount(account, null, null);
-            }
-        }
-    }
-
-    public void updateAccount(LoginResult result) {
-        boolean accountCreated = createAccount(result.getUserName(), result.getPassword());
-        if (accountCreated) {
-            setPassword(result.getPassword());
-        }
-    }
-
-    private void setPassword(@NonNull String password) {
-        Account account = getCurrentAccount();
-        if (account != null) {
-            accountManager().setPassword(account, password);
-        }
-    }
-
-    /**
-     * @return Account|null
-     */
-    @Nullable
-    public Account getCurrentAccount() {
-        if (currentAccount == null) {
-            AccountManager accountManager = AccountManager.get(context);
-            Account[] allAccounts = accountManager.getAccountsByType(BuildConfig.ACCOUNT_TYPE);
-            if (allAccounts.length != 0) {
-                currentAccount = allAccounts[0];
-            }
-        }
-        return currentAccount;
-    }
-
-    public boolean doesAccountExist() {
-        return getCurrentAccount() != null;
-    }
-
-    @Nullable
-    public String getUserName() {
-        Account account = getCurrentAccount();
-        return account == null ? null : account.name;
-    }
-
-    @Nullable
-    public String getPassword() {
-        Account account = getCurrentAccount();
-        return account == null ? null : accountManager().getPassword(account);
-    }
-
-    private AccountManager accountManager() {
-        return AccountManager.get(context);
-    }
-
-    public boolean isUserLoggedIn() {
-        return defaultKvStore.getBoolean("isUserLoggedIn", false);
-    }
-
-    void setUserLoggedIn(boolean isLoggedIn) {
-        defaultKvStore.putBoolean("isUserLoggedIn", isLoggedIn);
-    }
-
-    public void forceLogin(Context context) {
-        if (context != null) {
-            LoginActivity.startYourself(context);
-        }
-    }
-
-    /**
-     * Returns a Completable that clears existing accounts from account manager
-     */
-    public Completable logout() {
-        return Completable.fromObservable(
-            Observable.empty()
-                      .doOnComplete(
-                          () -> {
-                              removeAccount();
-                              currentAccount = null;
-                          }
-                      )
-        );
-    }
-
-    /**
-     * Return a corresponding boolean preference
-     *
-     * @param key
-     * @return
-     */
-    public boolean getPreference(String key) {
-        return defaultKvStore.getBoolean(key);
-    }
-}

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

@@ -0,0 +1,95 @@
+package fr.free.nrw.commons.auth
+
+import android.accounts.Account
+import android.accounts.AccountManager
+import android.content.Context
+import android.os.Build
+import android.text.TextUtils
+import fr.free.nrw.commons.BuildConfig.ACCOUNT_TYPE
+import fr.free.nrw.commons.auth.login.LoginResult
+import fr.free.nrw.commons.kvstore.JsonKvStore
+import io.reactivex.Completable
+import io.reactivex.Observable
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+/**
+ * Manage the current logged in user session.
+ */
+@Singleton
+class SessionManager @Inject constructor(
+    private val context: Context,
+    @param:Named("default_preferences") private val defaultKvStore: JsonKvStore
+) {
+    private val accountManager: AccountManager get() = AccountManager.get(context)
+
+    private var _currentAccount: Account? = null // Unlike a savings account...  ;-)
+    val currentAccount: Account? get() {
+        if (_currentAccount == null) {
+            val allAccounts = AccountManager.get(context).getAccountsByType(ACCOUNT_TYPE)
+            if (allAccounts.isNotEmpty()) {
+                _currentAccount = allAccounts[0]
+            }
+        }
+        return _currentAccount
+    }
+
+    val userName: String?
+        get() = currentAccount?.name
+
+    var password: String?
+        get() = currentAccount?.let { accountManager.getPassword(it) }
+        private set(value) {
+            currentAccount?.let { accountManager.setPassword(it, value) }
+        }
+
+    val isUserLoggedIn: Boolean
+        get() = defaultKvStore.getBoolean("isUserLoggedIn", false)
+
+    fun updateAccount(result: LoginResult) {
+        if (createAccount(result.userName!!, result.password!!)) {
+            password = result.password
+        }
+    }
+
+    fun doesAccountExist(): Boolean =
+        currentAccount != null
+
+    fun setUserLoggedIn(isLoggedIn: Boolean) =
+        defaultKvStore.putBoolean("isUserLoggedIn", isLoggedIn)
+
+    fun forceLogin(context: Context?) =
+        context?.let { LoginActivity.startYourself(it) }
+
+    fun getPreference(key: String): Boolean =
+        defaultKvStore.getBoolean(key)
+
+    fun logout(): Completable = Completable.fromObservable(
+        Observable.empty<Any>()
+            .doOnComplete {
+                removeAccount()
+                _currentAccount = null
+            }
+    )
+
+    private fun createAccount(userName: String, password: String): Boolean {
+        var account = currentAccount
+        if (account == null || TextUtils.isEmpty(account.name) || account.name != userName) {
+            removeAccount()
+            account = Account(userName, ACCOUNT_TYPE)
+            return accountManager.addAccountExplicitly(account, password, null)
+        }
+        return true
+    }
+
+    private fun removeAccount() {
+        currentAccount?.let {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                accountManager.removeAccountExplicitly(it)
+            } else {
+                accountManager.removeAccount(it, null, null)
+            }
+        }
+    }
+}

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

@@ -1,82 +0,0 @@
-package fr.free.nrw.commons.auth;
-
-import android.content.res.Configuration;
-import android.os.Build;
-import android.os.Bundle;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.Toast;
-
-import fr.free.nrw.commons.BuildConfig;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.theme.BaseActivity;
-import timber.log.Timber;
-
-public class SignupActivity extends BaseActivity {
-
-    private WebView webView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Timber.d("Signup Activity started");
-
-        webView = new WebView(this);
-        setContentView(webView);
-
-        webView.setWebViewClient(new MyWebViewClient());
-        WebSettings webSettings = webView.getSettings();
-        /*Needed to refresh Captcha. Might introduce XSS vulnerabilities, but we can
-         trust Wikimedia's site... right?*/
-        webSettings.setJavaScriptEnabled(true);
-
-        webView.loadUrl(BuildConfig.SIGNUP_LANDING_URL);
-    }
-
-    private class MyWebViewClient extends WebViewClient {
-        @Override
-        public boolean shouldOverrideUrlLoading(WebView view, String url) {
-            if (url.equals(BuildConfig.SIGNUP_SUCCESS_REDIRECTION_URL)) {
-                //Signup success, so clear cookies, notify user, and load LoginActivity again
-                Timber.d("Overriding URL %s", url);
-
-                Toast toast = Toast.makeText(SignupActivity.this,
-                        R.string.account_created, Toast.LENGTH_LONG);
-                toast.show();
-                // terminate on task completion.
-                finish();
-                return true;
-            } else {
-                //If user clicks any other links in the webview
-                Timber.d("Not overriding URL, URL is: %s", url);
-                return false;
-            }
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (webView.canGoBack()) {
-            webView.goBack();
-        } else {
-            super.onBackPressed();
-        }
-    }
-
-    /**
-     * Known bug in androidx.appcompat library version 1.1.0 being tracked here
-     * https://issuetracker.google.com/issues/141132133
-     * App tries to put light/dark theme to webview and crashes in the process
-     * This code tries to prevent applying the theme when sdk is between api 21 to 25
-     * @param overrideConfiguration
-     */
-    @Override
-    public void applyOverrideConfiguration(final Configuration overrideConfiguration) {
-        if (Build.VERSION.SDK_INT <= 25 &&
-            (getResources().getConfiguration().uiMode == getApplicationContext().getResources().getConfiguration().uiMode)) {
-            return;
-        }
-        super.applyOverrideConfiguration(overrideConfiguration);
-    }
-}

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

@@ -0,0 +1,77 @@
+package fr.free.nrw.commons.auth
+
+import android.annotation.SuppressLint
+import android.content.res.Configuration
+import android.os.Build
+import android.os.Bundle
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import android.widget.Toast
+import fr.free.nrw.commons.BuildConfig
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.applyEdgeToEdgeAllInsets
+import timber.log.Timber
+
+class SignupActivity : BaseActivity() {
+    private var webView: WebView? = null
+
+    @SuppressLint("SetJavaScriptEnabled")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Timber.d("Signup Activity started")
+
+        webView = WebView(this)
+        applyEdgeToEdgeAllInsets(webView!!)
+        with(webView!!) {
+            setContentView(this)
+            webViewClient = MyWebViewClient()
+            // Needed to refresh Captcha. Might introduce XSS vulnerabilities, but we can
+            // trust Wikimedia's site... right?
+            settings.javaScriptEnabled = true
+            loadUrl(BuildConfig.SIGNUP_LANDING_URL)
+        }
+    }
+
+    override fun onBackPressed() {
+        if (webView!!.canGoBack()) {
+            webView!!.goBack()
+        } else {
+            super.onBackPressed()
+        }
+    }
+
+    /**
+     * Known bug in androidx.appcompat library version 1.1.0 being tracked here
+     * https://issuetracker.google.com/issues/141132133
+     * App tries to put light/dark theme to webview and crashes in the process
+     * This code tries to prevent applying the theme when sdk is between api 21 to 25
+     */
+    override fun applyOverrideConfiguration(overrideConfiguration: Configuration) {
+        if (Build.VERSION.SDK_INT <= 25 &&
+            (resources.configuration.uiMode == applicationContext.resources.configuration.uiMode)
+        ) return
+        super.applyOverrideConfiguration(overrideConfiguration)
+    }
+
+    private inner class MyWebViewClient : WebViewClient() {
+        @Deprecated("Deprecated in Java")
+        override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean =
+            if (url == BuildConfig.SIGNUP_SUCCESS_REDIRECTION_URL) {
+                //Signup success, so clear cookies, notify user, and load LoginActivity again
+                Timber.d("Overriding URL %s", url)
+
+                Toast.makeText(
+                    this@SignupActivity, R.string.account_created, Toast.LENGTH_LONG
+                ).show()
+
+                // terminate on task completion.
+                finish()
+                true
+            } else {
+                //If user clicks any other links in the webview
+                Timber.d("Not overriding URL, URL is: %s", url)
+                false
+            }
+    }
+}

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

@@ -1,141 +0,0 @@
-package fr.free.nrw.commons.auth;
-
-import android.accounts.AbstractAccountAuthenticator;
-import android.accounts.Account;
-import android.accounts.AccountAuthenticatorResponse;
-import android.accounts.AccountManager;
-import android.accounts.NetworkErrorException;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import fr.free.nrw.commons.BuildConfig;
-
-import static fr.free.nrw.commons.auth.AccountUtil.AUTH_TOKEN_TYPE;
-
-/**
- * Handles WikiMedia commons account Authentication
- */
-public class WikiAccountAuthenticator extends AbstractAccountAuthenticator {
-    private static final String[] SYNC_AUTHORITIES = {BuildConfig.CONTRIBUTION_AUTHORITY, BuildConfig.MODIFICATION_AUTHORITY};
-
-    @NonNull
-    private final Context context;
-
-    public WikiAccountAuthenticator(@NonNull Context context) {
-        super(context);
-        this.context = context;
-    }
-
-    /**
-     * Provides Bundle with edited Account Properties 
-     */
-    @Override
-    public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
-        Bundle bundle = new Bundle();
-        bundle.putString("test", "editProperties");
-        return bundle;
-    }
-
-    @Override
-    public Bundle addAccount(@NonNull AccountAuthenticatorResponse response,
-                             @NonNull String accountType, @Nullable String authTokenType,
-                             @Nullable String[] requiredFeatures, @Nullable Bundle options)
-            throws NetworkErrorException {
-        // account type not supported returns bundle without loginActivity Intent, it just contains "test" key 
-        if (!supportedAccountType(accountType)) {
-            Bundle bundle = new Bundle();
-            bundle.putString("test", "addAccount");
-            return bundle;
-        }
-
-        return addAccount(response);
-    }
-
-    @Override
-    public Bundle confirmCredentials(@NonNull AccountAuthenticatorResponse response,
-                                     @NonNull Account account, @Nullable Bundle options)
-            throws NetworkErrorException {
-        Bundle bundle = new Bundle();
-        bundle.putString("test", "confirmCredentials");
-        return bundle;
-    }
-
-    @Override
-    public Bundle getAuthToken(@NonNull AccountAuthenticatorResponse response,
-                               @NonNull Account account, @NonNull String authTokenType,
-                               @Nullable Bundle options)
-            throws NetworkErrorException {
-        Bundle bundle = new Bundle();
-        bundle.putString("test", "getAuthToken");
-        return bundle;
-    }
-
-    @Nullable
-    @Override
-    public String getAuthTokenLabel(@NonNull String authTokenType) {
-        return supportedAccountType(authTokenType) ? AUTH_TOKEN_TYPE : null;
-    }
-
-    @Nullable
-    @Override
-    public Bundle updateCredentials(@NonNull AccountAuthenticatorResponse response,
-                                    @NonNull Account account, @Nullable String authTokenType,
-                                    @Nullable Bundle options)
-            throws NetworkErrorException {
-        Bundle bundle = new Bundle();
-        bundle.putString("test", "updateCredentials");
-        return bundle;
-    }
-
-    @Nullable
-    @Override
-    public Bundle hasFeatures(@NonNull AccountAuthenticatorResponse response,
-                              @NonNull Account account, @NonNull String[] features)
-            throws NetworkErrorException {
-        Bundle bundle = new Bundle();
-        bundle.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, false);
-        return bundle;
-    }
-
-    private boolean supportedAccountType(@Nullable String type) {
-        return BuildConfig.ACCOUNT_TYPE.equals(type);
-    }
-
-    /**
-     * Provides a bundle containing a Parcel 
-     * the Parcel packs an Intent with LoginActivity and Authenticator response (requires valid account type)
-     */
-    private Bundle addAccount(AccountAuthenticatorResponse response) {
-        Intent intent = new Intent(context, LoginActivity.class);
-        intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);
-
-        Bundle bundle = new Bundle();
-        bundle.putParcelable(AccountManager.KEY_INTENT, intent);
-
-        return bundle;
-    }
-
-    @Override
-    public Bundle getAccountRemovalAllowed(AccountAuthenticatorResponse response,
-                                           Account account) throws NetworkErrorException {
-        Bundle result = super.getAccountRemovalAllowed(response, account);
-
-        if (result.containsKey(AccountManager.KEY_BOOLEAN_RESULT)
-                && !result.containsKey(AccountManager.KEY_INTENT)) {
-            boolean allowed = result.getBoolean(AccountManager.KEY_BOOLEAN_RESULT);
-
-            if (allowed) {
-                for (String auth : SYNC_AUTHORITIES) {
-                    ContentResolver.cancelSync(account, auth);
-                }
-            }
-        }
-
-        return result;
-    }
-}

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

@@ -0,0 +1,108 @@
+package fr.free.nrw.commons.auth
+
+import android.accounts.AbstractAccountAuthenticator
+import android.accounts.Account
+import android.accounts.AccountAuthenticatorResponse
+import android.accounts.AccountManager
+import android.accounts.NetworkErrorException
+import android.content.ContentResolver
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.os.bundleOf
+import fr.free.nrw.commons.BuildConfig
+
+private val SYNC_AUTHORITIES = arrayOf(
+    BuildConfig.CONTRIBUTION_AUTHORITY, BuildConfig.MODIFICATION_AUTHORITY
+)
+
+/**
+ * Handles WikiMedia commons account Authentication
+ */
+class WikiAccountAuthenticator(
+    private val context: Context
+) : AbstractAccountAuthenticator(context) {
+    /**
+     * Provides Bundle with edited Account Properties
+     */
+    override fun editProperties(
+        response: AccountAuthenticatorResponse,
+        accountType: String
+    ) = bundleOf("test" to "editProperties")
+
+    // account type not supported returns bundle without loginActivity Intent, it just contains "test" key
+    @Throws(NetworkErrorException::class)
+    override fun addAccount(
+        response: AccountAuthenticatorResponse,
+        accountType: String,
+        authTokenType: String?,
+        requiredFeatures: Array<String>?,
+        options: Bundle?
+    ) = if (BuildConfig.ACCOUNT_TYPE == accountType) {
+        addAccount(response)
+    } else {
+        bundleOf("test" to "addAccount")
+    }
+
+    @Throws(NetworkErrorException::class)
+    override fun confirmCredentials(
+        response: AccountAuthenticatorResponse, account: Account, options: Bundle?
+    ) = bundleOf("test" to "confirmCredentials")
+
+    @Throws(NetworkErrorException::class)
+    override fun getAuthToken(
+        response: AccountAuthenticatorResponse,
+        account: Account,
+        authTokenType: String,
+        options: Bundle?
+    ) = bundleOf("test" to "getAuthToken")
+
+    override fun getAuthTokenLabel(authTokenType: String) =
+        if (BuildConfig.ACCOUNT_TYPE == authTokenType) AUTH_TOKEN_TYPE else null
+
+    @Throws(NetworkErrorException::class)
+    override fun updateCredentials(
+        response: AccountAuthenticatorResponse,
+        account: Account,
+        authTokenType: String?,
+        options: Bundle?
+    ) = bundleOf("test" to "updateCredentials")
+
+    @Throws(NetworkErrorException::class)
+    override fun hasFeatures(
+        response: AccountAuthenticatorResponse,
+        account: Account, features: Array<String>
+    ) = bundleOf(AccountManager.KEY_BOOLEAN_RESULT to false)
+
+    /**
+     * Provides a bundle containing a Parcel
+     * the Parcel packs an Intent with LoginActivity and Authenticator response (requires valid account type)
+     */
+    private fun addAccount(response: AccountAuthenticatorResponse): Bundle {
+        val intent = Intent(context, LoginActivity::class.java)
+            .putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response)
+        return bundleOf(AccountManager.KEY_INTENT to intent)
+    }
+
+    @Throws(NetworkErrorException::class)
+    override fun getAccountRemovalAllowed(
+        response: AccountAuthenticatorResponse?,
+        account: Account?
+    ): Bundle {
+        val result = super.getAccountRemovalAllowed(response, account)
+
+        if (result.containsKey(AccountManager.KEY_BOOLEAN_RESULT)
+            && !result.containsKey(AccountManager.KEY_INTENT)
+        ) {
+            val allowed = result.getBoolean(AccountManager.KEY_BOOLEAN_RESULT)
+
+            if (allowed) {
+                for (auth in SYNC_AUTHORITIES) {
+                    ContentResolver.cancelSync(account, auth)
+                }
+            }
+        }
+
+        return result
+    }
+}

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

@@ -1,31 +0,0 @@
-package fr.free.nrw.commons.auth;
-
-import android.accounts.AbstractAccountAuthenticator;
-import android.content.Intent;
-import android.os.IBinder;
-
-import androidx.annotation.Nullable;
-
-import fr.free.nrw.commons.di.CommonsDaggerService;
-
-/**
- * Handles the Auth service of the App, see AndroidManifests for details
- * (Uses Dagger 2 as injector)
- */
-public class WikiAccountAuthenticatorService extends CommonsDaggerService {
-
-    @Nullable
-    private AbstractAccountAuthenticator authenticator;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        authenticator = new WikiAccountAuthenticator(this);
-    }
-
-    @Nullable
-    @Override
-    public IBinder onBind(Intent intent) {
-        return authenticator == null ? null : authenticator.getIBinder();
-    }
-}

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

@@ -0,0 +1,22 @@
+package fr.free.nrw.commons.auth
+
+import android.accounts.AbstractAccountAuthenticator
+import android.content.Intent
+import android.os.IBinder
+import fr.free.nrw.commons.di.CommonsDaggerService
+
+/**
+ * Handles the Auth service of the App, see AndroidManifests for details
+ * (Uses Dagger 2 as injector)
+ */
+class WikiAccountAuthenticatorService : CommonsDaggerService() {
+    private var authenticator: AbstractAccountAuthenticator? = null
+
+    override fun onCreate() {
+        super.onCreate()
+        authenticator = WikiAccountAuthenticator(this)
+    }
+
+    override fun onBind(intent: Intent): IBinder? =
+        authenticator?.iBinder
+}

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

@@ -32,7 +32,7 @@ class CsrfTokenClient(
             try {
                 if (retry > 0) {
                     // Log in explicitly
-                    loginClient.loginBlocking(userName, password, "")
+                    loginClient.loginBlocking(userName, password)
                 }
 
                 // Get CSRFToken response off the main thread.
@@ -92,6 +92,8 @@ class CsrfTokenClient(
                 override fun failure(caught: Throwable?) = retryWithLogin(cb) { caught }
 
                 override fun twoFactorPrompt() = cb.twoFactorPrompt()
+
+                override fun emailAuthPrompt() = cb.emailAuthPrompt()
             },
         )
 
@@ -165,10 +167,17 @@ class CsrfTokenClient(
             }
 
             override fun twoFactorPrompt(
+                loginResult: LoginResult,
                 caught: Throwable,
                 token: String?,
             ) = callback.twoFactorPrompt()
 
+            override fun emailAuthPrompt(
+                loginResult: LoginResult,
+                caught: Throwable,
+                token: String?,
+            ) = callback.emailAuthPrompt()
+
             // Should not happen here, but call the callback just in case.
             override fun passwordResetPrompt(token: String?) = callback.failure(LoginFailedException("Logged in with temporary password."))
 
@@ -190,6 +199,8 @@ class CsrfTokenClient(
         fun failure(caught: Throwable?)
 
         fun twoFactorPrompt()
+
+        fun emailAuthPrompt()
     }
 
     companion object {

app/src/main/java/fr/free/nrw/commons/auth/login/LoginCallback.kt

@@ -4,6 +4,13 @@ interface LoginCallback {
     fun success(loginResult: LoginResult)
 
     fun twoFactorPrompt(
+        loginResult: LoginResult,
+        caught: Throwable,
+        token: String?,
+    )
+
+    fun emailAuthPrompt(
+        loginResult: LoginResult,
         caught: Throwable,
         token: String?,
     )

app/src/main/java/fr/free/nrw/commons/auth/login/LoginClient.kt

@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.auth.login
 
 import android.text.TextUtils
+import fr.free.nrw.commons.auth.login.LoginResult.EmailAuthResult
 import fr.free.nrw.commons.auth.login.LoginResult.OAuthResult
 import fr.free.nrw.commons.auth.login.LoginResult.ResetPasswordResult
 import fr.free.nrw.commons.wikidata.WikidataConstants.WIKIPEDIA_URL
@@ -51,6 +52,7 @@ class LoginClient(
                         password,
                         null,
                         null,
+                        null,
                         response.body()!!.query()!!.loginToken(),
                         userLanguage,
                         cb,
@@ -75,6 +77,7 @@ class LoginClient(
         password: String,
         retypedPassword: String?,
         twoFactorCode: String?,
+        emailAuthCode: String?,
         loginToken: String?,
         userLanguage: String,
         cb: LoginCallback,
@@ -82,7 +85,7 @@ class LoginClient(
         this.userLanguage = userLanguage
 
         loginCall =
-            if (twoFactorCode.isNullOrEmpty() && retypedPassword.isNullOrEmpty()) {
+            if (twoFactorCode.isNullOrEmpty() && emailAuthCode.isNullOrEmpty() && retypedPassword.isNullOrEmpty()) {
                 loginInterface.postLogIn(userName, password, loginToken, userLanguage, WIKIPEDIA_URL)
             } else {
                 loginInterface.postLogIn(
@@ -90,6 +93,7 @@ class LoginClient(
                     password,
                     retypedPassword,
                     twoFactorCode,
+                    emailAuthCode,
                     loginToken,
                     userLanguage,
                     true,
@@ -112,10 +116,18 @@ class LoginClient(
                             when (loginResult) {
                                 is OAuthResult ->
                                     cb.twoFactorPrompt(
+                                        loginResult,
                                         LoginFailedException(loginResult.message),
                                         loginToken,
                                     )
 
+                                is EmailAuthResult ->
+                                    cb.emailAuthPrompt(
+                                        loginResult,
+                                        LoginFailedException(loginResult.message),
+                                        loginToken
+                                    )
+
                                 is ResetPasswordResult -> cb.passwordResetPrompt(loginToken)
 
                                 is LoginResult.Result ->
@@ -147,6 +159,7 @@ class LoginClient(
     fun doLogin(
         username: String,
         password: String,
+        lastLoginResult: LoginResult?,
         twoFactorCode: String,
         userLanguage: String,
         loginCallback: LoginCallback,
@@ -159,7 +172,10 @@ class LoginClient(
                 ) = if (response.isSuccessful) {
                     val loginToken = response.body()?.query()?.loginToken()
                     loginToken?.let {
-                        login(username, password, null, twoFactorCode, it, userLanguage, loginCallback)
+                        login(username, password, null,
+                            if (lastLoginResult is OAuthResult) twoFactorCode else null,
+                            if (lastLoginResult is EmailAuthResult) twoFactorCode else null,
+                            it, userLanguage, loginCallback)
                     } ?: run {
                         loginCallback.error(IOException("Failed to retrieve login token"))
                     }
@@ -181,7 +197,8 @@ class LoginClient(
     fun loginBlocking(
         userName: String,
         password: String,
-        twoFactorCode: String?,
+        twoFactorCode: String? = null,
+        emailAuthCode: String? = null
     ) {
         val tokenResponse = getLoginToken().execute()
         if (tokenResponse
@@ -195,7 +212,7 @@ class LoginClient(
 
         val loginToken = tokenResponse.body()?.query()?.loginToken()
         val tempLoginCall =
-            if (twoFactorCode.isNullOrEmpty()) {
+            if (twoFactorCode.isNullOrEmpty() && emailAuthCode.isNullOrEmpty()) {
                 loginInterface.postLogIn(userName, password, loginToken, userLanguage, WIKIPEDIA_URL)
             } else {
                 loginInterface.postLogIn(
@@ -203,6 +220,7 @@ class LoginClient(
                     password,
                     null,
                     twoFactorCode,
+                    emailAuthCode,
                     loginToken,
                     userLanguage,
                     true,
@@ -214,7 +232,7 @@ class LoginClient(
         val loginResult = loginResponse.toLoginResult(password) ?: throw IOException("Unexpected response when logging in.")
 
         if ("UI" == loginResult.status) {
-            if (loginResult is OAuthResult) {
+            if (loginResult is OAuthResult || loginResult is EmailAuthResult) {
                 // TODO: Find a better way to boil up the warning about 2FA
                 throw LoginFailedException(loginResult.message)
             }
@@ -237,7 +255,7 @@ class LoginClient(
         .subscribe({ response: MwQueryResponse? ->
             loginResult.userId = response?.query()?.userInfo()?.id() ?: 0
             loginResult.groups =
-                response?.query()?.getUserResponse(userName)?.groups ?: emptySet()
+                response?.query()?.getUserResponse(userName)?.getGroups() ?: emptySet()
             cb.success(loginResult)
         }, { caught: Throwable ->
             Timber.e(caught, "Login succeeded but getting group information failed. ")

app/src/main/java/fr/free/nrw/commons/auth/login/LoginInterface.kt

@@ -35,7 +35,8 @@ interface LoginInterface {
         @Field("password") pass: String?,
         @Field("retype") retypedPass: String?,
         @Field("OATHToken") twoFactorCode: String?,
-        @Field("logintoken") token: String?,
+        @Field("token") emailAuthToken: String?,
+        @Field("logintoken") loginToken: String?,
         @Field("uselang") userLanguage: String?,
         @Field("logincontinue") loginContinue: Boolean,
     ): Call<LoginResponse?>

app/src/main/java/fr/free/nrw/commons/auth/login/LoginResponse.kt

@@ -2,6 +2,7 @@ package fr.free.nrw.commons.auth.login
 
 import com.google.gson.annotations.SerializedName
 import fr.free.nrw.commons.auth.login.LoginResult.OAuthResult
+import fr.free.nrw.commons.auth.login.LoginResult.EmailAuthResult
 import fr.free.nrw.commons.auth.login.LoginResult.ResetPasswordResult
 import fr.free.nrw.commons.auth.login.LoginResult.Result
 import fr.free.nrw.commons.wikidata.mwapi.MwServiceError
@@ -27,11 +28,13 @@ internal class ClientLogin {
     fun toLoginResult(password: String): LoginResult {
         var userMessage = message
         if ("UI" == status) {
-            if (requests != null) {
-                for (req in requests) {
-                    if ("MediaWiki\\Extension\\OATHAuth\\Auth\\TOTPAuthenticationRequest" == req.id()) {
+            requests?.forEach { request ->
+                request.id()?.let {
+                    if (it.endsWith("TOTPAuthenticationRequest")) {
                         return OAuthResult(status, userName, password, message)
-                    } else if ("MediaWiki\\Auth\\PasswordAuthenticationRequest" == req.id()) {
+                    } else if (it.endsWith("EmailAuthAuthenticationRequest")) {
+                        return EmailAuthResult(status, userName, password, message)
+                    } else if (it.endsWith("PasswordAuthenticationRequest")) {
                         return ResetPasswordResult(status, userName, password, message)
                     }
                 }
@@ -49,7 +52,7 @@ internal class Request {
     private val required: String? = null
     private val provider: String? = null
     private val account: String? = null
-    private val fields: Map<String, RequestField>? = null
+    internal val fields: Map<String, RequestField>? = null
 
     fun id(): String? = id
 }
@@ -57,5 +60,5 @@ internal class Request {
 internal class RequestField {
     private val type: String? = null
     private val label: String? = null
-    private val help: String? = null
+    internal val help: String? = null
 }

app/src/main/java/fr/free/nrw/commons/auth/login/LoginResult.kt

@@ -24,6 +24,13 @@ sealed class LoginResult(
         message: String?,
     ) : LoginResult(status, userName, password, message)
 
+    class EmailAuthResult(
+        status: String,
+        userName: String?,
+        password: String?,
+        message: String?,
+    ) : LoginResult(status, userName, password, message)
+
     class ResetPasswordResult(
         status: String,
         userName: String?,

app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarkFragment.java

@@ -1,105 +0,0 @@
-package fr.free.nrw.commons.bookmarks;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentManager;
-import fr.free.nrw.commons.contributions.MainActivity;
-import fr.free.nrw.commons.databinding.FragmentBookmarksBinding;
-import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
-import fr.free.nrw.commons.kvstore.JsonKvStore;
-import fr.free.nrw.commons.theme.BaseActivity;
-import javax.inject.Inject;
-import fr.free.nrw.commons.contributions.ContributionController;
-import javax.inject.Named;
-
-public class BookmarkFragment extends CommonsDaggerSupportFragment {
-
-    private FragmentManager supportFragmentManager;
-    private BookmarksPagerAdapter adapter;
-    FragmentBookmarksBinding binding;
-
-    @Inject
-    ContributionController controller;
-    /**
-     * To check if the user is loggedIn or not.
-     */
-    @Inject
-    @Named("default_preferences")
-    public
-    JsonKvStore applicationKvStore;
-
-    @NonNull
-    public static BookmarkFragment newInstance() {
-        BookmarkFragment fragment = new BookmarkFragment();
-        fragment.setRetainInstance(true);
-        return fragment;
-    }
-
-    public void setScroll(boolean canScroll) {
-        if (binding!=null) {
-            binding.viewPagerBookmarks.setCanScroll(canScroll);
-        }
-    }
-
-    @Override
-    public void onCreate(@Nullable final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater,
-        @Nullable final ViewGroup container,
-        @Nullable final Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        binding = FragmentBookmarksBinding.inflate(inflater, container, false);
-
-        // Activity can call methods in the fragment by acquiring a
-        // reference to the Fragment from FragmentManager, using findFragmentById()
-        supportFragmentManager = getChildFragmentManager();
-
-        adapter = new BookmarksPagerAdapter(supportFragmentManager, getContext(),
-            applicationKvStore.getBoolean("login_skipped"));
-        binding.viewPagerBookmarks.setAdapter(adapter);
-        binding.tabLayout.setupWithViewPager(binding.viewPagerBookmarks);
-
-        ((MainActivity) getActivity()).showTabs();
-        ((BaseActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(false);
-
-        setupTabLayout();
-        return binding.getRoot();
-    }
-
-    /**
-     * This method sets up the tab layout. If the adapter has only one element it sets the
-     * visibility of tabLayout to gone.
-     */
-    public void setupTabLayout() {
-        binding.tabLayout.setVisibility(View.VISIBLE);
-        if (adapter.getCount() == 1) {
-            binding.tabLayout.setVisibility(View.GONE);
-        }
-    }
-
-
-    public void onBackPressed() {
-        if (((BookmarkListRootFragment) (adapter.getItem(binding.tabLayout.getSelectedTabPosition())))
-            .backPressed()) {
-            // The event is handled internally by the adapter , no further action required.
-            return;
-        }
-        // Event is not handled by the adapter ( performed back action ) change action bar.
-        ((BaseActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(false);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        binding = null;
-    }
-}

app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarkFragment.kt

@@ -0,0 +1,98 @@
+package fr.free.nrw.commons.bookmarks
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import fr.free.nrw.commons.contributions.ContributionController
+import fr.free.nrw.commons.contributions.MainActivity
+import fr.free.nrw.commons.databinding.FragmentBookmarksBinding
+import fr.free.nrw.commons.di.CommonsDaggerSupportFragment
+import fr.free.nrw.commons.kvstore.JsonKvStore
+import fr.free.nrw.commons.theme.BaseActivity
+import javax.inject.Inject
+import javax.inject.Named
+
+class BookmarkFragment : CommonsDaggerSupportFragment() {
+    private var adapter: BookmarksPagerAdapter? = null
+
+    @JvmField
+    var binding: FragmentBookmarksBinding? = null
+
+    @JvmField
+    @Inject
+    var controller: ContributionController? = null
+
+    /**
+     * To check if the user is loggedIn or not.
+     */
+    @JvmField
+    @Inject
+    @Named("default_preferences")
+    var applicationKvStore: JsonKvStore? = null
+
+    fun setScroll(canScroll: Boolean) {
+        binding?.let {
+            it.viewPagerBookmarks.canScroll = canScroll
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        super.onCreateView(inflater, container, savedInstanceState)
+        binding = FragmentBookmarksBinding.inflate(inflater, container, false)
+
+        // Activity can call methods in the fragment by acquiring a
+        // reference to the Fragment from FragmentManager, using findFragmentById()
+        val supportFragmentManager = childFragmentManager
+
+        adapter = BookmarksPagerAdapter(
+            supportFragmentManager, requireContext(),
+            applicationKvStore!!.getBoolean("login_skipped")
+        )
+        binding!!.viewPagerBookmarks.adapter = adapter
+        binding!!.tabLayout.setupWithViewPager(binding!!.viewPagerBookmarks)
+
+        (requireActivity() as MainActivity).showTabs()
+        (requireActivity() as BaseActivity).supportActionBar!!.setDisplayHomeAsUpEnabled(false)
+
+        setupTabLayout()
+        return binding!!.root
+    }
+
+    /**
+     * This method sets up the tab layout. If the adapter has only one element it sets the
+     * visibility of tabLayout to gone.
+     */
+    fun setupTabLayout() {
+        binding!!.tabLayout.visibility = View.VISIBLE
+        if (adapter!!.count == 1) {
+            binding!!.tabLayout.visibility = View.GONE
+        }
+    }
+
+
+    fun onBackPressed() {
+        if (((adapter!!.getItem(binding!!.tabLayout.selectedTabPosition)) as BookmarkListRootFragment).backPressed()) {
+            // The event is handled internally by the adapter , no further action required.
+            return
+        }
+
+        // Event is not handled by the adapter ( performed back action ) change action bar.
+        (requireActivity() as BaseActivity).supportActionBar!!.setDisplayHomeAsUpEnabled(false)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        binding = null
+    }
+
+    companion object {
+        fun newInstance(): BookmarkFragment = BookmarkFragment().apply {
+            retainInstance = true
+        }
+    }
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarkListRootFragment.java

@@ -1,259 +0,0 @@
-package fr.free.nrw.commons.bookmarks;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.FrameLayout;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import fr.free.nrw.commons.Media;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.bookmarks.items.BookmarkItemsFragment;
-import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsFragment;
-import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesFragment;
-import fr.free.nrw.commons.category.CategoryImagesCallback;
-import fr.free.nrw.commons.category.GridViewAdapter;
-import fr.free.nrw.commons.contributions.MainActivity;
-import fr.free.nrw.commons.databinding.FragmentFeaturedRootBinding;
-import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
-import fr.free.nrw.commons.media.MediaDetailPagerFragment;
-import fr.free.nrw.commons.navtab.NavTab;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-public class BookmarkListRootFragment extends CommonsDaggerSupportFragment implements
-    FragmentManager.OnBackStackChangedListener,
-    MediaDetailPagerFragment.MediaDetailProvider,
-    AdapterView.OnItemClickListener, CategoryImagesCallback {
-
-    private MediaDetailPagerFragment mediaDetails;
-    //private BookmarkPicturesFragment bookmarkPicturesFragment;
-    private BookmarkLocationsFragment bookmarkLocationsFragment;
-    public Fragment listFragment;
-    private BookmarksPagerAdapter bookmarksPagerAdapter;
-
-    FragmentFeaturedRootBinding binding;
-
-    public BookmarkListRootFragment() {
-        //empty constructor necessary otherwise crashes on recreate
-    }
-
-    public BookmarkListRootFragment(Bundle bundle, BookmarksPagerAdapter bookmarksPagerAdapter) {
-        String title = bundle.getString("categoryName");
-        int order = bundle.getInt("order");
-        final int orderItem = bundle.getInt("orderItem");
-        if (order == 0) {
-            listFragment = new BookmarkPicturesFragment();
-        } else {
-            listFragment = new BookmarkLocationsFragment();
-            if(orderItem == 2) {
-                listFragment = new BookmarkItemsFragment();
-            }
-        }
-        Bundle featuredArguments = new Bundle();
-        featuredArguments.putString("categoryName", title);
-        listFragment.setArguments(featuredArguments);
-        this.bookmarksPagerAdapter = bookmarksPagerAdapter;
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater,
-        @Nullable final ViewGroup container,
-        @Nullable final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        binding = FragmentFeaturedRootBinding.inflate(inflater, container, false);
-        return binding.getRoot();
-    }
-
-    @Override
-    public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        if (savedInstanceState == null) {
-            setFragment(listFragment, mediaDetails);
-        }
-    }
-
-    public void setFragment(Fragment fragment, Fragment otherFragment) {
-        if (fragment.isAdded() && otherFragment != null) {
-            getChildFragmentManager()
-                .beginTransaction()
-                .hide(otherFragment)
-                .show(fragment)
-                .addToBackStack("CONTRIBUTION_LIST_FRAGMENT_TAG")
-                .commit();
-            getChildFragmentManager().executePendingTransactions();
-        } else if (fragment.isAdded() && otherFragment == null) {
-            getChildFragmentManager()
-                .beginTransaction()
-                .show(fragment)
-                .addToBackStack("CONTRIBUTION_LIST_FRAGMENT_TAG")
-                .commit();
-            getChildFragmentManager().executePendingTransactions();
-        } else if (!fragment.isAdded() && otherFragment != null) {
-            getChildFragmentManager()
-                .beginTransaction()
-                .hide(otherFragment)
-                .add(R.id.explore_container, fragment)
-                .addToBackStack("CONTRIBUTION_LIST_FRAGMENT_TAG")
-                .commit();
-            getChildFragmentManager().executePendingTransactions();
-        } else if (!fragment.isAdded()) {
-            getChildFragmentManager()
-                .beginTransaction()
-                .replace(R.id.explore_container, fragment)
-                .addToBackStack("CONTRIBUTION_LIST_FRAGMENT_TAG")
-                .commit();
-            getChildFragmentManager().executePendingTransactions();
-        }
-    }
-
-    public void removeFragment(Fragment fragment) {
-        getChildFragmentManager()
-            .beginTransaction()
-            .remove(fragment)
-            .commit();
-        getChildFragmentManager().executePendingTransactions();
-    }
-
-    @Override
-    public void onAttach(final Context context) {
-        super.onAttach(context);
-    }
-
-    @Override
-    public void onMediaClicked(int position) {
-        Log.d("deneme8", "on media clicked");
-    /*container.setVisibility(View.VISIBLE);
-    ((BookmarkFragment)getParentFragment()).tabLayout.setVisibility(View.GONE);
-    mediaDetails = new MediaDetailPagerFragment(false, true, position);
-    setFragment(mediaDetails, bookmarkPicturesFragment);*/
-    }
-
-    /**
-     * This method is called mediaDetailPagerFragment. It returns the Media Object at that Index
-     *
-     * @param i It is the index of which media object is to be returned which is same as current
-     *          index of viewPager.
-     * @return Media Object
-     */
-    @Override
-    public Media getMediaAtPosition(int i) {
-        if (bookmarksPagerAdapter.getMediaAdapter() == null) {
-            // not yet ready to return data
-            return null;
-        } else {
-            return (Media) bookmarksPagerAdapter.getMediaAdapter().getItem(i);
-        }
-    }
-
-    /**
-     * This method is called on from getCount of MediaDetailPagerFragment The viewpager will contain
-     * same number of media items as that of media elements in adapter.
-     *
-     * @return Total Media count in the adapter
-     */
-    @Override
-    public int getTotalMediaCount() {
-        if (bookmarksPagerAdapter.getMediaAdapter() == null) {
-            return 0;
-        }
-        return bookmarksPagerAdapter.getMediaAdapter().getCount();
-    }
-
-    @Override
-    public Integer getContributionStateAt(int position) {
-        return null;
-    }
-
-    /**
-     * Reload media detail fragment once media is nominated
-     *
-     * @param index item position that has been nominated
-     */
-    @Override
-    public void refreshNominatedMedia(int index) {
-        if (mediaDetails != null && !listFragment.isVisible()) {
-            removeFragment(mediaDetails);
-            mediaDetails = MediaDetailPagerFragment.newInstance(false, true);
-            ((BookmarkFragment) getParentFragment()).setScroll(false);
-            setFragment(mediaDetails, listFragment);
-            mediaDetails.showImage(index);
-        }
-    }
-
-    /**
-     * This method is called on success of API call for featured images or mobile uploads. The
-     * viewpager will notified that number of items have changed.
-     */
-    @Override
-    public void viewPagerNotifyDataSetChanged() {
-        if (mediaDetails != null) {
-            mediaDetails.notifyDataSetChanged();
-        }
-    }
-
-    public boolean backPressed() {
-        //check mediaDetailPage fragment is not null then we check mediaDetail.is Visible or not to avoid NullPointerException
-        if (mediaDetails != null) {
-            if (mediaDetails.isVisible()) {
-                // todo add get list fragment
-                ((BookmarkFragment) getParentFragment()).setupTabLayout();
-                ArrayList<Integer> removed = mediaDetails.getRemovedItems();
-                removeFragment(mediaDetails);
-                ((BookmarkFragment) getParentFragment()).setScroll(true);
-                setFragment(listFragment, mediaDetails);
-                ((MainActivity) getActivity()).showTabs();
-                if (listFragment instanceof BookmarkPicturesFragment) {
-                    GridViewAdapter adapter = ((GridViewAdapter) ((BookmarkPicturesFragment) listFragment)
-                        .getAdapter());
-                    Iterator i = removed.iterator();
-                    while (i.hasNext()) {
-                        adapter.remove(adapter.getItem((int) i.next()));
-                    }
-                    mediaDetails.clearRemoved();
-
-                }
-            } else {
-                moveToContributionsFragment();
-            }
-        } else {
-            moveToContributionsFragment();
-        }
-        // notify mediaDetails did not handled the backPressed further actions required.
-        return false;
-    }
-
-    void moveToContributionsFragment() {
-        ((MainActivity) getActivity()).setSelectedItemId(NavTab.CONTRIBUTIONS.code());
-        ((MainActivity) getActivity()).showTabs();
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        Log.d("deneme8", "on media clicked");
-        binding.exploreContainer.setVisibility(View.VISIBLE);
-        ((BookmarkFragment) getParentFragment()).binding.tabLayout.setVisibility(View.GONE);
-        mediaDetails = MediaDetailPagerFragment.newInstance(false, true);
-        ((BookmarkFragment) getParentFragment()).setScroll(false);
-        setFragment(mediaDetails, listFragment);
-        mediaDetails.showImage(position);
-    }
-
-    @Override
-    public void onBackStackChanged() {
-
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        binding = null;
-    }
-}

app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarkListRootFragment.kt

@@ -0,0 +1,226 @@
+package fr.free.nrw.commons.bookmarks
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.AdapterView.OnItemClickListener
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import fr.free.nrw.commons.Media
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.bookmarks.category.BookmarkCategoriesFragment
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsFragment
+import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsFragment
+import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesFragment
+import fr.free.nrw.commons.category.CategoryImagesCallback
+import fr.free.nrw.commons.category.GridViewAdapter
+import fr.free.nrw.commons.contributions.MainActivity
+import fr.free.nrw.commons.databinding.FragmentFeaturedRootBinding
+import fr.free.nrw.commons.di.CommonsDaggerSupportFragment
+import fr.free.nrw.commons.media.MediaDetailPagerFragment
+import fr.free.nrw.commons.media.MediaDetailPagerFragment.Companion.newInstance
+import fr.free.nrw.commons.media.MediaDetailProvider
+import fr.free.nrw.commons.navtab.NavTab
+import timber.log.Timber
+
+class BookmarkListRootFragment : CommonsDaggerSupportFragment,
+    FragmentManager.OnBackStackChangedListener, MediaDetailProvider, OnItemClickListener,
+    CategoryImagesCallback {
+    private var mediaDetails: MediaDetailPagerFragment? = null
+    private val bookmarkLocationsFragment: BookmarkLocationsFragment? = null
+    var listFragment: Fragment? = null
+    private var bookmarksPagerAdapter: BookmarksPagerAdapter? = null
+
+    var binding: FragmentFeaturedRootBinding? = null
+
+    constructor()
+
+    constructor(bundle: Bundle, bookmarksPagerAdapter: BookmarksPagerAdapter) {
+        val title = bundle.getString("categoryName")
+        val order = bundle.getInt("order")
+        val orderItem = bundle.getInt("orderItem")
+
+        when (order) {
+            0 -> listFragment = BookmarkPicturesFragment()
+            1 -> listFragment = BookmarkLocationsFragment()
+            3 -> listFragment = BookmarkCategoriesFragment()
+        }
+        if (orderItem == 2) {
+            listFragment = BookmarkItemsFragment()
+        }
+
+        val featuredArguments = Bundle()
+        featuredArguments.putString("categoryName", title)
+        listFragment!!.setArguments(featuredArguments)
+        this.bookmarksPagerAdapter = bookmarksPagerAdapter
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        super.onCreate(savedInstanceState)
+        binding = FragmentFeaturedRootBinding.inflate(inflater, container, false)
+        return binding!!.getRoot()
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        if (savedInstanceState == null) {
+            setFragment(listFragment!!, mediaDetails)
+        }
+    }
+
+    fun setFragment(fragment: Fragment, otherFragment: Fragment?) {
+        if (fragment.isAdded() && otherFragment != null) {
+            getChildFragmentManager()
+                .beginTransaction()
+                .hide(otherFragment)
+                .show(fragment)
+                .addToBackStack("CONTRIBUTION_LIST_FRAGMENT_TAG")
+                .commit()
+            getChildFragmentManager().executePendingTransactions()
+        } else if (fragment.isAdded() && otherFragment == null) {
+            getChildFragmentManager()
+                .beginTransaction()
+                .show(fragment)
+                .addToBackStack("CONTRIBUTION_LIST_FRAGMENT_TAG")
+                .commit()
+            getChildFragmentManager().executePendingTransactions()
+        } else if (!fragment.isAdded() && otherFragment != null) {
+            getChildFragmentManager()
+                .beginTransaction()
+                .hide(otherFragment)
+                .add(R.id.explore_container, fragment)
+                .addToBackStack("CONTRIBUTION_LIST_FRAGMENT_TAG")
+                .commit()
+            getChildFragmentManager().executePendingTransactions()
+        } else if (!fragment.isAdded()) {
+            getChildFragmentManager()
+                .beginTransaction()
+                .replace(R.id.explore_container, fragment)
+                .addToBackStack("CONTRIBUTION_LIST_FRAGMENT_TAG")
+                .commit()
+            getChildFragmentManager().executePendingTransactions()
+        }
+    }
+
+    fun removeFragment(fragment: Fragment) {
+        getChildFragmentManager()
+            .beginTransaction()
+            .remove(fragment)
+            .commit()
+        getChildFragmentManager().executePendingTransactions()
+    }
+
+    override fun onMediaClicked(position: Int) {
+        Timber.d("on media clicked")
+        /*container.setVisibility(View.VISIBLE);
+    ((BookmarkFragment)getParentFragment()).tabLayout.setVisibility(View.GONE);
+    mediaDetails = new MediaDetailPagerFragment(false, true, position);
+    setFragment(mediaDetails, bookmarkPicturesFragment);*/
+    }
+
+    /**
+     * This method is called mediaDetailPagerFragment. It returns the Media Object at that Index
+     *
+     * @param i It is the index of which media object is to be returned which is same as current
+     * index of viewPager.
+     * @return Media Object
+     */
+    override fun getMediaAtPosition(i: Int): Media? =
+        bookmarksPagerAdapter!!.mediaAdapter?.getItem(i) as Media?
+
+    /**
+     * This method is called on from getCount of MediaDetailPagerFragment The viewpager will contain
+     * same number of media items as that of media elements in adapter.
+     *
+     * @return Total Media count in the adapter
+     */
+    override fun getTotalMediaCount(): Int =
+        bookmarksPagerAdapter!!.mediaAdapter?.count ?: 0
+
+    override fun getContributionStateAt(position: Int): Int? {
+        return null
+    }
+
+    /**
+     * Reload media detail fragment once media is nominated
+     *
+     * @param index item position that has been nominated
+     */
+    override fun refreshNominatedMedia(index: Int) {
+        if (mediaDetails != null && !listFragment!!.isVisible()) {
+            removeFragment(mediaDetails!!)
+            mediaDetails = newInstance(false, true)
+            (parentFragment as BookmarkFragment).setScroll(false)
+            setFragment(mediaDetails!!, listFragment)
+            mediaDetails!!.showImage(index)
+        }
+    }
+
+    /**
+     * This method is called on success of API call for featured images or mobile uploads. The
+     * viewpager will notified that number of items have changed.
+     */
+    override fun viewPagerNotifyDataSetChanged() {
+        if (mediaDetails != null) {
+            mediaDetails!!.notifyDataSetChanged()
+        }
+    }
+
+    fun backPressed(): Boolean {
+        //check mediaDetailPage fragment is not null then we check mediaDetail.is Visible or not to avoid NullPointerException
+        if (mediaDetails != null) {
+            if (mediaDetails!!.isVisible()) {
+                // todo add get list fragment
+                (parentFragment as BookmarkFragment).setupTabLayout()
+                val removed: ArrayList<Int> = mediaDetails!!.removedItems
+                removeFragment(mediaDetails!!)
+                (parentFragment as BookmarkFragment).setScroll(true)
+                setFragment(listFragment!!, mediaDetails)
+                (requireActivity() as MainActivity).showTabs()
+                if (listFragment is BookmarkPicturesFragment) {
+                    val adapter = ((listFragment as BookmarkPicturesFragment)
+                        .getAdapter() as GridViewAdapter?)
+                    val i: MutableIterator<*> = removed.iterator()
+                    while (i.hasNext()) {
+                        adapter!!.remove(adapter.getItem(i.next() as Int))
+                    }
+                    mediaDetails!!.clearRemoved()
+                }
+            } else {
+                moveToContributionsFragment()
+            }
+        } else {
+            moveToContributionsFragment()
+        }
+        // notify mediaDetails did not handled the backPressed further actions required.
+        return false
+    }
+
+    fun moveToContributionsFragment() {
+        (requireActivity() as MainActivity).setSelectedItemId(NavTab.CONTRIBUTIONS.code())
+        (requireActivity() as MainActivity).showTabs()
+    }
+
+    override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        Timber.d("on media clicked")
+        binding!!.exploreContainer.visibility = View.VISIBLE
+        (parentFragment as BookmarkFragment).binding!!.tabLayout.setVisibility(View.GONE)
+        mediaDetails = newInstance(false, true)
+        (parentFragment as BookmarkFragment).setScroll(false)
+        setFragment(mediaDetails!!, listFragment)
+        mediaDetails!!.showImage(position)
+    }
+
+    override fun onBackStackChanged() = Unit
+
+    override fun onDestroy() {
+        super.onDestroy()
+        binding = null
+    }
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarkPages.java

@@ -1,32 +0,0 @@
-package fr.free.nrw.commons.bookmarks;
-
-import androidx.fragment.app.Fragment;
-
-/**
- * Data class for handling a bookmark fragment and it title
- */
-public class BookmarkPages {
-    private Fragment page;
-    private String title;
-
-    BookmarkPages(Fragment fragment, String title) {
-        this.title = title;
-        this.page = fragment;
-    }
-
-    /**
-     * Return the fragment
-     * @return fragment object
-     */
-    public Fragment getPage() {
-        return page;
-    }
-
-    /**
-     * Return the fragment title
-     * @return title
-     */
-    public String getTitle() {
-        return title;
-    }
-}

app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarkPages.kt

@@ -0,0 +1,8 @@
+package fr.free.nrw.commons.bookmarks
+
+import androidx.fragment.app.Fragment
+
+data class BookmarkPages (
+    val page: Fragment? = null,
+    val title: String? = null
+)

app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapter.java

@@ -1,87 +0,0 @@
-package fr.free.nrw.commons.bookmarks;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.widget.ListAdapter;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-
-import java.util.ArrayList;
-
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesFragment;
-
-public class BookmarksPagerAdapter extends FragmentPagerAdapter {
-
-    private ArrayList<BookmarkPages> pages;
-
-    /**
-     * Default Constructor
-     * @param fm
-     * @param context
-     * @param onlyPictures is true if the fragment requires only BookmarkPictureFragment
-     *                     (i.e. when no user is logged in).
-     */
-    BookmarksPagerAdapter(FragmentManager fm, Context context,boolean onlyPictures) {
-        super(fm);
-        pages = new ArrayList<>();
-        Bundle picturesBundle = new Bundle();
-        picturesBundle.putString("categoryName", context.getString(R.string.title_page_bookmarks_pictures));
-        picturesBundle.putInt("order", 0);
-        pages.add(new BookmarkPages(
-                new BookmarkListRootFragment(picturesBundle, this),
-                context.getString(R.string.title_page_bookmarks_pictures)));
-        if (!onlyPictures) {
-            // if onlyPictures is false we also add the location fragment.
-            Bundle locationBundle = new Bundle();
-            locationBundle.putString("categoryName",
-                context.getString(R.string.title_page_bookmarks_locations));
-            locationBundle.putInt("order", 1);
-            pages.add(new BookmarkPages(
-                new BookmarkListRootFragment(locationBundle, this),
-                context.getString(R.string.title_page_bookmarks_locations)));
-
-            locationBundle.putInt("orderItem", 2);
-            pages.add(new BookmarkPages(
-                new BookmarkListRootFragment(locationBundle, this),
-                context.getString(R.string.title_page_bookmarks_items)));
-        }
-        notifyDataSetChanged();
-    }
-
-    @Override
-    public Fragment getItem(int position) {
-        return pages.get(position).getPage();
-    }
-
-    @Override
-    public int getCount() {
-        return pages.size();
-    }
-
-    @Nullable
-    @Override
-    public CharSequence getPageTitle(int position) {
-        return pages.get(position).getTitle();
-    }
-
-    /**
-     * Return the Adapter used to display the picture gridview
-     * @return adapter
-     */
-    public ListAdapter getMediaAdapter() {
-        BookmarkPicturesFragment fragment = (BookmarkPicturesFragment)(((BookmarkListRootFragment)pages.get(0).getPage()).listFragment);
-        return fragment.getAdapter();
-    }
-
-    /**
-     * Update the pictures list for the bookmark fragment
-     */
-    public void requestPictureListUpdate() {
-        BookmarkPicturesFragment fragment = (BookmarkPicturesFragment)(((BookmarkListRootFragment)pages.get(0).getPage()).listFragment);
-        fragment.onResume();
-    }
-}

app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapter.kt

@@ -0,0 +1,82 @@
+package fr.free.nrw.commons.bookmarks
+
+import android.content.Context
+import android.widget.ListAdapter
+import androidx.core.os.bundleOf
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentPagerAdapter
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesFragment
+
+class BookmarksPagerAdapter internal constructor(
+    fm: FragmentManager, context: Context, onlyPictures: Boolean
+) : FragmentPagerAdapter(fm) {
+    private val pages = mutableListOf<BookmarkPages>()
+
+    /**
+     * Default Constructor
+     * @param fm
+     * @param context
+     * @param onlyPictures is true if the fragment requires only BookmarkPictureFragment
+     * (i.e. when no user is logged in).
+     */
+    init {
+        pages.add(
+            BookmarkPages(
+                BookmarkListRootFragment(
+                    bundleOf(
+                        "categoryName" to context.getString(R.string.title_page_bookmarks_pictures),
+                        "order" to 0
+                    ), this
+                ), context.getString(R.string.title_page_bookmarks_pictures)
+            )
+        )
+        if (!onlyPictures) {
+            // if onlyPictures is false we also add the location fragment.
+            val locationBundle = bundleOf(
+                "categoryName" to context.getString(R.string.title_page_bookmarks_locations),
+                "order" to 1
+            )
+
+            pages.add(
+                BookmarkPages(
+                    BookmarkListRootFragment(locationBundle, this),
+                    context.getString(R.string.title_page_bookmarks_locations)
+                )
+            )
+
+            locationBundle.putInt("orderItem", 2)
+            pages.add(
+                BookmarkPages(
+                    BookmarkListRootFragment(locationBundle, this),
+                    context.getString(R.string.title_page_bookmarks_items)
+                )
+            )
+        }
+        pages.add(
+            BookmarkPages(
+                BookmarkListRootFragment(
+                    bundleOf(
+                        "categoryName" to context.getString(R.string.title_page_bookmarks_categories),
+                        "order" to 3
+                    ), this),
+                context.getString(R.string.title_page_bookmarks_categories)
+            )
+        )
+        notifyDataSetChanged()
+    }
+
+    override fun getItem(position: Int): Fragment = pages[position].page!!
+
+    override fun getCount(): Int = pages.size
+
+    override fun getPageTitle(position: Int): CharSequence? = pages[position].title
+
+    /**
+     * Return the Adapter used to display the picture gridview
+     * @return adapter
+     */
+    val mediaAdapter: ListAdapter?
+        get() = (((pages[0].page as BookmarkListRootFragment).listFragment) as BookmarkPicturesFragment).getAdapter()
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/category/BookmarkCategoriesDao.kt

@@ -0,0 +1,52 @@
+package fr.free.nrw.commons.bookmarks.category
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
+
+/**
+ * Bookmark categories dao
+ *
+ * @constructor Create empty Bookmark categories dao
+ */
+@Dao
+interface BookmarkCategoriesDao {
+
+    /**
+     * Insert or Delete category bookmark into DB
+     *
+     * @param bookmarksCategoryModal
+     */
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(bookmarksCategoryModal: BookmarksCategoryModal)
+
+
+    /**
+     * Delete category bookmark from DB
+     *
+     * @param bookmarksCategoryModal
+     */
+    @Delete
+    suspend fun delete(bookmarksCategoryModal: BookmarksCategoryModal)
+
+    /**
+     * Checks if given category exist in DB
+     *
+     * @param categoryName
+     * @return
+     */
+    @Query("SELECT EXISTS (SELECT 1 FROM bookmarks_categories WHERE categoryName = :categoryName)")
+    suspend fun doesExist(categoryName: String): Boolean
+
+    /**
+     * Get all categories
+     *
+     * @return
+     */
+    @Query("SELECT * FROM bookmarks_categories")
+    fun getAllCategories(): Flow<List<BookmarksCategoryModal>>
+
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/category/BookmarkCategoriesFragment.kt

@@ -0,0 +1,143 @@
+package fr.free.nrw.commons.bookmarks.category
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import dagger.android.support.DaggerFragment
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.category.CategoryDetailsActivity
+import javax.inject.Inject
+
+/**
+ * Tab fragment to show list of bookmarked Categories
+ */
+class BookmarkCategoriesFragment : DaggerFragment() {
+
+    @Inject
+    lateinit var bookmarkCategoriesDao: BookmarkCategoriesDao
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return ComposeView(requireContext()).apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                MaterialTheme(
+                    colorScheme = if (isSystemInDarkTheme()) darkColorScheme(
+                        primary = colorResource(R.color.primaryDarkColor),
+                        surface = colorResource(R.color.main_background_dark),
+                        background = colorResource(R.color.main_background_dark)
+                    ) else lightColorScheme(
+                        primary = colorResource(R.color.primaryColor),
+                        surface = colorResource(R.color.main_background_light),
+                        background = colorResource(R.color.main_background_light)
+                    )
+                ) {
+                    val listOfBookmarks by bookmarkCategoriesDao.getAllCategories()
+                        .collectAsStateWithLifecycle(initialValue = emptyList())
+                    Surface(modifier = Modifier.fillMaxSize()) {
+                        Box(contentAlignment = Alignment.Center) {
+                            if (listOfBookmarks.isEmpty()) {
+                                Text(
+                                    text = stringResource(R.string.bookmark_empty),
+                                    style = MaterialTheme.typography.bodyMedium,
+                                    color = if (isSystemInDarkTheme()) Color(0xB3FFFFFF)
+                                    else Color(
+                                        0x8A000000
+                                    )
+                                )
+                            } else {
+                                LazyColumn(modifier = Modifier.fillMaxSize()) {
+                                    items(items = listOfBookmarks) { bookmarkItem ->
+                                        CategoryItem(
+                                            categoryName = bookmarkItem.categoryName,
+                                            onClick = {
+                                                val categoryDetailsIntent = Intent(
+                                                    requireContext(),
+                                                    CategoryDetailsActivity::class.java
+                                                ).putExtra("categoryName", it)
+                                                startActivity(categoryDetailsIntent)
+                                            }
+                                        )
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+    @Composable
+    fun CategoryItem(
+        modifier: Modifier = Modifier,
+        onClick: (String) -> Unit,
+        categoryName: String
+    ) {
+        Row(modifier = modifier.clickable {
+            onClick(categoryName)
+        }) {
+            ListItem(
+                leadingContent = {
+                    Image(
+                        modifier = Modifier.size(48.dp),
+                        painter = painterResource(R.drawable.commons),
+                        contentDescription = null
+                    )
+                },
+                headlineContent = {
+                    Text(
+                        text = categoryName,
+                        maxLines = 2,
+                        color = if (isSystemInDarkTheme()) Color.White else Color.Black,
+                        style = MaterialTheme.typography.bodyMedium,
+                        fontWeight = FontWeight.SemiBold
+                    )
+                }
+            )
+        }
+    }
+
+    @Preview
+    @Composable
+    private fun CategoryItemPreview() {
+        CategoryItem(
+            onClick = {},
+            categoryName = "Test Category"
+        )
+    }
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/category/BookmarksCategoryModal.kt

@@ -0,0 +1,15 @@
+package fr.free.nrw.commons.bookmarks.category
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+/**
+ * Data class representing bookmarked category in DB
+ *
+ * @property categoryName
+ * @constructor Create empty Bookmarks category modal
+ */
+@Entity(tableName = "bookmarks_categories")
+data class BookmarksCategoryModal(
+    @PrimaryKey val categoryName: String
+)

app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsContentProvider.java

@@ -1,129 +0,0 @@
-package fr.free.nrw.commons.bookmarks.items;
-
-import static fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.COLUMN_ID;
-import static fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table.TABLE_NAME;
-
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteQueryBuilder;
-import android.net.Uri;
-import android.text.TextUtils;
-import androidx.annotation.NonNull;
-import fr.free.nrw.commons.BuildConfig;
-import fr.free.nrw.commons.data.DBOpenHelper;
-import fr.free.nrw.commons.di.CommonsDaggerContentProvider;
-import javax.inject.Inject;
-import timber.log.Timber;
-
-/**
- * Handles private storage for bookmarked items
- */
-public class BookmarkItemsContentProvider extends CommonsDaggerContentProvider {
-
-    private static final String BASE_PATH = "bookmarksItems";
-    public static final Uri BASE_URI =
-        Uri.parse("content://" + BuildConfig.BOOKMARK_ITEMS_AUTHORITY + "/" + BASE_PATH);
-
-
-    /**
-     * Append bookmark items ID to the base uri
-     */
-    public static Uri uriForName(final String id) {
-        return Uri.parse(BASE_URI + "/" + id);
-    }
-
-    @Inject
-    DBOpenHelper dbOpenHelper;
-
-    @Override
-    public String getType(@NonNull final Uri uri) {
-        return null;
-    }
-
-    /**
-     * Queries the SQLite database for the bookmark items
-     * @param uri : contains the uri for bookmark items
-     * @param projection : contains the all fields of the table
-     * @param selection : handles Where
-     * @param selectionArgs : the condition of Where clause
-     * @param sortOrder : ascending or descending
-     */
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public Cursor query(@NonNull final Uri uri, final String[] projection, final String selection,
-        final String[] selectionArgs, final String sortOrder) {
-        final SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
-        queryBuilder.setTables(TABLE_NAME);
-        final SQLiteDatabase db = dbOpenHelper.getReadableDatabase();
-        final Cursor cursor = queryBuilder.query(db, projection, selection,
-            selectionArgs, null, null, sortOrder);
-        cursor.setNotificationUri(getContext().getContentResolver(), uri);
-        return cursor;
-    }
-
-    /**
-     * Handles the update query of local SQLite Database
-     * @param uri : contains the uri for bookmark items
-     * @param contentValues : new values to be entered to db
-     * @param selection : handles Where
-     * @param selectionArgs : the condition of Where clause
-     */
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public int update(@NonNull final Uri uri, final ContentValues contentValues,
-        final String selection, final String[] selectionArgs) {
-        final SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
-        final int rowsUpdated;
-        if (TextUtils.isEmpty(selection)) {
-            final int id = Integer.parseInt(uri.getLastPathSegment());
-            rowsUpdated = sqlDB.update(TABLE_NAME,
-                contentValues,
-                COLUMN_ID + " = ?",
-                new String[]{String.valueOf(id)});
-        } else {
-            throw new IllegalArgumentException(
-                "Parameter `selection` should be empty when updating an ID");
-        }
-
-        getContext().getContentResolver().notifyChange(uri, null);
-        return rowsUpdated;
-    }
-
-    /**
-     * Handles the insertion of new bookmark items record to local SQLite Database
-     * @param uri
-     * @param contentValues
-     * @return
-     */
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public Uri insert(@NonNull final Uri uri, final ContentValues contentValues) {
-        final SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
-        final long id = sqlDB.insert(TABLE_NAME, null, contentValues);
-        getContext().getContentResolver().notifyChange(uri, null);
-        return Uri.parse(BASE_URI + "/" + id);
-    }
-
-    /**
-     * Handles the deletion of new bookmark items record to local SQLite Database
-     * @param uri
-     * @param s
-     * @param strings
-     * @return
-     */
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public int delete(@NonNull final Uri uri, final String s, final String[] strings) {
-        final int rows;
-        final SQLiteDatabase db = dbOpenHelper.getReadableDatabase();
-        Timber.d("Deleting bookmark name %s", uri.getLastPathSegment());
-        rows = db.delete(
-            TABLE_NAME,
-            "item_id = ?",
-            new String[]{uri.getLastPathSegment()}
-        );
-        getContext().getContentResolver().notifyChange(uri, null);
-        return rows;
-    }
-}

app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsContentProvider.kt

@@ -0,0 +1,101 @@
+package fr.free.nrw.commons.bookmarks.items
+
+import android.content.ContentValues
+import android.database.Cursor
+import android.database.sqlite.SQLiteQueryBuilder
+import android.net.Uri
+import fr.free.nrw.commons.BuildConfig
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.TABLE_NAME
+import fr.free.nrw.commons.di.CommonsDaggerContentProvider
+import androidx.core.net.toUri
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.COLUMN_ID
+
+/**
+ * Handles private storage for bookmarked items
+ */
+class BookmarkItemsContentProvider : CommonsDaggerContentProvider() {
+    override fun getType(uri: Uri): String? = null
+
+    /**
+     * Queries the SQLite database for the bookmark items
+     * @param uri : contains the uri for bookmark items
+     * @param projection : contains the all fields of the table
+     * @param selection : handles Where
+     * @param selectionArgs : the condition of Where clause
+     * @param sortOrder : ascending or descending
+     */
+    override fun query(
+        uri: Uri, projection: Array<String>?, selection: String?,
+        selectionArgs: Array<String>?, sortOrder: String?
+    ): Cursor {
+        val queryBuilder = SQLiteQueryBuilder().apply {
+            tables = TABLE_NAME
+        }
+
+        return queryBuilder.query(
+            requireDb(), projection, selection,
+            selectionArgs, null, null, sortOrder
+        ).apply {
+            setNotificationUri(context?.contentResolver, uri)
+        }
+    }
+
+    /**
+     * Handles the update query of local SQLite Database
+     * @param uri : contains the uri for bookmark items
+     * @param contentValues : new values to be entered to db
+     * @param selection : handles Where
+     * @param selectionArgs : the condition of Where clause
+     */
+    override fun update(
+        uri: Uri, contentValues: ContentValues?,
+        selection: String?, selectionArgs: Array<String>?
+    ): Int {
+        val rowsUpdated: Int
+        if (selection.isNullOrEmpty()) {
+            val id = uri.lastPathSegment!!.toInt()
+            rowsUpdated = requireDb().update(
+                TABLE_NAME,
+                contentValues,
+                "$COLUMN_ID = ?",
+                arrayOf(id.toString())
+            )
+        } else {
+            throw IllegalArgumentException(
+                "Parameter `selection` should be empty when updating an ID"
+            )
+        }
+
+        context?.contentResolver?.notifyChange(uri, null)
+        return rowsUpdated
+    }
+
+    /**
+     * Handles the insertion of new bookmark items record to local SQLite Database
+     */
+    override fun insert(uri: Uri, contentValues: ContentValues?): Uri? {
+        val id = requireDb().insert(TABLE_NAME, null, contentValues)
+        context?.contentResolver?.notifyChange(uri, null)
+        return "$BASE_URI/$id".toUri()
+    }
+
+
+    /**
+     * Handles the deletion of new bookmark items record to local SQLite Database
+     */
+    override fun delete(uri: Uri, s: String?, strings: Array<String>?): Int {
+        val rows: Int = requireDb().delete(
+            TABLE_NAME,
+            "$COLUMN_ID = ?",
+            arrayOf(uri.lastPathSegment)
+        )
+       context?.contentResolver?.notifyChange(uri, null)
+        return rows
+    }
+
+    companion object {
+        private const val BASE_PATH = "bookmarksItems"
+        val BASE_URI: Uri = "content://${BuildConfig.BOOKMARK_ITEMS_AUTHORITY}/$BASE_PATH".toUri()
+        fun uriForName(id: String) = "$BASE_URI/$id".toUri()
+    }
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsController.java

@@ -1,27 +0,0 @@
-package fr.free.nrw.commons.bookmarks.items;
-
-import fr.free.nrw.commons.upload.structure.depictions.DepictedItem;
-import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-/**
- * Handles loading bookmarked items from Database
- */
-@Singleton
-public class BookmarkItemsController {
-
-    @Inject
-    BookmarkItemsDao bookmarkItemsDao;
-
-    @Inject
-    public BookmarkItemsController() {}
-
-    /**
-     * Load from DB the bookmarked items
-     * @return a list of DepictedItem objects.
-     */
-    public List<DepictedItem> loadFavoritesItems() {
-        return bookmarkItemsDao.getAllBookmarksItems();
-    }
-}

app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsController.kt

@@ -0,0 +1,23 @@
+package fr.free.nrw.commons.bookmarks.items
+
+import fr.free.nrw.commons.upload.structure.depictions.DepictedItem
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Handles loading bookmarked items from Database
+ */
+@Singleton
+class BookmarkItemsController @Inject constructor() {
+    @JvmField
+    @Inject
+    var bookmarkItemsDao: BookmarkItemsDao? = null
+
+    /**
+     * Load from DB the bookmarked items
+     * @return a list of DepictedItem objects.
+     */
+    fun loadFavoritesItems(): List<DepictedItem> {
+        return bookmarkItemsDao?.getAllBookmarksItems() ?: emptyList()
+    }
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.java

@@ -1,329 +0,0 @@
-package fr.free.nrw.commons.bookmarks.items;
-
-import android.annotation.SuppressLint;
-import android.content.ContentProviderClient;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.os.RemoteException;
-import fr.free.nrw.commons.category.CategoryItem;
-import fr.free.nrw.commons.upload.structure.depictions.DepictedItem;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * Handles database operations for bookmarked items
- */
-@Singleton
-public class BookmarkItemsDao {
-
-    private final Provider<ContentProviderClient> clientProvider;
-
-    @Inject
-    public BookmarkItemsDao(
-        @Named("bookmarksItem") final Provider<ContentProviderClient> clientProvider) {
-        this.clientProvider = clientProvider;
-    }
-
-
-    /**
-     * Find all persisted items bookmarks on database
-     * @return list of bookmarks
-     */
-    public List<DepictedItem> getAllBookmarksItems() {
-        final List<DepictedItem> items = new ArrayList<>();
-        final ContentProviderClient db = clientProvider.get();
-        try (final Cursor cursor = db.query(
-            BookmarkItemsContentProvider.BASE_URI,
-            Table.ALL_FIELDS,
-            null,
-            new String[]{},
-            null)) {
-            while (cursor != null && cursor.moveToNext()) {
-                items.add(fromCursor(cursor));
-            }
-        } catch (final RemoteException e) {
-            throw new RuntimeException(e);
-        } finally {
-            db.release();
-        }
-        return items;
-    }
-
-
-    /**
-     * Look for a bookmark in database and in order to insert or delete it
-     * @param depictedItem : Bookmark object
-     * @return boolean : is bookmark now favorite ?
-     */
-    public boolean updateBookmarkItem(final DepictedItem depictedItem) {
-        final boolean bookmarkExists = findBookmarkItem(depictedItem.getId());
-        if (bookmarkExists) {
-            deleteBookmarkItem(depictedItem);
-        } else {
-            addBookmarkItem(depictedItem);
-        }
-        return !bookmarkExists;
-    }
-
-    /**
-     * Add a Bookmark to database
-     * @param depictedItem : Bookmark to add
-     */
-    private void addBookmarkItem(final DepictedItem depictedItem) {
-        final ContentProviderClient db = clientProvider.get();
-        try {
-            db.insert(BookmarkItemsContentProvider.BASE_URI, toContentValues(depictedItem));
-        } catch (final RemoteException e) {
-            throw new RuntimeException(e);
-        } finally {
-            db.release();
-        }
-    }
-
-    /**
-     * Delete a bookmark from database
-     * @param depictedItem : Bookmark to delete
-     */
-    private void deleteBookmarkItem(final DepictedItem depictedItem) {
-        final ContentProviderClient db = clientProvider.get();
-        try {
-            db.delete(BookmarkItemsContentProvider.uriForName(depictedItem.getId()), null, null);
-        } catch (final RemoteException e) {
-            throw new RuntimeException(e);
-        } finally {
-            db.release();
-        }
-    }
-
-    /**
-     * Find a bookmark from database based on its name
-     * @param depictedItemID : Bookmark to find
-     * @return boolean : is bookmark in database ?
-     */
-    public boolean findBookmarkItem(final String depictedItemID) {
-        if (depictedItemID == null) { //Avoiding NPE's
-            return false;
-        }
-        final ContentProviderClient db = clientProvider.get();
-        try (final Cursor cursor = db.query(
-            BookmarkItemsContentProvider.BASE_URI,
-            Table.ALL_FIELDS,
-            Table.COLUMN_ID + "=?",
-            new String[]{depictedItemID},
-            null
-        )) {
-            if (cursor != null && cursor.moveToFirst()) {
-                return true;
-            }
-        } catch (final RemoteException e) {
-            throw new RuntimeException(e);
-        } finally {
-            db.release();
-        }
-        return false;
-    }
-
-    /**
-     * Recives real data from cursor
-     * @param cursor : Object for storing database data
-     * @return DepictedItem
-     */
-    @SuppressLint("Range")
-    DepictedItem fromCursor(final Cursor cursor) {
-        final String fileName = cursor.getString(cursor.getColumnIndex(Table.COLUMN_NAME));
-        final String description
-            = cursor.getString(cursor.getColumnIndex(Table.COLUMN_DESCRIPTION));
-        final String imageUrl = cursor.getString(cursor.getColumnIndex(Table.COLUMN_IMAGE));
-        final String instanceListString
-            = cursor.getString(cursor.getColumnIndex(Table.COLUMN_INSTANCE_LIST));
-        final List<String> instanceList = StringToArray(instanceListString);
-        final String categoryNameListString = cursor.getString(cursor
-            .getColumnIndex(Table.COLUMN_CATEGORIES_NAME_LIST));
-        final List<String> categoryNameList = StringToArray(categoryNameListString);
-        final String categoryDescriptionListString = cursor.getString(cursor
-            .getColumnIndex(Table.COLUMN_CATEGORIES_DESCRIPTION_LIST));
-        final List<String> categoryDescriptionList = StringToArray(categoryDescriptionListString);
-        final String categoryThumbnailListString = cursor.getString(cursor
-            .getColumnIndex(Table.COLUMN_CATEGORIES_THUMBNAIL_LIST));
-        final List<String> categoryThumbnailList = StringToArray(categoryThumbnailListString);
-        final List<CategoryItem> categoryList = convertToCategoryItems(categoryNameList,
-            categoryDescriptionList, categoryThumbnailList);
-        final boolean isSelected
-            = Boolean.parseBoolean(cursor.getString(cursor
-            .getColumnIndex(Table.COLUMN_IS_SELECTED)));
-        final String id = cursor.getString(cursor.getColumnIndex(Table.COLUMN_ID));
-
-        return new DepictedItem(
-            fileName,
-            description,
-            imageUrl,
-            instanceList,
-            categoryList,
-            isSelected,
-            id
-        );
-    }
-
-    private List<CategoryItem> convertToCategoryItems(List<String> categoryNameList,
-        List<String> categoryDescriptionList, List<String> categoryThumbnailList) {
-        List<CategoryItem> categoryItems = new ArrayList<>();
-        for(int i=0; i<categoryNameList.size(); i++){
-            categoryItems.add(new CategoryItem(categoryNameList.get(i),
-                categoryDescriptionList.get(i),
-                categoryThumbnailList.get(i), false));
-        }
-        return categoryItems;
-    }
-
-    /**
-     * Converts string to List
-     * @param listString comma separated single string from of list items
-     * @return List of string
-     */
-    private List<String> StringToArray(final String listString) {
-        final String[] elements = listString.split(",");
-        return Arrays.asList(elements);
-    }
-
-    /**
-     * Converts string to List
-     * @param list list of items
-     * @return string comma separated single string of items
-     */
-    private String ArrayToString(final List<String> list) {
-        if (list != null) {
-            return StringUtils.join(list, ',');
-        }
-        return null;
-    }
-
-    /**
-     * Takes data from DepictedItem and create a content value object
-     * @param depictedItem depicted item
-     * @return ContentValues
-     */
-    private ContentValues toContentValues(final DepictedItem depictedItem) {
-
-        final List<String> namesOfCommonsCategories = new ArrayList<>();
-        for (final CategoryItem category :
-            depictedItem.getCommonsCategories()) {
-            namesOfCommonsCategories.add(category.getName());
-        }
-
-        final List<String> descriptionsOfCommonsCategories = new ArrayList<>();
-        for (final CategoryItem category :
-            depictedItem.getCommonsCategories()) {
-            descriptionsOfCommonsCategories.add(category.getDescription());
-        }
-
-        final List<String> thumbnailsOfCommonsCategories = new ArrayList<>();
-        for (final CategoryItem category :
-            depictedItem.getCommonsCategories()) {
-            thumbnailsOfCommonsCategories.add(category.getThumbnail());
-        }
-
-        final ContentValues cv = new ContentValues();
-        cv.put(Table.COLUMN_NAME, depictedItem.getName());
-        cv.put(Table.COLUMN_DESCRIPTION, depictedItem.getDescription());
-        cv.put(Table.COLUMN_IMAGE, depictedItem.getImageUrl());
-        cv.put(Table.COLUMN_INSTANCE_LIST, ArrayToString(depictedItem.getInstanceOfs()));
-        cv.put(Table.COLUMN_CATEGORIES_NAME_LIST, ArrayToString(namesOfCommonsCategories));
-        cv.put(Table.COLUMN_CATEGORIES_DESCRIPTION_LIST,
-            ArrayToString(descriptionsOfCommonsCategories));
-        cv.put(Table.COLUMN_CATEGORIES_THUMBNAIL_LIST,
-            ArrayToString(thumbnailsOfCommonsCategories));
-        cv.put(Table.COLUMN_IS_SELECTED, depictedItem.isSelected());
-        cv.put(Table.COLUMN_ID, depictedItem.getId());
-        return cv;
-    }
-
-    /**
-     * Table of bookmarksItems data
-     */
-    public static final class Table {
-        public static final String TABLE_NAME = "bookmarksItems";
-        public static final String COLUMN_NAME = "item_name";
-        public static final String COLUMN_DESCRIPTION = "item_description";
-        public static final String COLUMN_IMAGE = "item_image_url";
-        public static final String COLUMN_INSTANCE_LIST = "item_instance_of";
-        public static final String COLUMN_CATEGORIES_NAME_LIST = "item_name_categories";
-        public static final String COLUMN_CATEGORIES_DESCRIPTION_LIST = "item_description_categories";
-        public static final String COLUMN_CATEGORIES_THUMBNAIL_LIST = "item_thumbnail_categories";
-        public static final String COLUMN_IS_SELECTED = "item_is_selected";
-        public static final String COLUMN_ID = "item_id";
-
-        public static final String[] ALL_FIELDS = {
-            COLUMN_NAME,
-            COLUMN_DESCRIPTION,
-            COLUMN_IMAGE,
-            COLUMN_INSTANCE_LIST,
-            COLUMN_CATEGORIES_NAME_LIST,
-            COLUMN_CATEGORIES_DESCRIPTION_LIST,
-            COLUMN_CATEGORIES_THUMBNAIL_LIST,
-            COLUMN_IS_SELECTED,
-            COLUMN_ID
-        };
-
-        static final String DROP_TABLE_STATEMENT = "DROP TABLE IF EXISTS " + TABLE_NAME;
-        static final String CREATE_TABLE_STATEMENT = "CREATE TABLE " + TABLE_NAME + " ("
-            + COLUMN_NAME + " STRING,"
-            + COLUMN_DESCRIPTION + " STRING,"
-            + COLUMN_IMAGE + " STRING,"
-            + COLUMN_INSTANCE_LIST + " STRING,"
-            + COLUMN_CATEGORIES_NAME_LIST + " STRING,"
-            + COLUMN_CATEGORIES_DESCRIPTION_LIST + " STRING,"
-            + COLUMN_CATEGORIES_THUMBNAIL_LIST + " STRING,"
-            + COLUMN_IS_SELECTED + " STRING,"
-            + COLUMN_ID + " STRING PRIMARY KEY"
-            + ");";
-
-        /**
-         * Creates table
-         * @param db SQLiteDatabase
-         */
-        public static void onCreate(final SQLiteDatabase db) {
-            db.execSQL(CREATE_TABLE_STATEMENT);
-        }
-
-        /**
-         * Deletes database
-         * @param db SQLiteDatabase
-         */
-        public static void onDelete(final SQLiteDatabase db) {
-            db.execSQL(DROP_TABLE_STATEMENT);
-            onCreate(db);
-        }
-
-        /**
-         * Updates database
-         * @param db SQLiteDatabase
-         * @param from starting
-         * @param to end
-         */
-        public static void onUpdate(final SQLiteDatabase db, int from, final int to) {
-            if (from == to) {
-                return;
-            }
-            if (from < 18) {
-                // doesn't exist yet
-                from++;
-                onUpdate(db, from, to);
-                return;
-            }
-
-            if (from == 18) {
-                // table added in version 19
-                onCreate(db);
-                from++;
-                onUpdate(db, from, to);
-            }
-        }
-    }
-}

app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.kt

@@ -0,0 +1,203 @@
+package fr.free.nrw.commons.bookmarks.items
+
+import android.annotation.SuppressLint
+import android.content.ContentProviderClient
+import android.content.ContentValues
+import android.database.Cursor
+import android.os.RemoteException
+import androidx.core.content.contentValuesOf
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsContentProvider.Companion.BASE_URI
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsContentProvider.Companion.uriForName
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.COLUMN_CATEGORIES_DESCRIPTION_LIST
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.COLUMN_CATEGORIES_NAME_LIST
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.COLUMN_CATEGORIES_THUMBNAIL_LIST
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.COLUMN_DESCRIPTION
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.COLUMN_ID
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.COLUMN_IMAGE
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.COLUMN_INSTANCE_LIST
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.COLUMN_IS_SELECTED
+import fr.free.nrw.commons.bookmarks.items.BookmarkItemsTable.COLUMN_NAME
+import fr.free.nrw.commons.category.CategoryItem
+import fr.free.nrw.commons.upload.structure.depictions.DepictedItem
+import fr.free.nrw.commons.utils.arrayToString
+import fr.free.nrw.commons.utils.getString
+import fr.free.nrw.commons.utils.getStringArray
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Provider
+import javax.inject.Singleton
+
+/**
+ * Handles database operations for bookmarked items
+ */
+@Singleton
+class BookmarkItemsDao @Inject constructor(
+    @param:Named("bookmarksItem") private val clientProvider: Provider<ContentProviderClient>
+) {
+    /**
+     * Find all persisted items bookmarks on database
+     * @return list of bookmarks
+     */
+    fun getAllBookmarksItems(): List<DepictedItem> {
+        val items: MutableList<DepictedItem> = mutableListOf()
+        val db = clientProvider.get()
+        try {
+            db.query(
+                BASE_URI,
+                BookmarkItemsTable.ALL_FIELDS,
+                null,
+                arrayOf(),
+                null
+            ).use { cursor ->
+                while (cursor != null && cursor.moveToNext()) {
+                    items.add(fromCursor(cursor))
+                }
+            }
+        } catch (e: RemoteException) {
+            throw RuntimeException(e)
+        } finally {
+            db.release()
+        }
+        return items
+    }
+
+
+    /**
+     * Look for a bookmark in database and in order to insert or delete it
+     * @param depictedItem : Bookmark object
+     * @return boolean : is bookmark now favorite ?
+     */
+    fun updateBookmarkItem(depictedItem: DepictedItem): Boolean {
+        val bookmarkExists = findBookmarkItem(depictedItem.id)
+        if (bookmarkExists) {
+            deleteBookmarkItem(depictedItem)
+        } else {
+            addBookmarkItem(depictedItem)
+        }
+        return !bookmarkExists
+    }
+
+    /**
+     * Add a Bookmark to database
+     * @param depictedItem : Bookmark to add
+     */
+    private fun addBookmarkItem(depictedItem: DepictedItem) {
+        val db = clientProvider.get()
+        try {
+            db.insert(BASE_URI, toContentValues(depictedItem))
+        } catch (e: RemoteException) {
+            throw RuntimeException(e)
+        } finally {
+            db.release()
+        }
+    }
+
+    /**
+     * Delete a bookmark from database
+     * @param depictedItem : Bookmark to delete
+     */
+    private fun deleteBookmarkItem(depictedItem: DepictedItem) {
+        val db = clientProvider.get()
+        try {
+            db.delete(uriForName(depictedItem.id), null, null)
+        } catch (e: RemoteException) {
+            throw RuntimeException(e)
+        } finally {
+            db.release()
+        }
+    }
+
+    /**
+     * Find a bookmark from database based on its name
+     * @param depictedItemID : Bookmark to find
+     * @return boolean : is bookmark in database ?
+     */
+    fun findBookmarkItem(depictedItemID: String?): Boolean {
+        if (depictedItemID == null) { //Avoiding NPE's
+            return false
+        }
+        val db = clientProvider.get()
+        try {
+            db.query(
+                BASE_URI,
+                BookmarkItemsTable.ALL_FIELDS,
+                COLUMN_ID + "=?",
+                arrayOf(depictedItemID),
+                null
+            ).use { cursor ->
+                if (cursor != null && cursor.moveToFirst()) {
+                    return true
+                }
+            }
+        } catch (e: RemoteException) {
+            throw RuntimeException(e)
+        } finally {
+            db.release()
+        }
+        return false
+    }
+
+    /**
+     * Recives real data from cursor
+     * @param cursor : Object for storing database data
+     * @return DepictedItem
+     */
+    @SuppressLint("Range")
+    fun fromCursor(cursor: Cursor) = with(cursor) {
+        var name = getString(COLUMN_NAME)
+        if (name == null) {
+            name = ""
+        }
+
+        var id = getString(COLUMN_ID)
+        if (id == null) {
+            id = ""
+        }
+
+        DepictedItem(
+            name,
+            getString(COLUMN_DESCRIPTION),
+            getString(COLUMN_IMAGE),
+            getStringArray(COLUMN_INSTANCE_LIST),
+            convertToCategoryItems(
+                getStringArray(COLUMN_CATEGORIES_NAME_LIST),
+                getStringArray(COLUMN_CATEGORIES_DESCRIPTION_LIST),
+                getStringArray(COLUMN_CATEGORIES_THUMBNAIL_LIST)
+            ),
+            getString(COLUMN_IS_SELECTED).toBoolean(),
+            id
+        )
+    }
+
+    private fun convertToCategoryItems(
+        categoryNameList: List<String>,
+        categoryDescriptionList: List<String>,
+        categoryThumbnailList: List<String>
+    ): List<CategoryItem> = categoryNameList.mapIndexed { index, name ->
+        CategoryItem(
+            name = name,
+            description = categoryDescriptionList.getOrNull(index),
+            thumbnail = categoryThumbnailList.getOrNull(index),
+            isSelected = false
+        )
+    }
+
+    /**
+     * Takes data from DepictedItem and create a content value object
+     * @param depictedItem depicted item
+     * @return ContentValues
+     */
+    private fun toContentValues(depictedItem: DepictedItem): ContentValues {
+        return contentValuesOf(
+            COLUMN_NAME to depictedItem.name,
+            COLUMN_DESCRIPTION to depictedItem.description,
+            COLUMN_IMAGE to depictedItem.imageUrl,
+            COLUMN_INSTANCE_LIST to arrayToString(depictedItem.instanceOfs),
+            COLUMN_CATEGORIES_NAME_LIST to arrayToString(depictedItem.commonsCategories.map { it.name }),
+            COLUMN_CATEGORIES_DESCRIPTION_LIST to arrayToString(depictedItem.commonsCategories.map { it.description }),
+            COLUMN_CATEGORIES_THUMBNAIL_LIST to arrayToString(depictedItem.commonsCategories.map { it.thumbnail }),
+            COLUMN_IS_SELECTED to depictedItem.isSelected,
+            COLUMN_ID to depictedItem.id,
+        )
+    }
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsFragment.java

@@ -1,81 +0,0 @@
-package fr.free.nrw.commons.bookmarks.items;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import dagger.android.support.DaggerFragment;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.databinding.FragmentBookmarksItemsBinding;
-import fr.free.nrw.commons.upload.structure.depictions.DepictedItem;
-import java.util.List;
-import javax.inject.Inject;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Tab fragment to show list of bookmarked Wikidata Items
- */
-public class BookmarkItemsFragment extends DaggerFragment {
-
-    private FragmentBookmarksItemsBinding binding;
-
-    @Inject
-    BookmarkItemsController controller;
-
-    public static BookmarkItemsFragment newInstance() {
-        return new BookmarkItemsFragment();
-    }
-
-    @Override
-    public View onCreateView(
-        @NonNull final LayoutInflater inflater,
-        final ViewGroup container,
-        final Bundle savedInstanceState
-    ) {
-        binding = FragmentBookmarksItemsBinding.inflate(inflater, container, false);
-        return binding.getRoot();
-    }
-
-    @Override
-    public void onViewCreated(final @NotNull View view, @Nullable final Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        initList(requireContext());
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        initList(requireContext());
-    }
-
-    /**
-     * Get list of DepictedItem and sets to the adapter
-     * @param context context
-     */
-    private void initList(final Context context) {
-        final List<DepictedItem> depictItems = controller.loadFavoritesItems();
-        final BookmarkItemsAdapter adapter = new BookmarkItemsAdapter(depictItems, context);
-        binding.listView.setAdapter(adapter);
-        binding.loadingImagesProgressBar.setVisibility(View.GONE);
-        if (depictItems.isEmpty()) {
-            binding.statusMessage.setText(R.string.bookmark_empty);
-            binding.statusMessage.setVisibility(View.VISIBLE);
-        } else {
-            binding.statusMessage.setVisibility(View.GONE);
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        binding = null;
-    }
-}

app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsFragment.kt

@@ -0,0 +1,62 @@
+package fr.free.nrw.commons.bookmarks.items
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import dagger.android.support.DaggerFragment
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.databinding.FragmentBookmarksItemsBinding
+import javax.inject.Inject
+
+/**
+ * Tab fragment to show list of bookmarked Wikidata Items
+ */
+class BookmarkItemsFragment : DaggerFragment() {
+    private var binding: FragmentBookmarksItemsBinding? = null
+
+    @JvmField
+    @Inject
+    var controller: BookmarkItemsController? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentBookmarksItemsBinding.inflate(inflater, container, false)
+        return binding!!.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initList(requireContext())
+    }
+
+    override fun onResume() {
+        super.onResume()
+        initList(requireContext())
+    }
+
+    /**
+     * Get list of DepictedItem and sets to the adapter
+     * @param context context
+     */
+    private fun initList(context: Context) {
+        val depictItems = controller!!.loadFavoritesItems()
+        binding!!.listView.adapter = BookmarkItemsAdapter(depictItems, context)
+        binding!!.loadingImagesProgressBar.visibility = View.GONE
+        if (depictItems.isEmpty()) {
+            binding!!.statusMessage.setText(R.string.bookmark_empty)
+            binding!!.statusMessage.visibility = View.VISIBLE
+        } else {
+            binding!!.statusMessage.visibility = View.GONE
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        binding = null
+    }
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsTable.kt

@@ -0,0 +1,90 @@
+package fr.free.nrw.commons.bookmarks.items
+
+import android.database.sqlite.SQLiteDatabase
+
+/**
+ * Table of bookmarksItems data
+ */
+object BookmarkItemsTable {
+    const val TABLE_NAME = "bookmarksItems"
+    const val COLUMN_NAME = "item_name"
+    const val COLUMN_DESCRIPTION = "item_description"
+    const val COLUMN_IMAGE = "item_image_url"
+    const val COLUMN_INSTANCE_LIST = "item_instance_of"
+    const val COLUMN_CATEGORIES_NAME_LIST = "item_name_categories"
+    const val COLUMN_CATEGORIES_DESCRIPTION_LIST = "item_description_categories"
+    const val COLUMN_CATEGORIES_THUMBNAIL_LIST = "item_thumbnail_categories"
+    const val COLUMN_IS_SELECTED = "item_is_selected"
+    const val COLUMN_ID = "item_id"
+
+    val ALL_FIELDS = arrayOf(
+        COLUMN_NAME,
+        COLUMN_DESCRIPTION,
+        COLUMN_IMAGE,
+        COLUMN_INSTANCE_LIST,
+        COLUMN_CATEGORIES_NAME_LIST,
+        COLUMN_CATEGORIES_DESCRIPTION_LIST,
+        COLUMN_CATEGORIES_THUMBNAIL_LIST,
+        COLUMN_IS_SELECTED,
+        COLUMN_ID
+    )
+
+    const val DROP_TABLE_STATEMENT = "DROP TABLE IF EXISTS $TABLE_NAME"
+
+    val CREATE_TABLE_STATEMENT =
+        """CREATE TABLE $TABLE_NAME (
+             $COLUMN_NAME STRING,
+             $COLUMN_DESCRIPTION STRING,
+             $COLUMN_IMAGE STRING,
+             $COLUMN_INSTANCE_LIST STRING,
+             $COLUMN_CATEGORIES_NAME_LIST STRING,
+             $COLUMN_CATEGORIES_DESCRIPTION_LIST STRING,
+             $COLUMN_CATEGORIES_THUMBNAIL_LIST STRING,
+             $COLUMN_IS_SELECTED STRING,
+             $COLUMN_ID STRING PRIMARY KEY
+           );""".trimIndent()
+
+    /**
+     * Creates table
+     *
+     * @param db SQLiteDatabase
+     */
+    fun onCreate(db: SQLiteDatabase) {
+        db.execSQL(CREATE_TABLE_STATEMENT)
+    }
+
+    /**
+     * Deletes database
+     *
+     * @param db SQLiteDatabase
+     */
+    fun onDelete(db: SQLiteDatabase) {
+        db.execSQL(DROP_TABLE_STATEMENT)
+        onCreate(db)
+    }
+
+    /**
+     * Updates database
+     *
+     * @param db   SQLiteDatabase
+     * @param from starting
+     * @param to   end
+     */
+    fun onUpdate(db: SQLiteDatabase, from: Int, to: Int) {
+        if (from == to) {
+            return
+        }
+
+        if (from < 18) {
+            // doesn't exist yet
+            onUpdate(db, from + 1, to)
+            return
+        }
+
+        if (from == 18) {
+            // table added in version 19
+            onCreate(db)
+            onUpdate(db, from + 1, to)
+        }
+    }
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsContentProvider.java

@@ -1,119 +0,0 @@
-package fr.free.nrw.commons.bookmarks.locations;
-
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteQueryBuilder;
-// We can get uri using java.Net.Uri, but andoid implimentation is faster (but it's forgiving with handling exceptions though)
-import android.net.Uri;
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-
-import javax.inject.Inject;
-
-import fr.free.nrw.commons.BuildConfig;
-import fr.free.nrw.commons.data.DBOpenHelper;
-import fr.free.nrw.commons.di.CommonsDaggerContentProvider;
-import timber.log.Timber;
-
-import static fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.COLUMN_NAME;
-import static fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao.Table.TABLE_NAME;
-
-/**
- * Handles private storage for Bookmark locations
- */
-public class BookmarkLocationsContentProvider extends CommonsDaggerContentProvider {
-
-    private static final String BASE_PATH = "bookmarksLocations";
-    public static final Uri BASE_URI = Uri.parse("content://" + BuildConfig.BOOKMARK_LOCATIONS_AUTHORITY + "/" + BASE_PATH);
-
-    /**
-     * Append bookmark locations name to the base uri 
-     */
-    public static Uri uriForName(String name) {
-        return Uri.parse(BASE_URI.toString() + "/" + name);
-    }
-
-    @Inject DBOpenHelper dbOpenHelper;
-
-    @Override
-    public String getType(@NonNull Uri uri) {
-        return null;
-    }
-
-    /**
-     * Queries the SQLite database for the bookmark locations
-     * @param uri : contains the uri for bookmark locations
-     * @param projection
-     * @param selection : handles Where
-     * @param selectionArgs : the condition of Where clause
-     * @param sortOrder : ascending or descending
-     */
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public Cursor query(@NonNull Uri uri, String[] projection, String selection,
-                        String[] selectionArgs, String sortOrder) {
-        SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
-        queryBuilder.setTables(TABLE_NAME);
-
-        SQLiteDatabase db = dbOpenHelper.getReadableDatabase();
-        Cursor cursor = queryBuilder.query(db, projection, selection, selectionArgs, null, null, sortOrder);
-        cursor.setNotificationUri(getContext().getContentResolver(), uri);
-
-        return cursor;
-    }
-
-    /**
-     * Handles the update query of local SQLite Database 
-     * @param uri : contains the uri for bookmark locations
-     * @param contentValues : new values to be entered to db
-     * @param selection : handles Where
-     * @param selectionArgs : the condition of Where clause
-     */
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public int update(@NonNull Uri uri, ContentValues contentValues, String selection,
-                      String[] selectionArgs) {
-        SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
-        int rowsUpdated;
-        if (TextUtils.isEmpty(selection)) {
-            int id = Integer.valueOf(uri.getLastPathSegment());
-            rowsUpdated = sqlDB.update(TABLE_NAME,
-                    contentValues,
-                    COLUMN_NAME + " = ?",
-                    new String[]{String.valueOf(id)});
-        } else {
-            throw new IllegalArgumentException(
-                    "Parameter `selection` should be empty when updating an ID");
-        }
-        getContext().getContentResolver().notifyChange(uri, null);
-        return rowsUpdated;
-    }
-
-    /**
-     * Handles the insertion of new bookmark locations record to local SQLite Database
-     */
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public Uri insert(@NonNull Uri uri, ContentValues contentValues) {
-        SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
-        long id = sqlDB.insert(BookmarkLocationsDao.Table.TABLE_NAME, null, contentValues);
-        getContext().getContentResolver().notifyChange(uri, null);
-        return Uri.parse(BASE_URI + "/" + id);
-    }
-
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public int delete(@NonNull Uri uri, String s, String[] strings) {
-        int rows;
-        SQLiteDatabase db = dbOpenHelper.getReadableDatabase();
-        Timber.d("Deleting bookmark name %s", uri.getLastPathSegment());
-        rows = db.delete(TABLE_NAME,
-                "location_name = ?",
-                new String[]{uri.getLastPathSegment()}
-        );
-        getContext().getContentResolver().notifyChange(uri, null);
-        return rows;
-    }
-}

app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsController.java

@@ -1,26 +0,0 @@
-package fr.free.nrw.commons.bookmarks.locations;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import fr.free.nrw.commons.nearby.Place;
-
-@Singleton
-public class BookmarkLocationsController {
-
-    @Inject
-    BookmarkLocationsDao bookmarkLocationDao;
-
-    @Inject
-    public BookmarkLocationsController() {}
-
-    /**
-     * Load from DB the bookmarked locations
-     * @return a list of Place objects.
-     */
-    public List<Place> loadFavoritesLocations() {
-        return bookmarkLocationDao.getAllBookmarksLocations();
-    }
-}

app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsController.kt

@@ -0,0 +1,20 @@
+package fr.free.nrw.commons.bookmarks.locations
+
+import fr.free.nrw.commons.nearby.Place
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BookmarkLocationsController @Inject constructor(
+    private val bookmarkLocationDao: BookmarkLocationsDao
+) {
+
+    /**
+     * Load bookmarked locations from the database.
+     * @return a list of Place objects.
+     */
+    suspend fun loadFavoritesLocations(): List<Place> =
+        bookmarkLocationDao.getAllBookmarksLocationsPlace()
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.java

@@ -1,313 +0,0 @@
-package fr.free.nrw.commons.bookmarks.locations;
-
-import android.annotation.SuppressLint;
-import android.content.ContentProviderClient;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-import android.os.RemoteException;
-
-import androidx.annotation.NonNull;
-
-import fr.free.nrw.commons.nearby.NearbyController;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-
-import fr.free.nrw.commons.location.LatLng;
-import fr.free.nrw.commons.nearby.Label;
-import fr.free.nrw.commons.nearby.Place;
-import fr.free.nrw.commons.nearby.Sitelinks;
-import timber.log.Timber;
-
-import static fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsContentProvider.BASE_URI;
-
-public class BookmarkLocationsDao {
-
-    private final Provider<ContentProviderClient> clientProvider;
-
-    @Inject
-    public BookmarkLocationsDao(@Named("bookmarksLocation") Provider<ContentProviderClient> clientProvider) {
-        this.clientProvider = clientProvider;
-    }
-
-    /**
-     *  Find all persisted locations bookmarks on database
-     *
-     * @return list of Place
-     */
-    @NonNull
-    public List<Place> getAllBookmarksLocations() {
-        List<Place> items = new ArrayList<>();
-        Cursor cursor = null;
-        ContentProviderClient db = clientProvider.get();
-        try {
-            cursor = db.query(
-                BookmarkLocationsContentProvider.BASE_URI,
-                Table.ALL_FIELDS,
-                null,
-                new String[]{},
-                null);
-            while (cursor != null && cursor.moveToNext()) {
-                items.add(fromCursor(cursor));
-            }
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-            db.release();
-        }
-        return items;
-    }
-
-    /**
-     * Look for a place in bookmarks table in order to insert or delete it
-     *
-     * @param bookmarkLocation : Place object
-     * @return is Place now fav ?
-     */
-    public boolean updateBookmarkLocation(Place bookmarkLocation) {
-        boolean bookmarkExists = findBookmarkLocation(bookmarkLocation);
-        if (bookmarkExists) {
-            deleteBookmarkLocation(bookmarkLocation);
-            NearbyController.updateMarkerLabelListBookmark(bookmarkLocation, false);
-        } else {
-            addBookmarkLocation(bookmarkLocation);
-            NearbyController.updateMarkerLabelListBookmark(bookmarkLocation, true);
-        }
-        return !bookmarkExists;
-    }
-
-    /**
-     * Add a Place to bookmarks table
-     *
-     * @param bookmarkLocation : Place to add
-     */
-    private void addBookmarkLocation(Place bookmarkLocation) {
-        ContentProviderClient db = clientProvider.get();
-        try {
-            db.insert(BASE_URI, toContentValues(bookmarkLocation));
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        } finally {
-            db.release();
-        }
-    }
-
-    /**
-     * Delete a Place from bookmarks table
-     *
-     * @param bookmarkLocation : Place to delete
-     */
-    private void deleteBookmarkLocation(Place bookmarkLocation) {
-        ContentProviderClient db = clientProvider.get();
-        try {
-            db.delete(BookmarkLocationsContentProvider.uriForName(bookmarkLocation.name), null, null);
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        } finally {
-            db.release();
-        }
-    }
-
-    /**
-     * Find a Place from database based on its name
-     *
-     * @param bookmarkLocation : Place to find
-     * @return boolean : is Place in database ?
-     */
-    public boolean findBookmarkLocation(Place bookmarkLocation) {
-        Cursor cursor = null;
-        ContentProviderClient db = clientProvider.get();
-        try {
-            cursor = db.query(
-                BookmarkLocationsContentProvider.BASE_URI,
-                Table.ALL_FIELDS,
-                Table.COLUMN_NAME + "=?",
-                new String[]{bookmarkLocation.name},
-                null);
-            if (cursor != null && cursor.moveToFirst()) {
-                return true;
-            }
-        } catch (RemoteException e) {
-            // This feels lazy, but to hell with checked exceptions. :)
-            throw new RuntimeException(e);
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-            db.release();
-        }
-        return false;
-    }
-
-    @SuppressLint("Range")
-    @NonNull
-    Place fromCursor(final Cursor cursor) {
-        final LatLng location = new LatLng(cursor.getDouble(cursor.getColumnIndex(Table.COLUMN_LAT)),
-            cursor.getDouble(cursor.getColumnIndex(Table.COLUMN_LONG)), 1F);
-
-        final Sitelinks.Builder builder = new Sitelinks.Builder();
-        builder.setWikipediaLink(cursor.getString(cursor.getColumnIndex(Table.COLUMN_WIKIPEDIA_LINK)));
-        builder.setWikidataLink(cursor.getString(cursor.getColumnIndex(Table.COLUMN_WIKIDATA_LINK)));
-        builder.setCommonsLink(cursor.getString(cursor.getColumnIndex(Table.COLUMN_COMMONS_LINK)));
-
-        return new Place(
-            cursor.getString(cursor.getColumnIndex(Table.COLUMN_LANGUAGE)),
-            cursor.getString(cursor.getColumnIndex(Table.COLUMN_NAME)),
-            Label.fromText((cursor.getString(cursor.getColumnIndex(Table.COLUMN_LABEL_TEXT)))),
-            cursor.getString(cursor.getColumnIndex(Table.COLUMN_DESCRIPTION)),
-            location,
-            cursor.getString(cursor.getColumnIndex(Table.COLUMN_CATEGORY)),
-            builder.build(),
-            cursor.getString(cursor.getColumnIndex(Table.COLUMN_PIC)),
-            Boolean.parseBoolean(cursor.getString(cursor.getColumnIndex(Table.COLUMN_EXISTS)))
-        );
-    }
-
-    private ContentValues toContentValues(Place bookmarkLocation) {
-        ContentValues cv = new ContentValues();
-        cv.put(BookmarkLocationsDao.Table.COLUMN_NAME, bookmarkLocation.getName());
-        cv.put(BookmarkLocationsDao.Table.COLUMN_LANGUAGE, bookmarkLocation.getLanguage());
-        cv.put(BookmarkLocationsDao.Table.COLUMN_DESCRIPTION, bookmarkLocation.getLongDescription());
-        cv.put(BookmarkLocationsDao.Table.COLUMN_CATEGORY, bookmarkLocation.getCategory());
-        cv.put(BookmarkLocationsDao.Table.COLUMN_LABEL_TEXT, bookmarkLocation.getLabel()!=null ? bookmarkLocation.getLabel().getText() : "");
-        cv.put(BookmarkLocationsDao.Table.COLUMN_LABEL_ICON, bookmarkLocation.getLabel()!=null ? bookmarkLocation.getLabel().getIcon() : null);
-        cv.put(BookmarkLocationsDao.Table.COLUMN_WIKIPEDIA_LINK, bookmarkLocation.siteLinks.getWikipediaLink().toString());
-        cv.put(BookmarkLocationsDao.Table.COLUMN_WIKIDATA_LINK, bookmarkLocation.siteLinks.getWikidataLink().toString());
-        cv.put(BookmarkLocationsDao.Table.COLUMN_COMMONS_LINK, bookmarkLocation.siteLinks.getCommonsLink().toString());
-        cv.put(BookmarkLocationsDao.Table.COLUMN_LAT, bookmarkLocation.location.getLatitude());
-        cv.put(BookmarkLocationsDao.Table.COLUMN_LONG, bookmarkLocation.location.getLongitude());
-        cv.put(BookmarkLocationsDao.Table.COLUMN_PIC, bookmarkLocation.pic);
-        cv.put(BookmarkLocationsDao.Table.COLUMN_EXISTS, bookmarkLocation.exists.toString());
-        return cv;
-    }
-
-    public static class Table {
-        public static final String TABLE_NAME = "bookmarksLocations";
-
-        static final String COLUMN_NAME = "location_name";
-        static final String COLUMN_LANGUAGE = "location_language";
-        static final String COLUMN_DESCRIPTION = "location_description";
-        static final String COLUMN_LAT = "location_lat";
-        static final String COLUMN_LONG = "location_long";
-        static final String COLUMN_CATEGORY = "location_category";
-        static final String COLUMN_LABEL_TEXT = "location_label_text";
-        static final String COLUMN_LABEL_ICON = "location_label_icon";
-        static final String COLUMN_IMAGE_URL = "location_image_url";
-        static final String COLUMN_WIKIPEDIA_LINK = "location_wikipedia_link";
-        static final String COLUMN_WIKIDATA_LINK = "location_wikidata_link";
-        static final String COLUMN_COMMONS_LINK = "location_commons_link";
-        static final String COLUMN_PIC = "location_pic";
-        static final String COLUMN_EXISTS = "location_exists";
-
-        // NOTE! KEEP IN SAME ORDER AS THEY ARE DEFINED UP THERE. HELPS HARD CODE COLUMN INDICES.
-        public static final String[] ALL_FIELDS = {
-            COLUMN_NAME,
-            COLUMN_LANGUAGE,
-            COLUMN_DESCRIPTION,
-            COLUMN_CATEGORY,
-            COLUMN_LABEL_TEXT,
-            COLUMN_LABEL_ICON,
-            COLUMN_LAT,
-            COLUMN_LONG,
-            COLUMN_IMAGE_URL,
-            COLUMN_WIKIPEDIA_LINK,
-            COLUMN_WIKIDATA_LINK,
-            COLUMN_COMMONS_LINK,
-            COLUMN_PIC,
-            COLUMN_EXISTS,
-        };
-
-        static final String DROP_TABLE_STATEMENT = "DROP TABLE IF EXISTS " + TABLE_NAME;
-
-        static final String CREATE_TABLE_STATEMENT = "CREATE TABLE " + TABLE_NAME + " ("
-            + COLUMN_NAME + " STRING PRIMARY KEY,"
-            + COLUMN_LANGUAGE + " STRING,"
-            + COLUMN_DESCRIPTION + " STRING,"
-            + COLUMN_CATEGORY + " STRING,"
-            + COLUMN_LABEL_TEXT + " STRING,"
-            + COLUMN_LABEL_ICON + " INTEGER,"
-            + COLUMN_LAT + " DOUBLE,"
-            + COLUMN_LONG + " DOUBLE,"
-            + COLUMN_IMAGE_URL + " STRING,"
-            + COLUMN_WIKIPEDIA_LINK + " STRING,"
-            + COLUMN_WIKIDATA_LINK + " STRING,"
-            + COLUMN_COMMONS_LINK + " STRING,"
-            + COLUMN_PIC + " STRING,"
-            + COLUMN_EXISTS + " STRING"
-            + ");";
-
-        public static void onCreate(SQLiteDatabase db) {
-            db.execSQL(CREATE_TABLE_STATEMENT);
-        }
-
-        public static void onDelete(SQLiteDatabase db) {
-            db.execSQL(DROP_TABLE_STATEMENT);
-            onCreate(db);
-        }
-
-        public static void onUpdate(final SQLiteDatabase db, int from, final int to) {
-            Timber.d("bookmarksLocations db is updated from:"+from+", to:"+to);
-            if (from == to) {
-                return;
-            }
-            if (from < 7) {
-                // doesn't exist yet
-                from++;
-                onUpdate(db, from, to);
-                return;
-            }
-            if (from == 7) {
-                // table added in version 8
-                onCreate(db);
-                from++;
-                onUpdate(db, from, to);
-                return;
-            }
-            if (from < 10) {
-                from++;
-                onUpdate(db, from, to);
-                return;
-            }
-            if (from == 10) {
-                //This is safe, and can be called clean, as we/I do not remember the appropriate version for this
-                //We are anyways switching to room, these things won't be necessary then
-                try {
-                    db.execSQL("ALTER TABLE bookmarksLocations ADD COLUMN location_pic STRING;");
-                }catch (SQLiteException exception){
-                    Timber.e(exception);//
-                }
-                return;
-            }
-            if (from >= 12) {
-                try {
-                    db.execSQL(
-                        "ALTER TABLE bookmarksLocations ADD COLUMN location_destroyed STRING;");
-                } catch (SQLiteException exception) {
-                    Timber.e(exception);
-                }
-            }
-            if (from >= 13){
-                try {
-                    db.execSQL("ALTER TABLE bookmarksLocations ADD COLUMN location_language STRING;");
-                } catch (SQLiteException exception){
-                    Timber.e(exception);
-                }
-            }
-            if (from >= 14){
-                try {
-                    db.execSQL("ALTER TABLE bookmarksLocations ADD COLUMN location_exists STRING;");
-                } catch (SQLiteException exception){
-                    Timber.e(exception);
-                }
-            }
-        }
-    }
-}

app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.kt

@@ -0,0 +1,65 @@
+package fr.free.nrw.commons.bookmarks.locations
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import fr.free.nrw.commons.nearby.NearbyController
+import fr.free.nrw.commons.nearby.Place
+
+/**
+ * DAO for managing bookmark locations in the database.
+ */
+@Dao
+abstract class BookmarkLocationsDao {
+
+    /**
+     * Adds or updates a bookmark location in the database.
+     */
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract suspend fun addBookmarkLocation(bookmarkLocation: BookmarksLocations)
+
+    /**
+     * Fetches all bookmark locations from the database.
+     */
+    @Query("SELECT * FROM bookmarks_locations")
+    abstract suspend fun getAllBookmarksLocations(): List<BookmarksLocations>
+
+    /**
+     * Checks if a bookmark location exists by name.
+     */
+    @Query("SELECT EXISTS (SELECT 1 FROM bookmarks_locations WHERE location_name = :name)")
+    abstract suspend fun findBookmarkLocation(name: String): Boolean
+
+    /**
+     * Deletes a bookmark location from the database.
+     */
+    @Delete
+    abstract suspend fun deleteBookmarkLocation(bookmarkLocation: BookmarksLocations)
+
+    /**
+     * Adds or removes a bookmark location and updates markers.
+     * @return `true` if added, `false` if removed.
+     */
+    suspend fun updateBookmarkLocation(bookmarkLocation: Place): Boolean {
+        val exists = findBookmarkLocation(bookmarkLocation.name)
+
+        if (exists) {
+            deleteBookmarkLocation(bookmarkLocation.toBookmarksLocations())
+            NearbyController.updateMarkerLabelListBookmark(bookmarkLocation, false)
+        } else {
+            addBookmarkLocation(bookmarkLocation.toBookmarksLocations())
+            NearbyController.updateMarkerLabelListBookmark(bookmarkLocation, true)
+        }
+
+        return !exists
+    }
+
+    /**
+     * Fetches all bookmark locations as `Place` objects.
+     */
+    suspend fun getAllBookmarksLocationsPlace(): List<Place> {
+        return getAllBookmarksLocations().map { it.toPlace() }
+    }
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java

@@ -1,137 +0,0 @@
-package fr.free.nrw.commons.bookmarks.locations;
-
-import android.Manifest.permission;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import androidx.activity.result.ActivityResultCallback;
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import dagger.android.support.DaggerFragment;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.contributions.ContributionController;
-import fr.free.nrw.commons.databinding.FragmentBookmarksLocationsBinding;
-import fr.free.nrw.commons.nearby.Place;
-import fr.free.nrw.commons.nearby.fragments.CommonPlaceClickActions;
-import fr.free.nrw.commons.nearby.fragments.PlaceAdapter;
-import java.util.List;
-import java.util.Map;
-import javax.inject.Inject;
-import kotlin.Unit;
-
-public class BookmarkLocationsFragment extends DaggerFragment {
-
-    public FragmentBookmarksLocationsBinding binding;
-
-    @Inject BookmarkLocationsController controller;
-    @Inject ContributionController contributionController;
-    @Inject BookmarkLocationsDao bookmarkLocationDao;
-    @Inject CommonPlaceClickActions commonPlaceClickActions;
-    private PlaceAdapter adapter;
-
-    private final ActivityResultLauncher<Intent> cameraPickLauncherForResult =
-        registerForActivityResult(new StartActivityForResult(),
-        result -> {
-            contributionController.handleActivityResultWithCallback(requireActivity(), callbacks -> {
-                contributionController.onPictureReturnedFromCamera(result, requireActivity(), callbacks);
-            });
-        });
-
-      private final ActivityResultLauncher<Intent> galleryPickLauncherForResult =
-          registerForActivityResult(new StartActivityForResult(),
-        result -> {
-              contributionController.handleActivityResultWithCallback(requireActivity(), callbacks -> {
-                contributionController.onPictureReturnedFromGallery(result, requireActivity(), callbacks);
-            });
-        });
-
-    private ActivityResultLauncher<String[]> inAppCameraLocationPermissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
-        @Override
-        public void onActivityResult(Map<String, Boolean> result) {
-            boolean areAllGranted = true;
-            for(final boolean b : result.values()) {
-                areAllGranted = areAllGranted && b;
-            }
-
-            if (areAllGranted) {
-                contributionController.locationPermissionCallback.onLocationPermissionGranted();
-            } else {
-                if (shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) {
-                    contributionController.handleShowRationaleFlowCameraLocation(getActivity(), inAppCameraLocationPermissionLauncher, cameraPickLauncherForResult);
-                } else {
-                    contributionController.locationPermissionCallback.onLocationPermissionDenied(getActivity().getString(R.string.in_app_camera_location_permission_denied));
-                }
-            }
-        }
-    });
-
-    /**
-     * Create an instance of the fragment with the right bundle parameters
-     * @return an instance of the fragment
-     */
-    public static BookmarkLocationsFragment newInstance() {
-        return new BookmarkLocationsFragment();
-    }
-
-    @Override
-    public View onCreateView(
-            @NonNull LayoutInflater inflater,
-            ViewGroup container,
-            Bundle savedInstanceState
-    ) {
-        binding = FragmentBookmarksLocationsBinding.inflate(inflater, container, false);
-        return binding.getRoot();
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        binding.loadingImagesProgressBar.setVisibility(View.VISIBLE);
-        binding.listView.setLayoutManager(new LinearLayoutManager(getContext()));
-        adapter = new PlaceAdapter(bookmarkLocationDao,
-            place -> Unit.INSTANCE,
-            (place, isBookmarked) -> {
-                adapter.remove(place);
-                return Unit.INSTANCE;
-            },
-            commonPlaceClickActions,
-            inAppCameraLocationPermissionLauncher,
-            galleryPickLauncherForResult,
-            cameraPickLauncherForResult
-        );
-        binding.listView.setAdapter(adapter);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        initList();
-    }
-
-    /**
-     * Initialize the recycler view with bookmarked locations
-     */
-    private void initList() {
-        List<Place> places = controller.loadFavoritesLocations();
-        adapter.setItems(places);
-        binding.loadingImagesProgressBar.setVisibility(View.GONE);
-        if (places.size() <= 0) {
-            binding.statusMessage.setText(R.string.bookmark_empty);
-            binding.statusMessage.setVisibility(View.VISIBLE);
-        } else {
-            binding.statusMessage.setVisibility(View.GONE);
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        binding = null;
-    }
-}

app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.kt

@@ -0,0 +1,151 @@
+package fr.free.nrw.commons.bookmarks.locations
+
+import android.Manifest.permission
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.android.support.DaggerFragment
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.contributions.ContributionController
+import fr.free.nrw.commons.databinding.FragmentBookmarksLocationsBinding
+import fr.free.nrw.commons.nearby.Place
+import fr.free.nrw.commons.nearby.fragments.CommonPlaceClickActions
+import fr.free.nrw.commons.nearby.fragments.PlaceAdapter
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+
+class BookmarkLocationsFragment : DaggerFragment() {
+
+    private var binding: FragmentBookmarksLocationsBinding? = null
+
+    @Inject lateinit var controller: BookmarkLocationsController
+    @Inject lateinit var contributionController: ContributionController
+    @Inject lateinit var bookmarkLocationDao: BookmarkLocationsDao
+    @Inject lateinit var commonPlaceClickActions: CommonPlaceClickActions
+
+    private lateinit var inAppCameraLocationPermissionLauncher:
+            ActivityResultLauncher<Array<String>>
+    private lateinit var adapter: PlaceAdapter
+
+    private val cameraPickLauncherForResult =
+        registerForActivityResult(StartActivityForResult()) { result ->
+            contributionController.handleActivityResultWithCallback(
+                requireActivity()
+            ) { callbacks ->
+                contributionController.onPictureReturnedFromCamera(
+                    result,
+                    requireActivity(),
+                    callbacks
+                )
+            }
+        }
+
+    private val galleryPickLauncherForResult =
+        registerForActivityResult(StartActivityForResult()) { result ->
+            contributionController.handleActivityResultWithCallback(
+                requireActivity()
+            ) { callbacks ->
+                contributionController.onPictureReturnedFromGallery(
+                    result,
+                    requireActivity(),
+                    callbacks
+                )
+            }
+        }
+
+    companion object {
+        fun newInstance(): BookmarkLocationsFragment {
+            return BookmarkLocationsFragment()
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        binding = FragmentBookmarksLocationsBinding.inflate(inflater, container, false)
+        return binding?.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding?.loadingImagesProgressBar?.visibility = View.VISIBLE
+        binding?.listView?.layoutManager = LinearLayoutManager(context)
+
+        inAppCameraLocationPermissionLauncher =
+            registerForActivityResult(RequestMultiplePermissions()) { result ->
+                val areAllGranted = result.values.all { it }
+
+                if (areAllGranted) {
+                    contributionController.locationPermissionCallback?.onLocationPermissionGranted()
+                } else {
+                    if (shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) {
+                        contributionController.handleShowRationaleFlowCameraLocation(
+                            requireActivity(),
+                            inAppCameraLocationPermissionLauncher,
+                            cameraPickLauncherForResult
+                        )
+                    } else {
+                        contributionController.locationPermissionCallback
+                            ?.onLocationPermissionDenied(
+                                getString(R.string.in_app_camera_location_permission_denied)
+                            )
+                    }
+                }
+            }
+
+        adapter = PlaceAdapter(
+            bookmarkLocationDao,
+            lifecycleScope,
+            { },
+            { place, _ ->
+                adapter.remove(place)
+            },
+            commonPlaceClickActions,
+            inAppCameraLocationPermissionLauncher,
+            galleryPickLauncherForResult,
+            cameraPickLauncherForResult
+        )
+        binding?.listView?.adapter = adapter
+    }
+
+    override fun onResume() {
+        super.onResume()
+        initList()
+    }
+
+    fun initList() {
+        var places: List<Place>
+        if(view != null) {
+            viewLifecycleOwner.lifecycleScope.launch {
+                places = controller.loadFavoritesLocations()
+                updateUIList(places)
+            }
+        }
+    }
+
+    private fun updateUIList(places: List<Place>) {
+        adapter.items = places
+        binding?.loadingImagesProgressBar?.visibility = View.GONE
+        if (places.isEmpty()) {
+            binding?.statusMessage?.text = getString(R.string.bookmark_empty)
+            binding?.statusMessage?.visibility = View.VISIBLE
+        } else {
+            binding?.statusMessage?.visibility = View.GONE
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        // Make sure to null out the binding to avoid memory leaks
+        binding = null
+    }
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsViewModel.kt

@@ -0,0 +1,15 @@
+package fr.free.nrw.commons.bookmarks.locations
+
+import androidx.lifecycle.ViewModel
+import fr.free.nrw.commons.nearby.Place
+import kotlinx.coroutines.flow.Flow
+
+class BookmarkLocationsViewModel(
+    private val bookmarkLocationsDao: BookmarkLocationsDao
+): ViewModel() {
+
+//    fun getAllBookmarkLocations(): List<Place> {
+//        return bookmarkLocationsDao.getAllBookmarksLocationsPlace()
+//    }
+
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarksLocations.kt

@@ -0,0 +1,72 @@
+package fr.free.nrw.commons.bookmarks.locations
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import fr.free.nrw.commons.location.LatLng
+import fr.free.nrw.commons.nearby.Label
+import fr.free.nrw.commons.nearby.Place
+import fr.free.nrw.commons.nearby.Sitelinks
+
+@Entity(tableName = "bookmarks_locations")
+data class BookmarksLocations(
+    @PrimaryKey @ColumnInfo(name = "location_name") val locationName: String,
+    @ColumnInfo(name = "location_language") val locationLanguage: String,
+    @ColumnInfo(name = "location_description") val locationDescription: String,
+    @ColumnInfo(name = "location_lat") val locationLat: Double,
+    @ColumnInfo(name = "location_long") val locationLong: Double,
+    @ColumnInfo(name = "location_category") val locationCategory: String,
+    @ColumnInfo(name = "location_label_text") val locationLabelText: String,
+    @ColumnInfo(name = "location_label_icon") val locationLabelIcon: Int?,
+    @ColumnInfo(name = "location_image_url") val locationImageUrl: String,
+    @ColumnInfo(name = "location_wikipedia_link") val locationWikipediaLink: String,
+    @ColumnInfo(name = "location_wikidata_link") val locationWikidataLink: String,
+    @ColumnInfo(name = "location_commons_link") val locationCommonsLink: String,
+    @ColumnInfo(name = "location_pic") val locationPic: String,
+    @ColumnInfo(name = "location_exists") val locationExists: Boolean
+)
+
+fun BookmarksLocations.toPlace(): Place {
+    val location = LatLng(
+        locationLat,
+        locationLong,
+        1F
+    )
+
+    val builder = Sitelinks.Builder().apply {
+        setWikipediaLink(locationWikipediaLink)
+        setWikidataLink(locationWikidataLink)
+        setCommonsLink(locationCommonsLink)
+    }
+
+    return Place(
+        locationLanguage,
+        locationName,
+        Label.fromText(locationLabelText),
+        locationDescription,
+        location,
+        locationCategory,
+        builder.build(),
+        locationPic,
+        locationExists
+    )
+}
+
+fun Place.toBookmarksLocations(): BookmarksLocations {
+    return BookmarksLocations(
+        locationName = name,
+        locationLanguage = language,
+        locationDescription = longDescription,
+        locationCategory = category,
+        locationLat = location.latitude,
+        locationLong = location.longitude,
+        locationLabelText = label?.text ?: "",
+        locationLabelIcon = label?.icon,
+        locationImageUrl = pic,
+        locationWikipediaLink = siteLinks.wikipediaLink.toString(),
+        locationWikidataLink = siteLinks.wikidataLink.toString(),
+        locationCommonsLink = siteLinks.commonsLink.toString(),
+        locationPic = pic,
+        locationExists = exists
+    )
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/models/Bookmark.kt

@@ -8,7 +8,7 @@ class Bookmark(
     /**
      * Gets or Sets the content URI - marking this bookmark as already saved in the database
      * @return content URI
-     * @param contentUri the content URI
+     * contentUri the content URI
      */
     var contentUri: Uri?,
 ) {

app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesContentProvider.java

@@ -1,120 +0,0 @@
-package fr.free.nrw.commons.bookmarks.pictures;
-
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteQueryBuilder;
-// We can get uri using java.Net.Uri, but andoid implimentation is faster (but it's forgiving with handling exceptions though)
-import android.net.Uri;
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-
-import javax.inject.Inject;
-
-import fr.free.nrw.commons.BuildConfig;
-import fr.free.nrw.commons.data.DBOpenHelper;
-import fr.free.nrw.commons.di.CommonsDaggerContentProvider;
-import timber.log.Timber;
-
-import static fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao.Table.COLUMN_MEDIA_NAME;
-import static fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao.Table.TABLE_NAME;
-
-/**
- * Handles private storage for Bookmark pictures
- */
-public class BookmarkPicturesContentProvider extends CommonsDaggerContentProvider {
-
-    private static final String BASE_PATH = "bookmarks";
-    public static final Uri BASE_URI = Uri.parse("content://" + BuildConfig.BOOKMARK_AUTHORITY + "/" + BASE_PATH);
-
-    /**
-     * Append bookmark pictures name to the base uri 
-     */
-    public static Uri uriForName(String name) {
-        return Uri.parse(BASE_URI.toString() + "/" + name);
-    }
-
-    @Inject
-    DBOpenHelper dbOpenHelper;
-
-    @Override
-    public String getType(@NonNull Uri uri) {
-        return null;
-    }
-
-    /**
-     * Queries the SQLite database for the bookmark pictures
-     * @param uri : contains the uri for bookmark pictures
-     * @param projection
-     * @param selection : handles Where
-     * @param selectionArgs : the condition of Where clause
-     * @param sortOrder : ascending or descending
-     */
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public Cursor query(@NonNull Uri uri, String[] projection, String selection,
-                        String[] selectionArgs, String sortOrder) {
-        SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
-        queryBuilder.setTables(TABLE_NAME);
-
-        SQLiteDatabase db = dbOpenHelper.getReadableDatabase();
-        Cursor cursor = queryBuilder.query(db, projection, selection, selectionArgs, null, null, sortOrder);
-        cursor.setNotificationUri(getContext().getContentResolver(), uri);
-
-        return cursor;
-    }
-
-    /**
-     * Handles the update query of local SQLite Database 
-     * @param uri : contains the uri for bookmark pictures
-     * @param contentValues : new values to be entered to db
-     * @param selection : handles Where
-     * @param selectionArgs : the condition of Where clause
-     */
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public int update(@NonNull Uri uri, ContentValues contentValues, String selection,
-                      String[] selectionArgs) {
-        SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
-        int rowsUpdated;
-        if (TextUtils.isEmpty(selection)) {
-            int id = Integer.valueOf(uri.getLastPathSegment());
-            rowsUpdated = sqlDB.update(TABLE_NAME,
-                    contentValues,
-                    COLUMN_MEDIA_NAME + " = ?",
-                    new String[]{String.valueOf(id)});
-        } else {
-            throw new IllegalArgumentException(
-                    "Parameter `selection` should be empty when updating an ID");
-        }
-        getContext().getContentResolver().notifyChange(uri, null);
-        return rowsUpdated;
-    }
-
-    /**
-     * Handles the insertion of new bookmark pictures record to local SQLite Database
-     */
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public Uri insert(@NonNull Uri uri, ContentValues contentValues) {
-        SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
-        long id = sqlDB.insert(BookmarkPicturesDao.Table.TABLE_NAME, null, contentValues);
-        getContext().getContentResolver().notifyChange(uri, null);
-        return Uri.parse(BASE_URI + "/" + id);
-    }
-
-    @SuppressWarnings("ConstantConditions")
-    @Override
-    public int delete(@NonNull Uri uri, String s, String[] strings) {
-        int rows;
-        SQLiteDatabase db = dbOpenHelper.getReadableDatabase();
-        Timber.d("Deleting bookmark name %s", uri.getLastPathSegment());
-        rows = db.delete(TABLE_NAME,
-                "media_name = ?",
-                new String[]{uri.getLastPathSegment()}
-        );
-        getContext().getContentResolver().notifyChange(uri, null);
-        return rows;
-    }
-}

app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesContentProvider.kt

@@ -0,0 +1,100 @@
+package fr.free.nrw.commons.bookmarks.pictures
+
+import android.content.ContentValues
+import android.database.Cursor
+import android.database.sqlite.SQLiteQueryBuilder
+import android.net.Uri
+import fr.free.nrw.commons.BuildConfig
+import fr.free.nrw.commons.di.CommonsDaggerContentProvider
+import androidx.core.net.toUri
+import fr.free.nrw.commons.bookmarks.pictures.BookmarksTable.COLUMN_MEDIA_NAME
+import fr.free.nrw.commons.bookmarks.pictures.BookmarksTable.TABLE_NAME
+
+/**
+ * Handles private storage for Bookmark pictures
+ */
+class BookmarkPicturesContentProvider : CommonsDaggerContentProvider() {
+    override fun getType(uri: Uri): String? = null
+
+    /**
+     * Queries the SQLite database for the bookmark pictures
+     * @param uri : contains the uri for bookmark pictures
+     * @param projection
+     * @param selection : handles Where
+     * @param selectionArgs : the condition of Where clause
+     * @param sortOrder : ascending or descending
+     */
+    override fun query(
+        uri: Uri, projection: Array<String>?, selection: String?,
+        selectionArgs: Array<String>?, sortOrder: String?
+    ): Cursor {
+        val queryBuilder = SQLiteQueryBuilder().apply {
+            tables = TABLE_NAME
+        }
+
+        val cursor = queryBuilder.query(
+            requireDb(), projection, selection,
+            selectionArgs, null, null, sortOrder
+        )
+        cursor.setNotificationUri(context?.contentResolver, uri)
+
+        return cursor
+    }
+
+    /**
+     * Handles the update query of local SQLite Database
+     * @param uri : contains the uri for bookmark pictures
+     * @param contentValues : new values to be entered to db
+     * @param selection : handles Where
+     * @param selectionArgs : the condition of Where clause
+     */
+    override fun update(
+        uri: Uri, contentValues: ContentValues?, selection: String?,
+        selectionArgs: Array<String>?
+    ): Int {
+        val rowsUpdated: Int
+        if (selection.isNullOrEmpty()) {
+            val id = uri.lastPathSegment!!.toInt()
+            rowsUpdated = requireDb().update(
+                TABLE_NAME,
+                contentValues,
+                "$COLUMN_MEDIA_NAME = ?",
+                arrayOf(id.toString())
+            )
+        } else {
+            throw IllegalArgumentException(
+                "Parameter `selection` should be empty when updating an ID"
+            )
+        }
+        context?.contentResolver?.notifyChange(uri, null)
+        return rowsUpdated
+    }
+
+    /**
+     * Handles the insertion of new bookmark pictures record to local SQLite Database
+     */
+    override fun insert(uri: Uri, contentValues: ContentValues?): Uri {
+        val id = requireDb().insert(TABLE_NAME, null, contentValues)
+        context?.contentResolver?.notifyChange(uri, null)
+        return "$BASE_URI/$id".toUri()
+    }
+
+    override fun delete(uri: Uri, s: String?, strings: Array<String>?): Int {
+        val rows: Int = requireDb().delete(
+            TABLE_NAME,
+            "media_name = ?",
+            arrayOf(uri.lastPathSegment)
+        )
+        context?.contentResolver?.notifyChange(uri, null)
+        return rows
+    }
+
+    companion object {
+        private const val BASE_PATH = "bookmarks"
+        @JvmField
+        val BASE_URI: Uri = "content://${BuildConfig.BOOKMARK_AUTHORITY}/$BASE_PATH".toUri()
+
+        @JvmStatic
+        fun uriForName(name: String): Uri = "$BASE_URI/$name".toUri()
+    }
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesController.java

@@ -1,63 +0,0 @@
-package fr.free.nrw.commons.bookmarks.pictures;
-
-import fr.free.nrw.commons.Media;
-import fr.free.nrw.commons.bookmarks.models.Bookmark;
-import fr.free.nrw.commons.media.MediaClient;
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Single;
-import io.reactivex.functions.Function;
-import java.util.ArrayList;
-import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-@Singleton
-public class BookmarkPicturesController {
-
-    private final MediaClient mediaClient;
-    private final BookmarkPicturesDao bookmarkDao;
-
-    private List<Bookmark> currentBookmarks;
-
-    @Inject
-    public BookmarkPicturesController(MediaClient mediaClient, BookmarkPicturesDao bookmarkDao) {
-        this.mediaClient = mediaClient;
-        this.bookmarkDao = bookmarkDao;
-        currentBookmarks = new ArrayList<>();
-    }
-
-    /**
-     * Loads the Media objects from the raw data stored in DB and the API.
-     * @return a list of bookmarked Media object
-     */
-    Single<List<Media>> loadBookmarkedPictures() {
-        List<Bookmark> bookmarks = bookmarkDao.getAllBookmarks();
-        currentBookmarks = bookmarks;
-        return Observable.fromIterable(bookmarks)
-                .flatMap((Function<Bookmark, ObservableSource<Media>>) this::getMediaFromBookmark)
-                .toList();
-    }
-
-    private Observable<Media> getMediaFromBookmark(Bookmark bookmark) {
-        return mediaClient.getMedia(bookmark.getMediaName())
-                .toObservable()
-            .onErrorResumeNext(Observable.empty());
-    }
-
-    /**
-     * Loads the Media objects from the raw data stored in DB and the API.
-     * @return a list of bookmarked Media object
-     */
-    boolean needRefreshBookmarkedPictures() {
-        List<Bookmark> bookmarks = bookmarkDao.getAllBookmarks();
-        return bookmarks.size() != currentBookmarks.size();
-    }
-
-    /**
-     * Cancels the requests to the API and the DB
-     */
-    void stop() {
-        //noop
-    }
-}

app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesController.kt

@@ -0,0 +1,38 @@
+package fr.free.nrw.commons.bookmarks.pictures
+
+import fr.free.nrw.commons.Media
+import fr.free.nrw.commons.bookmarks.models.Bookmark
+import fr.free.nrw.commons.media.MediaClient
+import io.reactivex.Observable
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BookmarkPicturesController @Inject constructor(
+    private val mediaClient: MediaClient,
+    private val bookmarkDao: BookmarkPicturesDao
+) {
+    private var currentBookmarks: List<Bookmark> = listOf()
+
+    /**
+     * Loads the Media objects from the raw data stored in DB and the API.
+     * @return a list of bookmarked Media object
+     */
+    fun loadBookmarkedPictures(): Single<List<Media>> {
+        val bookmarks = bookmarkDao.getAllBookmarks()
+        currentBookmarks = bookmarks
+        return Observable.fromIterable(bookmarks).flatMap {
+            mediaClient.getMedia(it.mediaName)
+                .toObservable()
+                .onErrorResumeNext(Observable.empty())
+        }.toList()
+    }
+
+    fun needRefreshBookmarkedPictures(): Boolean {
+        val bookmarks = bookmarkDao.getAllBookmarks()
+        return bookmarks.size != currentBookmarks.size
+    }
+
+    fun stop() = Unit
+}

app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.java

@@ -1,227 +0,0 @@
-package fr.free.nrw.commons.bookmarks.pictures;
-
-import android.annotation.SuppressLint;
-import android.content.ContentProviderClient;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.os.RemoteException;
-
-import androidx.annotation.NonNull;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-
-import fr.free.nrw.commons.bookmarks.models.Bookmark;
-
-import static fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider.BASE_URI;
-
-@Singleton
-public class BookmarkPicturesDao {
-
-    private final Provider<ContentProviderClient> clientProvider;
-
-    @Inject
-    public BookmarkPicturesDao(@Named("bookmarks") Provider<ContentProviderClient> clientProvider) {
-        this.clientProvider = clientProvider;
-    }
-
-
-    /**
-     * Find all persisted pictures bookmarks on database
-     *
-     * @return list of bookmarks
-     */
-    @NonNull
-    public List<Bookmark> getAllBookmarks() {
-        List<Bookmark> items = new ArrayList<>();
-        Cursor cursor = null;
-        ContentProviderClient db = clientProvider.get();
-        try {
-            cursor = db.query(
-                    BookmarkPicturesContentProvider.BASE_URI,
-                    Table.ALL_FIELDS,
-                    null,
-                    new String[]{},
-                    null);
-            while (cursor != null && cursor.moveToNext()) {
-                items.add(fromCursor(cursor));
-            }
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-            db.release();
-        }
-        return items;
-    }
-
-
-    /**
-     * Look for a bookmark in database and in order to insert or delete it
-     *
-     * @param bookmark : Bookmark object
-     * @return boolean : is bookmark now fav ?
-     */
-    public boolean updateBookmark(Bookmark bookmark) {
-        boolean bookmarkExists = findBookmark(bookmark);
-        if (bookmarkExists) {
-            deleteBookmark(bookmark);
-        } else {
-            addBookmark(bookmark);
-        }
-        return !bookmarkExists;
-    }
-
-    /**
-     * Add a Bookmark to database
-     *
-     * @param bookmark : Bookmark to add
-     */
-    private void addBookmark(Bookmark bookmark) {
-        ContentProviderClient db = clientProvider.get();
-        try {
-            db.insert(BASE_URI, toContentValues(bookmark));
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        } finally {
-            db.release();
-        }
-    }
-
-    /**
-     * Delete a bookmark from database
-     *
-     * @param bookmark : Bookmark to delete
-     */
-    private void deleteBookmark(Bookmark bookmark) {
-        ContentProviderClient db = clientProvider.get();
-        try {
-            if (bookmark.getContentUri() == null) {
-                throw new RuntimeException("tried to delete item with no content URI");
-            } else {
-                db.delete(bookmark.getContentUri(), null, null);
-            }
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        } finally {
-            db.release();
-        }
-    }
-
-    /**
-     * Find a bookmark from database based on its name
-     *
-     * @param bookmark : Bookmark to find
-     * @return boolean : is bookmark in database ?
-     */
-    public boolean findBookmark(Bookmark bookmark) {
-        if (bookmark == null) {//Avoiding NPE's
-            return false;
-        }
-
-        Cursor cursor = null;
-        ContentProviderClient db = clientProvider.get();
-        try {
-            cursor = db.query(
-                    BookmarkPicturesContentProvider.BASE_URI,
-                    Table.ALL_FIELDS,
-                    Table.COLUMN_MEDIA_NAME + "=?",
-                    new String[]{bookmark.getMediaName()},
-                    null);
-            if (cursor != null && cursor.moveToFirst()) {
-                return true;
-            }
-        } catch (RemoteException e) {
-            // This feels lazy, but to hell with checked exceptions. :)
-            throw new RuntimeException(e);
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-            db.release();
-        }
-        return false;
-    }
-
-    @SuppressLint("Range")
-    @NonNull
-    Bookmark fromCursor(Cursor cursor) {
-        String fileName = cursor.getString(cursor.getColumnIndex(Table.COLUMN_MEDIA_NAME));
-        return new Bookmark(
-                fileName,
-                cursor.getString(cursor.getColumnIndex(Table.COLUMN_CREATOR)),
-                BookmarkPicturesContentProvider.uriForName(fileName)
-        );
-    }
-
-    private ContentValues toContentValues(Bookmark bookmark) {
-        ContentValues cv = new ContentValues();
-        cv.put(BookmarkPicturesDao.Table.COLUMN_MEDIA_NAME, bookmark.getMediaName());
-        cv.put(BookmarkPicturesDao.Table.COLUMN_CREATOR, bookmark.getMediaCreator());
-        return cv;
-    }
-
-
-    public static class Table {
-        public static final String TABLE_NAME = "bookmarks";
-
-        public static final String COLUMN_MEDIA_NAME = "media_name";
-        public static final String COLUMN_CREATOR = "media_creator";
-
-        // NOTE! KEEP IN SAME ORDER AS THEY ARE DEFINED UP THERE. HELPS HARD CODE COLUMN INDICES.
-        public static final String[] ALL_FIELDS = {
-                COLUMN_MEDIA_NAME,
-                COLUMN_CREATOR
-        };
-
-        public static final String DROP_TABLE_STATEMENT = "DROP TABLE IF EXISTS " + TABLE_NAME;
-
-        public static final String CREATE_TABLE_STATEMENT = "CREATE TABLE " + TABLE_NAME + " ("
-                + COLUMN_MEDIA_NAME + " STRING PRIMARY KEY,"
-                + COLUMN_CREATOR + " STRING"
-                + ");";
-
-        public static void onCreate(SQLiteDatabase db) {
-            db.execSQL(CREATE_TABLE_STATEMENT);
-        }
-
-        public static void onDelete(SQLiteDatabase db) {
-            db.execSQL(DROP_TABLE_STATEMENT);
-            onCreate(db);
-        }
-
-        public static void onUpdate(SQLiteDatabase db, int from, int to) {
-            if (from == to) {
-                return;
-            }
-            if (from < 7) {
-                // doesn't exist yet
-                from++;
-                onUpdate(db, from, to);
-                return;
-            }
-
-            if (from == 7) {
-                // table added in version 8
-                onCreate(db);
-                from++;
-                onUpdate(db, from, to);
-                return;
-            }
-
-            if (from == 8) {
-                from++;
-                onUpdate(db, from, to);
-                return;
-            }
-        }
-    }
-}