From 7c4d8ad6d5c374763d21a8211ecb422632c07436 Mon Sep 17 00:00:00 2001
From: Robert Svensson <robert.svensson@skovik.com>
Date: Thu, 12 Sep 2019 11:42:57 +0200
Subject: [PATCH 1/2] Fix file provider authority reference

This re-instates what was done in 94b72ccfec, undone in e048d2b96d and later
'fixed' in 1642584d19, which orphaned 'fileprovider_authority' in strings.xml.
---
 android-template/app/src/main/AndroidManifest.xml | 2 +-
 example/android/app/src/main/AndroidManifest.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android-template/app/src/main/AndroidManifest.xml b/android-template/app/src/main/AndroidManifest.xml
index de4589027e..35591909ee 100644
--- a/android-template/app/src/main/AndroidManifest.xml
+++ b/android-template/app/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
+            android:authorities="@string/fileprovider_authority"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 768bb43d4c..698900a5a5 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@ package="com.getcapacitor.myapp">
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
+            android:authorities="@string/fileprovider_authority"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

From 144a0294309bc5305b51aaadb1e769fb1ab2a3db Mon Sep 17 00:00:00 2001
From: Robert Svensson <robert.svensson@skovik.com>
Date: Tue, 24 Sep 2019 10:12:15 +0200
Subject: [PATCH 2/2] =?UTF-8?q?squash:=20Fix=20file=20provider=20authority?=
 =?UTF-8?q?=20=E2=80=A6=20-=20drop=20file=20provider=20from=20strings.xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The variable became orphaned in 1642584d19.
---
 android-template/app/src/main/AndroidManifest.xml    | 2 +-
 android-template/app/src/main/res/values/strings.xml | 1 -
 example/android/app/src/main/AndroidManifest.xml     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/android-template/app/src/main/AndroidManifest.xml b/android-template/app/src/main/AndroidManifest.xml
index 35591909ee..de4589027e 100644
--- a/android-template/app/src/main/AndroidManifest.xml
+++ b/android-template/app/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="@string/fileprovider_authority"
+            android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/android-template/app/src/main/res/values/strings.xml b/android-template/app/src/main/res/values/strings.xml
index 360979c3b4..b5f4526185 100644
--- a/android-template/app/src/main/res/values/strings.xml
+++ b/android-template/app/src/main/res/values/strings.xml
@@ -3,6 +3,5 @@
     <string name="app_name">My App</string>
     <string name="title_activity_main">My App</string>
     <string name="package_name">com.getcapacitor.myapp</string>
-    <string name="fileprovider_authority">com.getcapacitor.myapp.fileprovider</string>
     <string name="custom_url_scheme">com.getcapacitor.myapp</string>
 </resources>
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 698900a5a5..768bb43d4c 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@ package="com.getcapacitor.myapp">
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="@string/fileprovider_authority"
+            android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data