Merge pull request #109 from Omega-R/bugfix/share_file_crash

anton-knyazev · web-flow · commit 50e8eb296033 · 2020-03-19T12:03:22.000+03:00
Bugfix/share file crash
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/BaseUriBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/BaseUriBuilder.kt
@@ -147,7 +147,7 @@ abstract class BaseUriBuilder() : BaseActivityBuilder(), Download<BaseUriBuilder
     }
 
     private fun toUri(context: Context, file: File): Uri {
-        val cacheFile = File(localFilesDir, file.name)
+        val cacheFile = File(getLocalFilesDir(context), file.name)
         file.copyTo(cacheFile, overwrite = true)
         return FileProvider.getLocalFileUri(context, cacheFile)
     }
@@ -188,7 +188,7 @@ abstract class BaseUriBuilder() : BaseActivityBuilder(), Download<BaseUriBuilder
         return uriSet.first()
     }
 
-    protected fun getUriSet(context: Context): Set<Uri> {
+    fun getUriSet(context: Context): Set<Uri> {
         val uriSet = mutableSetOf<Uri>()
         uriSet.addAll(this.uriSet)
         uriSet.addAll(fileSet.map { toUri(context, it) })

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ abstract class BaseUriBuilder() : BaseActivityBuilder(), Download<BaseUriBuilder`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`private fun toUri(context: Context, file: File): Uri {`
`150`		`- val cacheFile = File(localFilesDir, file.name)`
	`150`	`+ val cacheFile = File(getLocalFilesDir(context), file.name)`
`151`	`151`	`file.copyTo(cacheFile, overwrite = true)`
`152`	`152`	`return FileProvider.getLocalFileUri(context, cacheFile)`
`153`	`153`	`}`
`@@ -188,7 +188,7 @@ abstract class BaseUriBuilder() : BaseActivityBuilder(), Download<BaseUriBuilder`
`188`	`188`	`return uriSet.first()`
`189`	`189`	`}`
`190`	`190`
`191`		`- protected fun getUriSet(context: Context): Set<Uri> {`
	`191`	`+ fun getUriSet(context: Context): Set<Uri> {`
`192`	`192`	`val uriSet = mutableSetOf<Uri>()`
`193`	`193`	`uriSet.addAll(this.uriSet)`
`194`	`194`	`uriSet.addAll(fileSet.map { toUri(context, it) })`