Merge Conflict resolution draft

.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/.*

CHANGELOG.md

@@ -1,5 +1,130 @@
 # Wikimedia Commons for Android
 
+## 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
+
+* Fix the broken category search in the explore screen
+
+## v5.1.1
+
+### What's changed
+
+* Use Android's new EXIF interface to mitigate security issues in old
+  EXIF interface.
+* Make the icon that helps view the upload queue always visible as it ensures
+  that the queue accessible at all times.
+
+## v5.1.0
+
+### What's Changed
+
+* Enhanced **upload queue management** in the Commons app for smoother, sequential
+  processing, clearer progress tracking, prevention of stuck or duplicate
+  uploads. As part of this improvement, the "Limited Connection mode" has been
+  removed.
+* Added an option in "Nearby" feature enabling users to **provide feedback on
+  Wikidata items**. Users can report if an item doesn’t exist, is at a different
+  location, or has other issues, with submissions tagged for easy tracking and
+  updates.
+* Improved the "Nearby" feature by splitting the query into two parts for faster
+  loading and **better performance, especially in areas with dense amount of
+  places**. This update also resolves issues with pins overlapping place names.
+* Upgraded AGP and **target/compile SDK to 34** and make necessary adjustments to
+  the app such as adding **"Partial Access" support**. Also includes some minor
+  refactoring, and replacement of deprecated circular progress bars.
+* Fixed an **UI issue where the 'Subcategories' and 'Parent Categories' tabs
+  appeared blank** in the Category Details screen. Resolved by optimizing view
+  binding handling in the parent fragments.
+* Fixed an issue where editing depictions removed all other structured data from
+  images. Now, **only depictions are updated, preserving other associated data**.
+* Fixed **map centering** in the image upload flow to **use GPS EXIF tag location**
+  from pictures and ensured "Show in map app" accurately reflects this location.
+* Fixed navigation **after uploading via Nearby by directing users to the Uploads
+  activity** instead of returning to Nearby, preventing confusion about needing to
+  upload again.
+
+### Bug fixes and various changes
+
+* Improved the "Nearby" feature to fetch labels based on the user's preferred
+  language instead of defaulting to English.
+* Added a legend to the "Nearby" feature indicating pin statuses: red for items
+  without pictures, green for those with pictures, and grey for items being
+  checked. A floating action button now allows users to toggle the legend's
+  visibility.
+* Fixed an issue where the "Nominate for deletion" option is shown to logged out
+  users, preventing app errors and crashes.
+* Updated the regex pattern that filters categories with an year in it to also
+  filter the 2020s.
+* Fix an issue where past depictions were not shown as suggestions, despite
+  being saved correctly.
+* Fixed an issue in custom image picker where exiting the media preview showed
+  only the first image and cleared selections. Now, previously selected images
+  are restored correctly after exiting the preview. This was contributed.
+* Fixed an issue in custom image picker where scrolling behavior did not
+  maintain position after exiting fullscreen preview, ensuring users remain at
+  the same point in their image roll unless actioned images are filtered. This
+  was contributed.
+* Fixed Nearby map not showing new pins on map move by removing the 2000m scroll
+  threshold and adding an 800ms debounce for smoother pin updates when the map
+  is moved. Queued searches are now canceled on fragment destruction.
+* Revised author information retrieval to emphasize the custom author name from
+  the metadata instead of the default registered username.
+* Enhanced notification classification to properly identify "email" type
+  notifications and prompting users to check their e-mail inbox when such
+  notifications are clicked.
+* Resolved a bug in the language chooser that incorrectly greyed-out previously
+  selected languages, ensuring only the current language is non-selectable during
+  image upload.
+* Resolved pin color update issue in "Nearby" feature where the pin colour
+  failed to be updated after a successful image upload.
+
+What's listed here is only a subset of all the changes. Check the full-list of
+the changes in [this link](https://github.com/commons-app/apps-android-commons/compare/v5.0.2...v5.1.0).
+Alternatively, checkout [this release on GitHub releases page](https://github.com/commons-app/apps-android-commons/releases/tag/v5.1.0)
+for an exhaustive list of changes and the various contributors who contributed the same.
+
 ## v5.0.2
 
 - Enhanced multi-upload functionality with user prompts to clarify that all images would share the

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