From 8e71e7a210972d083a9e92d9b7991fd9da797871 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 11 Mar 2017 10:02:40 +0100
Subject: catch fileprovider related NPEs

---
 src/main/AndroidManifest.xml                                   | 4 ++--
 src/main/java/de/pixart/messenger/persistance/FileBackend.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 8f814795d..b248a35e7 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -270,7 +270,7 @@
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="de.pixart.messenger.files"
+            android:authorities="${applicationId}.files"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
@@ -278,7 +278,7 @@
                 android:resource="@xml/file_paths" />
         </provider>
         <provider
-            android:authorities="de.pixart.messenger.barcodes"
+            android:authorities="${applicationId}.barcodes"
             android:name=".services.BarcodeProvider"
             android:exported="false"
             android:grantUriPermissions="true"/>
diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
index e2d7894df..3fc35ab1b 100644
--- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
@@ -521,7 +521,7 @@ public class FileBackend {
     }
 
     public Uri getTakePhotoUri() {
-        File file = new File(getTakePhotoPath() + "IMG_" + fileDateFormat.format(new Date()) + ".jpg");
+        File file = new File(getTakePhotoPath() + "IMG_" + this.fileDateFormat.format(new Date()) + ".jpg");
         file.getParentFile().mkdirs();
         return getUriForFile(mXmppConnectionService, file);
     }
-- 
cgit v1.2.3