aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-07 18:59:56 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-07 18:59:56 +0200
commitef30d842d885e9fc4eed74456b1feaedb01389eb (patch)
treed3522680f634532452bff3cc7790799007ec3fe3 /OpenKeychain
parent857fc43873a24e22fb7b80d00e0086c138c70ca3 (diff)
downloadopen-keychain-ef30d842d885e9fc4eed74456b1feaedb01389eb.tar.gz
open-keychain-ef30d842d885e9fc4eed74456b1feaedb01389eb.tar.bz2
open-keychain-ef30d842d885e9fc4eed74456b1feaedb01389eb.zip
API fixes
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml4
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java4
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java2
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java2
4 files changed, 5 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 1e3b1a9b5..18cf8678d 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -151,9 +151,7 @@
<action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_DATA" />
<category android:name="android.intent.category.DEFAULT" />
-
- <data android:scheme="file" />
- <data android:scheme="content" />
+ <data android:mimeType="*/*" />
</intent-filter>
<!-- Android's Send Action -->
<intent-filter android:label="@string/intent_send_encrypt">
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java
index 3d414c227..31f4f5dfc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java
@@ -51,7 +51,7 @@ import java.util.Set;
public class EncryptFileActivity extends DrawerActivity implements EncryptActivityInterface {
/* Intents */
- public static final String ACTION_ENCRYPT_FILES = OpenKeychainIntents.ENCRYPT_DATA;
+ public static final String ACTION_ENCRYPT_DATA = OpenKeychainIntents.ENCRYPT_DATA;
// enables ASCII Armor for file encryption when uri is given
public static final String EXTRA_ASCII_ARMOR = OpenKeychainIntents.ENCRYPT_EXTRA_ASCII_ARMOR;
@@ -371,7 +371,7 @@ public class EncryptFileActivity extends DrawerActivity implements EncryptActivi
setContentView(R.layout.encrypt_file_activity);
// if called with an intent action, do not init drawer navigation
- if (ACTION_ENCRYPT_FILES.equals(getIntent().getAction())) {
+ if (ACTION_ENCRYPT_DATA.equals(getIntent().getAction())) {
// lock drawer
deactivateDrawerNavigation();
// TODO: back button to key?
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index 3d570bbeb..e7edc6058 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -328,7 +328,7 @@ public class KeyListFragment extends LoaderFragment
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
protected void encrypt(ActionMode mode, long[] masterKeyIds) {
Intent intent = new Intent(getActivity(), EncryptFileActivity.class);
- intent.setAction(EncryptFileActivity.ACTION_ENCRYPT_FILES);
+ intent.setAction(EncryptFileActivity.ACTION_ENCRYPT_DATA);
intent.putExtra(EncryptFileActivity.EXTRA_ENCRYPTION_KEY_IDS, masterKeyIds);
// used instead of startActivity set actionbar based on callingPackage
startActivityForResult(intent, 0);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
index 796734c13..e4b455481 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
@@ -295,7 +295,7 @@ public class ViewKeyMainFragment extends LoaderFragment implements
intent.putExtra(EncryptTextActivity.EXTRA_ENCRYPTION_KEY_IDS, encryptionKeyIds);
} else {
intent = new Intent(getActivity(), EncryptFileActivity.class);
- intent.setAction(EncryptFileActivity.ACTION_ENCRYPT_FILES);
+ intent.setAction(EncryptFileActivity.ACTION_ENCRYPT_DATA);
intent.putExtra(EncryptFileActivity.EXTRA_ENCRYPTION_KEY_IDS, encryptionKeyIds);
}
// used instead of startActivity set actionbar based on callingPackage