From e7bf3e5fc26fe8ae65708d6685e5aaa802430225 Mon Sep 17 00:00:00 2001
From: Jonathan Klee <jonathan.klee@e.email>
Date: Tue, 29 Oct 2024 13:33:22 +0100
Subject: [PATCH] Allow release & debug flavor to cohabite together

---
 app/src/main/AndroidManifest.xml | 6 +++---
 lint.xml                         | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a66085688..fe79aa093 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <permission
-        android:name="foundation.e.apps.permission.AUTH_DATA_PROVIDER"
+        android:name="${applicationId}.permission.AUTH_DATA_PROVIDER"
         android:protectionLevel="signature" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -175,8 +175,8 @@
 
         <provider
             android:name=".microg.AuthDataProvider"
-            android:authorities="foundation.e.apps.authdata.provider"
-            android:readPermission="foundation.e.apps.permission.AUTH_DATA_PROVIDER"
+            android:authorities="${applicationId}.authdata.provider"
+            android:readPermission="${applicationId}.permission.AUTH_DATA_PROVIDER"
             android:exported="true"/>
 
     </application>
diff --git a/lint.xml b/lint.xml
index bfd91922c..9debeab74 100644
--- a/lint.xml
+++ b/lint.xml
@@ -34,6 +34,9 @@
         <ignore path="**/bcprov-jdk15*.jar"/>
     </issue>
 
+    <!--Ignore lint on permission name so that we can declare it with {applicationId} -->
+    <issue id="PermissionNamingConvention" severity="ignore" />
+
     <!-- WARNINGS -->
     <issue id="MissingTranslation" severity="warning" />
     <issue id="VectorRaster" severity="warning" />
-- 
GitLab