fenix
/
Simple-Draw
mirror of https://github.com/SimpleMobileTools/Simple-Draw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update the FileProvider pattern

This commit is contained in:
tibbi 2017-11-07 19:08:16 +01:00
parent 54a5027b2a
commit 3fa5dc5300
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/AndroidManifest.xml
View File

@ -57,6 +57,11 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity
android:name=".activities.SettingsActivity"
android:label="@string/settings"
android:parentActivityName=".activities.MainActivity"/>
<activity <activity
android:name="com.simplemobiletools.commons.activities.AboutActivity" android:name="com.simplemobiletools.commons.activities.AboutActivity"
android:label="@string/about" android:label="@string/about"
@ -72,19 +77,14 @@
android:label="@string/customize_colors" android:label="@string/customize_colors"
android:parentActivityName=".activities.SettingsActivity"/> android:parentActivityName=".activities.SettingsActivity"/>
<activity
android:name=".activities.SettingsActivity"
android:label="@string/settings"
android:parentActivityName=".activities.MainActivity"/>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="android.support.v4.content.FileProvider"
android:authorities="com.simplemobiletools.draw.fileprovider" android:authorities="${applicationId}.provider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true"> android:grantUriPermissions="true">
<meta-data <meta-data
android:name="android.support.FILE_PROVIDER_PATHS" android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/filepaths"/> android:resource="@xml/provider_paths"/>
</provider> </provider>
</application> </application>
</manifest> </manifest>

3
app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt
View File

@ -8,7 +8,6 @@ import android.graphics.drawable.ColorDrawable
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.provider.MediaStore import android.provider.MediaStore
import android.support.v4.content.FileProvider
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.webkit.MimeTypeMap import android.webkit.MimeTypeMap
@ -291,7 +290,7 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
fileOutputStream?.close() fileOutputStream?.close()
} }
return FileProvider.getUriForFile(this, "com.simplemobiletools.draw.fileprovider", file) return getFilePublicUri(file, BuildConfig.APPLICATION_ID)
} }
private fun clearCanvas() { private fun clearCanvas() {

6
app/src/main/res/xml/filepaths.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<paths>
<cache-path
name="shared_images"
path="images/"/>
</paths>

6
app/src/main/res/xml/provider_paths.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<paths>
<cache-path name="shared_images" path="images/"/>
<external-path name="external_files" path="."/>
<root-path name="external_files" path="/storage/"/>
</paths>