aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-10-26 12:52:39 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-10-26 12:52:39 +0100
commitcab52c401301596cf0ad2646e8172912a5623366 (patch)
treece74c80c4858a20d8747658b37fd290c240cfee7 /OpenKeychain/src/main/java/org
parentcae76455d4543e8a073e01eb31b8e4bedab96503 (diff)
downloadopen-keychain-cab52c401301596cf0ad2646e8172912a5623366.tar.gz
open-keychain-cab52c401301596cf0ad2646e8172912a5623366.tar.bz2
open-keychain-cab52c401301596cf0ad2646e8172912a5623366.zip
fix FileHelper class for pre-lollipop devices
Diffstat (limited to 'OpenKeychain/src/main/java/org')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java47
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelperLollipop.java82
2 files changed, 86 insertions, 43 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java
index 236913be7..c4d84a2d4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java
@@ -273,56 +273,17 @@ public class FileHelper {
}
/**
- * Tests whether a file is readable by others
- */
- @TargetApi(VERSION_CODES.LOLLIPOP)
- public static boolean S_IROTH(int mode) {
- return (mode & S_IROTH) == S_IROTH;
- }
-
- /**
* A replacement for ContentResolver.openInputStream() that does not allow the usage of
* "file" Uris that point to private files owned by the application only.
*
- * This is not allowed:
- * am start -a android.intent.action.SEND -t text/plain -n
- * "org.sufficientlysecure.keychain.debug/org.sufficientlysecure.keychain.ui.EncryptFilesActivity" --eu
- * android.intent.extra.STREAM
- * file:///data/data/org.sufficientlysecure.keychain.debug/databases/openkeychain.db
- *
- * @throws FileNotFoundException
+ * @see FileHelperLollipop
*/
- @TargetApi(VERSION_CODES.LOLLIPOP)
public static InputStream openInputStreamSafe(ContentResolver resolver, Uri uri)
- throws FileNotFoundException {
+ throws FileNotFoundException {
// Not supported on Android < 5
- if (Build.VERSION.SDK_INT < VERSION_CODES.LOLLIPOP) {
- return resolver.openInputStream(uri);
- }
-
- String scheme = uri.getScheme();
- if (ContentResolver.SCHEME_FILE.equals(scheme)) {
- ParcelFileDescriptor pfd = ParcelFileDescriptor.open(
- new File(uri.getPath()), ParcelFileDescriptor.parseMode("r"));
-
- try {
- final StructStat st = Os.fstat(pfd.getFileDescriptor());
- if (!S_IROTH(st.st_mode)) {
- Log.e(Constants.TAG, "File is not readable by others, aborting!");
- throw new FileNotFoundException("Unable to create stream");
- }
- } catch (ErrnoException e) {
- Log.e(Constants.TAG, "fstat() failed: " + e);
- throw new FileNotFoundException("fstat() failed");
- }
-
- AssetFileDescriptor fd = new AssetFileDescriptor(pfd, 0, -1);
- try {
- return fd.createInputStream();
- } catch (IOException e) {
- throw new FileNotFoundException("Unable to create stream");
- }
+ if (Build.VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
+ return FileHelperLollipop.openInputStreamSafe(resolver, uri);
} else {
return resolver.openInputStream(uri);
}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelperLollipop.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelperLollipop.java
new file mode 100644
index 000000000..f89d679bc
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelperLollipop.java
@@ -0,0 +1,82 @@
+package org.sufficientlysecure.keychain.util;
+
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+
+import android.annotation.TargetApi;
+import android.content.ContentResolver;
+import android.content.res.AssetFileDescriptor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Build.VERSION_CODES;
+import android.os.ParcelFileDescriptor;
+import android.system.ErrnoException;
+import android.system.Os;
+import android.system.StructStat;
+
+import org.sufficientlysecure.keychain.Constants;
+
+import static android.system.OsConstants.S_IROTH;
+
+
+/** FileHelper methods which use Lollipop-exclusive API.
+ * Some of the methods and static fields used here cause VerifyErrors because
+ * they do not exist in pre-lollipop API, so they must be kept in a
+ * lollipop-only class. All methods here should only be called by FileHelper,
+ * and consequently have package visibility.
+ */
+@TargetApi(VERSION_CODES.LOLLIPOP)
+class FileHelperLollipop {
+ /**
+ * Tests whether a file is readable by others
+ */
+ private static boolean S_IROTH(int mode) {
+ return (mode & S_IROTH) == S_IROTH;
+ }
+
+ /**
+ * A replacement for ContentResolver.openInputStream() that does not allow the usage of
+ * "file" Uris that point to private files owned by the application only.
+ *
+ * This is not allowed:
+ * am start -a android.intent.action.SEND -t text/plain -n
+ * "org.sufficientlysecure.keychain.debug/org.sufficientlysecure.keychain.ui.EncryptFilesActivity" --eu
+ * android.intent.extra.STREAM
+ * file:///data/data/org.sufficientlysecure.keychain.debug/databases/openkeychain.db
+ *
+ * @throws FileNotFoundException
+ */
+ static InputStream openInputStreamSafe(ContentResolver resolver, Uri uri)
+ throws FileNotFoundException {
+
+ String scheme = uri.getScheme();
+ if (ContentResolver.SCHEME_FILE.equals(scheme)) {
+ ParcelFileDescriptor pfd = ParcelFileDescriptor.open(
+ new File(uri.getPath()), ParcelFileDescriptor.parseMode("r"));
+
+ try {
+ final StructStat st = Os.fstat(pfd.getFileDescriptor());
+ if (!S_IROTH(st.st_mode)) {
+ Log.e(Constants.TAG, "File is not readable by others, aborting!");
+ throw new FileNotFoundException("Unable to create stream");
+ }
+ } catch (ErrnoException e) {
+ Log.e(Constants.TAG, "fstat() failed: " + e);
+ throw new FileNotFoundException("fstat() failed");
+ }
+
+ AssetFileDescriptor fd = new AssetFileDescriptor(pfd, 0, -1);
+ try {
+ return fd.createInputStream();
+ } catch (IOException e) {
+ throw new FileNotFoundException("Unable to create stream");
+ }
+ } else {
+ return resolver.openInputStream(uri);
+ }
+
+ }
+}