diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-09-18 22:51:13 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-09-18 22:51:13 +0200 |
| commit | f253c9e2062f89b6feed0ff30a3ffac98a50374f (patch) | |
| tree | 50088e50582e39c0d4274c6eff4bed70d09d2718 /OpenKeychain/src | |
| parent | 2d54c3f9282e30d1fe7b90345e772bc0b8cc0214 (diff) | |
| download | open-keychain-f253c9e2062f89b6feed0ff30a3ffac98a50374f.tar.gz open-keychain-f253c9e2062f89b6feed0ff30a3ffac98a50374f.tar.bz2 open-keychain-f253c9e2062f89b6feed0ff30a3ffac98a50374f.zip | |
Fix DECRYPT_DATA intent
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index c966d688a..e80faff58 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -263,9 +263,7 @@ <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_DATA" /> <category android:name="android.intent.category.DEFAULT" /> - - <data android:scheme="file" /> - <data android:scheme="content" /> + <data android:mimeType="*/*" /> </intent-filter> <!-- DECRYPT_TEXT --> diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java index 5eb9963f5..4e9a6f17d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -168,7 +168,7 @@ public class DecryptActivity extends BaseActivity { return; } - uris.add(intent.getData()); + uris.add(uri); } } |