From 5d7f42d127600f205773214bb877472f259ff552 Mon Sep 17 00:00:00 2001
From: Rohit Verma <101377978+rohit9625@users.noreply.github.com>
Date: Tue, 24 Jun 2025 18:26:00 +0530
Subject: [PATCH] Fix/file usage not working (#6354)

* chore: add R8 rules to prevent obfuscating file usage classes

* chore: upgrade lifecycle-runtime dependency to resolve lint errors

* remove invalid resource directory
---
 app/proguard-rules.txt                                 |  3 +++
 .../main/res/values-x-invalidLanguageCode/error.xml    | 10 ----------
 gradle/libs.versions.toml                              |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 app/src/main/res/values-x-invalidLanguageCode/error.xml

diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt
index 63981633b..21c584ba9 100644
--- a/app/proguard-rules.txt
+++ b/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
diff --git a/app/src/main/res/values-x-invalidLanguageCode/error.xml b/app/src/main/res/values-x-invalidLanguageCode/error.xml
deleted file mode 100644
index f4e2fe125..000000000
--- a/app/src/main/res/values-x-invalidLanguageCode/error.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Authors:
-* Vlad5250
--->
-<resources>
-  <string name="crash_dialog_title">کامَنٕز گوو رُکِتھ</string>
-  <string name="crash_dialog_text">Oops. کیہہ تام گوو غلط!</string>
-  <string name="crash_dialog_comment_prompt">ؤنِیوٚ اَسہِ توٚہہِ کیاہ ٲسِیوٚ کران، تہٕ کٕریٚو تہِ اَسہِ سٕتی شیر بذریعہِ برقی خط. یُس مَدَتھ کَرِ اَسہِ اَتھ شہَرنَس منٛز!</string>
-  <string name="crash_dialog_ok_toast">شُکریہ!</string>
-</resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index afb3615d2..f38357b04 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -39,7 +39,7 @@ leakcanary = "2.10"
 livedataTesting = "1.2.0"
 swipelayout = "1.2.0"
 viewpagerIndicator = "2.4.1.1"
-lifecycleRuntimeKtx = "2.8.4"
+lifecycleRuntimeKtx = "2.8.7"
 loggingInterceptor = "4.10.0"
 logbackAndroidClassic = "1.1.1-6"
 material = "1.12.0"