From ec8427bf863398971737e06c33a0fe612e29521f Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Mon, 1 May 2017 16:16:33 -0700
Subject: [PATCH] fix log emails crashing on 7.1+ devices

---
 clients/android/NewsBlur/AndroidManifest.xml         | 12 +++++++++++-
 clients/android/NewsBlur/res/xml/file_paths.xml      |  5 +++++
 .../NewsBlur/src/com/newsblur/util/PrefsUtils.java   |  3 ++-
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 clients/android/NewsBlur/res/xml/file_paths.xml

diff --git a/clients/android/NewsBlur/AndroidManifest.xml b/clients/android/NewsBlur/AndroidManifest.xml
index 78254f538..3c541f151 100644
--- a/clients/android/NewsBlur/AndroidManifest.xml
+++ b/clients/android/NewsBlur/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.newsblur"
     android:versionCode="137"
-    android:versionName="5.2.0b2" >
+    android:versionName="5.2.0b3" >
 
     <uses-sdk
         android:minSdkVersion="16"
@@ -145,6 +145,16 @@
         <receiver android:name=".util.NotifySaveReceiver" android:exported="false" />
         <receiver android:name=".util.NotifyMarkreadReceiver" android:exported="false" />
 
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="com.newsblur.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
     </application>
 
 </manifest>
diff --git a/clients/android/NewsBlur/res/xml/file_paths.xml b/clients/android/NewsBlur/res/xml/file_paths.xml
new file mode 100644
index 000000000..da3641fa9
--- /dev/null
+++ b/clients/android/NewsBlur/res/xml/file_paths.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-cache-path name="external_cache" />
+    <external-path name="external_files" />
+</paths>
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java b/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
index 53e8527e8..98999fac0 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
@@ -21,6 +21,7 @@ import android.graphics.BitmapFactory;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Build;
+import android.support.v4.content.FileProvider;
 import android.util.Log;
 
 import com.newsblur.R;
@@ -98,7 +99,7 @@ public class PrefsUtils {
         File f = com.newsblur.util.Log.getLogfile();
         if (f == null) return;
         String debugInfo = "Tell us a bit a about your problem:\n\n\n\n" + getDebugInfo(context);
-        android.net.Uri localPath = android.net.Uri.fromFile(f);
+        android.net.Uri localPath = FileProvider.getUriForFile(context, "com.newsblur.fileprovider", f);
         Intent i = new Intent(Intent.ACTION_SEND);
         i.setType("*/*");
         i.putExtra(Intent.EXTRA_EMAIL, new String[]{"android@newsblur.com"});