From bb974f8935fed5c1c191e44df6c5359e5589ca15 Mon Sep 17 00:00:00 2001 From: Tanmay Gupta <119003089+savsch@users.noreply.github.com> Date: Fri, 24 Jan 2025 06:22:09 +0530 Subject: [PATCH 1/4] Android CI: Update upload-artifact version (#6157) --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 7a1e7c030..958c13fda 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -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,7 @@ 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 From aedcd7f9b9de79b046c8eb448bcae2f15868b26a Mon Sep 17 00:00:00 2001 From: Tanmay Gupta <119003089+savsch@users.noreply.github.com> Date: Fri, 24 Jan 2025 12:32:33 +0530 Subject: [PATCH 2/4] Review: Load thumbnail instead of original image (#6153) Co-authored-by: Nicolas Raoul --- app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt index 209f991fb..01a1005fe 100644 --- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt @@ -188,7 +188,7 @@ class ReviewActivity : BaseActivity() { return } - binding.reviewImageView.setImageURI(media.imageUrl) + binding.reviewImageView.setImageURI(media.thumbUrl) reviewController.onImageRefreshed(media) // filename is updated compositeDisposable.add( From 7400872f872c678c28d5a26f3300214734b68176 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 27 Jan 2025 13:01:31 +0100 Subject: [PATCH 3/4] Localisation updates from https://translatewiki.net. --- app/src/main/res/values-diq/strings.xml | 2 ++ app/src/main/res/values-iw/strings.xml | 1 + app/src/main/res/values-ps/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + 4 files changed, 5 insertions(+) diff --git a/app/src/main/res/values-diq/strings.xml b/app/src/main/res/values-diq/strings.xml index 836e8ef62..cf48861d0 100644 --- a/app/src/main/res/values-diq/strings.xml +++ b/app/src/main/res/values-diq/strings.xml @@ -349,4 +349,6 @@ Tayêna bıwane Şınasnayış Raçarne + Hesab + Bınnuşte diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index fd3bbb163..61381c407 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -851,4 +851,5 @@ אזהרת העלמת חשבון כותרת הכותרת הועתקה ללוח + ברכותינו, כל התמונות באלבום הזה הועלו או שסומנו לא להעלאה. diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml index 4f17da26f..ca52b10d8 100644 --- a/app/src/main/res/values-ps/strings.xml +++ b/app/src/main/res/values-ps/strings.xml @@ -88,4 +88,5 @@ امستنې غبرگون وتل + گڼون diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index be06b0b99..371744b44 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -820,4 +820,5 @@ Att få kontot att försvinna är en <b>sista utväg</b> och bör <b>endast användas när du vill sluta redigera för alltid</b> och även dölja så många av dina tidigare associationer som möjligt.<br/><br/>Konton raderas på Wikimedia Commons genom att ändra kontonamnet för att göra så att andra inte kan känna igen bidragen i en process som kallas kontoförsvinnande. <b>Försvinnande garanterar inte fullständig anonymitet eller att bidrag tas bort från projekten</b>. Bildtext Bildtext kopierades till urklipp + Grattis! Alla bilder i detta album har antingen laddats upp eller markerats för att inte laddas upp. From 41170d81d91a0da638f9ba38f3ecdd99ff7100fa Mon Sep 17 00:00:00 2001 From: yuvraj-coder1 <142040957+yuvraj-coder1@users.noreply.github.com> Date: Mon, 27 Jan 2025 18:09:32 +0530 Subject: [PATCH 4/4] fix: logout user after account deletion by navigating to login screen (#6159) --- .../free/nrw/commons/activity/SingleWebViewActivity.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/activity/SingleWebViewActivity.kt b/app/src/main/java/fr/free/nrw/commons/activity/SingleWebViewActivity.kt index 0583ae2f9..b7951adab 100644 --- a/app/src/main/java/fr/free/nrw/commons/activity/SingleWebViewActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/activity/SingleWebViewActivity.kt @@ -28,6 +28,8 @@ 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 @@ -85,7 +87,12 @@ class SingleWebViewActivity : ComponentActivity() { url = url, successUrl = successUrl, onSuccess = { - // TODO Redirect the user to login screen like we do when the user logout's + //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