From b4efc86b8e372c207c93d33331b199590c9a72f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Kr=C3=BCger?= <t@timkrueger.me>
Date: Fri, 3 Jun 2022 15:30:00 +0200
Subject: [PATCH] Disable lint check 'PrivateResource'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removes the in commit cedd929f10 added string attribute 'tools:ignore'. These
would require an adjustment to our CI which we want to avoid.

So instead the lint check 'PrivateResousce' is globally deactivated.

See: commit cedd929f10, #2110

Signed-off-by: Tim Krüger <t@timkrueger.me>
---
 app/build.gradle                    | 2 +-
 app/src/main/res/values/strings.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bd2885d0c..3f1771cbf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -138,7 +138,7 @@ android {
 
     lint {
         abortOnError false
-        disable 'MissingTranslation'
+        disable 'MissingTranslation','PrivateResource'
         htmlOutput file("$project.buildDir/reports/lint/lint.html")
         htmlReport true
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a0a8780d..deecee935 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,7 +20,7 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Common -->
     <string name="nc_yes">Yes</string>
     <string name="nc_no">No</string>
@@ -328,9 +328,9 @@
     <string name="nc_message_failed_to_send">Failed to send message:</string>
     <string name="nc_remote_audio_off">Remote audio off</string>
     <string name="nc_add_attachment">Add attachment</string>
-    <string name="emoji_category_recent" tools:ignore="PrivateResource">Recent</string>
-    <string name="emoji_backspace" tools:ignore="PrivateResource">Backspace</string>
-    <string name="emoji_search" tools:ignore="PrivateResource">Search emoji</string>
+    <string name="emoji_category_recent">Recent</string>
+    <string name="emoji_backspace">Backspace</string>
+    <string name="emoji_search">Search emoji</string>
 
     <!-- Content descriptions -->
     <string name="nc_description_send_message_button">Send message</string>