From 42ccf3504a68937ea713d19876be16c044840746 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 22 Mar 2016 19:01:17 +0300
Subject: use fileprovider to share pages

---
 org.fox.ttcomics/build.gradle                              |  6 +++---
 org.fox.ttcomics/org.fox.ttcomics.iml                      | 14 +++++++-------
 org.fox.ttcomics/src/main/AndroidManifest.xml              | 10 ++++++++++
 .../src/main/java/org/fox/ttcomics2/ViewComicActivity.java | 14 ++++++++------
 org.fox.ttcomics/src/main/res/xml/fileprovider_paths.xml   |  5 +++++
 5 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100755 org.fox.ttcomics/src/main/res/xml/fileprovider_paths.xml

(limited to 'org.fox.ttcomics')

diff --git a/org.fox.ttcomics/build.gradle b/org.fox.ttcomics/build.gradle
index d42c501..1af0c25 100755
--- a/org.fox.ttcomics/build.gradle
+++ b/org.fox.ttcomics/build.gradle
@@ -25,9 +25,9 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:23.1.0'
-    compile 'com.android.support:appcompat-v7:23.1.0'
-    compile 'com.android.support:cardview-v7:23.1.0'
+    compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:cardview-v7:23.1.1'
     compile 'it.neokree:MaterialTabs:0.11'
     compile 'com.shamanland:fab:0.0.5'
     compile 'jp.co.recruit_mp:android-HeaderFooterGridView:0.2.4'
diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml
index fc13d79..cc6a315 100755
--- a/org.fox.ttcomics/org.fox.ttcomics.iml
+++ b/org.fox.ttcomics/org.fox.ttcomics.iml
@@ -69,9 +69,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.ToxicBakery.viewpager.transforms/view-pager-transforms/1.2.32/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.1.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.1.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.markushi/android-ui/1.2/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.nhaarman.listviewanimations/lib-core/3.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.shamanland/fab/0.0.5/jars" />
@@ -92,16 +92,16 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="nineoldandroids-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="acra-4.5.0" level="project" />
-    <orderEntry type="library" exported="" name="cardview-v7-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="cardview-v7-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" />
     <orderEntry type="library" exported="" name="android-HeaderFooterGridView-0.2.4" level="project" />
     <orderEntry type="library" exported="" name="fab-0.0.5" level="project" />
     <orderEntry type="library" exported="" name="lib-core-3.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="android-ui-1.2" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="view-pager-transforms-1.2.32" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="MaterialTabs-0.11" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml
index 093bc6e..b74a4d3 100755
--- a/org.fox.ttcomics/src/main/AndroidManifest.xml
+++ b/org.fox.ttcomics/src/main/AndroidManifest.xml
@@ -71,6 +71,16 @@
             android:name=".utils.CacheCleanupService"
             android:exported="false"/>
 
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="org.fox.ttcomics2.files"
+            android:exported="false"
+            android:grantUriPermissions="true" >
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/fileprovider_paths" />
+        </provider>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
index 159956d..d08dbd5 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
@@ -14,6 +14,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v4.content.FileProvider;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -55,7 +56,7 @@ public class ViewComicActivity extends CommonActivity {
         }
 
         setContentView(R.layout.activity_view_comic);
-		setSupportActionBar((Toolbar) findViewById(R.id.toolbar));;
+		setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
 
 		if (m_prefs.getBoolean("use_full_screen", false)) {
 			hideSystemUI(true);
@@ -138,15 +139,16 @@ public class ViewComicActivity extends CommonActivity {
 				fos.close();
 				is.close();
 
+				m_tmpFileName = tmpFile.getAbsolutePath();
+
 				Intent shareIntent = new Intent(Intent.ACTION_SEND);
-				
 				shareIntent.setType("image/jpeg");
-				shareIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(tmpFile));
 
-				m_tmpFileName = tmpFile.getAbsolutePath();
-				
+				Uri uri = FileProvider.getUriForFile(this, "org.fox.ttcomics2.files", tmpFile);
+				shareIntent.putExtra(Intent.EXTRA_STREAM, uri);
+
 				startActivityForResult(Intent.createChooser(shareIntent, getString(R.string.share_comic)), REQUEST_SHARE);
-								
+
 			} catch (IOException e) {
 				toast(getString(R.string.error_could_not_prepare_file_for_sharing));
 				e.printStackTrace();
diff --git a/org.fox.ttcomics/src/main/res/xml/fileprovider_paths.xml b/org.fox.ttcomics/src/main/res/xml/fileprovider_paths.xml
new file mode 100755
index 0000000..1add43e
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/xml/fileprovider_paths.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <cache-path name="cache" path="." />
+    <external-path name="external" path="." />
+</paths>
\ No newline at end of file
-- 
cgit v1.2.3