Merge remote-tracking branch 'maikalms/master'

maks · Jan 21, 2017 · e5f16f5 · e5f16f5
2 parents 480e02f + a5fe606
commit e5f16f5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java b/app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java
@@ -19,6 +19,7 @@
  */
 package com.keepassdroid.fileselect;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
@@ -212,6 +213,7 @@ public void onClick(View v) {
 					Intent i = new Intent(StorageAF.ACTION_OPEN_DOCUMENT);
 					i.addCategory(Intent.CATEGORY_OPENABLE);
 					i.setType("*/*");
+					i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION|Intent.FLAG_GRANT_WRITE_URI_PERMISSION|Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION);
 					startActivityForResult(i, OPEN_DOC);
 				}
 				else {
@@ -356,6 +358,7 @@ protected void onPostExecute(Void v) {
 		}.execute(position);
 	}
 
+	@SuppressLint("NewApi")
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
@@ -378,6 +381,15 @@ else if ((requestCode == GET_CONTENT || requestCode == OPEN_DOC) && resultCode =
 			if (data != null) {
 				Uri uri = data.getData();
 				if (uri != null) {
+					if (StorageAF.useStorageFramework(this)) {
+						try {
+							// try to persist read and write permissions
+							getContentResolver().takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+							getContentResolver().takePersistableUriPermission(uri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+						} catch (Exception e) {
+							// nop
+						}
+					}
 					if (requestCode == GET_CONTENT) {
 						uri = UriUtil.translate(this, uri);
 					}

diff --git a/app/src/main/res/values-v19/donottranslate.xml b/app/src/main/res/values-v19/donottranslate.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="saf_default">true</bool>
+</resources>