From 15cb58fe42f6db4b37f76a1654f4b1bce9e426fe Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Tue, 17 Feb 2015 00:58:03 +0100
Subject: [PATCH] Add placeholder for application ID to K9FileProvider

---
 k9mail/src/main/AndroidManifest.xml                           | 2 +-
 k9mail/src/main/java/com/fsck/k9/provider/K9FileProvider.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/k9mail/src/main/AndroidManifest.xml b/k9mail/src/main/AndroidManifest.xml
index 8a96f3e86..904d711a4 100644
--- a/k9mail/src/main/AndroidManifest.xml
+++ b/k9mail/src/main/AndroidManifest.xml
@@ -417,7 +417,7 @@
 
         <provider
             android:name=".provider.K9FileProvider"
-            android:authorities="com.fsck.k9.fileprovider"
+            android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
 
diff --git a/k9mail/src/main/java/com/fsck/k9/provider/K9FileProvider.java b/k9mail/src/main/java/com/fsck/k9/provider/K9FileProvider.java
index 87269e870..3d032b19d 100644
--- a/k9mail/src/main/java/com/fsck/k9/provider/K9FileProvider.java
+++ b/k9mail/src/main/java/com/fsck/k9/provider/K9FileProvider.java
@@ -7,9 +7,11 @@ import android.content.Context;
 import android.net.Uri;
 import android.support.v4.content.FileProvider;
 
+import com.fsck.k9.BuildConfig;
+
 
 public class K9FileProvider extends FileProvider {
-    private static final String AUTHORITY = "com.fsck.k9.fileprovider";
+    private static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".fileprovider";
 
     public static Uri getUriForFile(Context context, File file, String mimeType) {
         Uri uri = FileProvider.getUriForFile(context, AUTHORITY, file);