cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle denied storage permission, use ContentResolver.SCHEME_FILE constant

Browse Source
This commit is contained in:
Dominik Schürmann
2015-11-19 18:26:06 +01:00
parent 0eac497754
commit 562c0546c6
5 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java
View File

@@ -161,7 +161,7 @@ public class FileHelper {
}
public static long getFileSize(Context context, Uri uri, long def) {
if ("file".equals(uri.getScheme())) {
if (ContentResolver.SCHEME_FILE.equals(uri.getScheme())) {
long size = new File(uri.getPath()).length();
if (size == 0) {
size = def;
@@ -293,7 +293,7 @@ public class FileHelper {
}
out.close();
if ("file".equals(uri.getScheme())) {
if (ContentResolver.SCHEME_FILE.equals(uri.getScheme())) {
return new File(uri.getPath()).delete() ? 1 : 0;
} else {
return resolver.delete(uri, null, null);

17
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelperLollipop.java
View File

@@ -1,3 +1,20 @@
/*
* Copyright (C) 2015 Dominik Schürmann <dominik@dominikschuermann.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.util;