diff --git a/owncloud-android-library b/owncloud-android-library
index bf0ff3ce115..4731f50e872 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit bf0ff3ce115331af56c265455cbed5bcd094bd77
+Subproject commit 4731f50e872af68c39a44c5a8dd02791605fbc3a
diff --git a/owncloudApp/src/main/AndroidManifest.xml b/owncloudApp/src/main/AndroidManifest.xml
index cd40fc62fab..39f7e25533d 100644
--- a/owncloudApp/src/main/AndroidManifest.xml
+++ b/owncloudApp/src/main/AndroidManifest.xml
@@ -182,10 +182,12 @@
             android:name="androidx.core.content.FileProvider"
             android:authorities="@string/file_provider_authority"
             android:exported="false"
-            android:grantUriPermissions="true">
+            android:grantUriPermissions="true"
+            tools:replace="android:authorities">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/exposed_filepaths" />
+                android:resource="@xml/exposed_filepaths"
+                tools:replace="android:resource" />
         </provider>
 
         <service android:name=".services.OperationsService" />