diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-18 16:25:18 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-18 16:28:57 +0200 |
| commit | 5e5febaee38836d546d3cc5b9ce0003f206d4aa5 (patch) | |
| tree | d00d1bc02418441f497103d8d6be87281eee063e /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | 0cfbe4ad06577715bfd9b16aa912a21cb9c64cbc (diff) | |
| download | open-keychain-5e5febaee38836d546d3cc5b9ce0003f206d4aa5.tar.gz open-keychain-5e5febaee38836d546d3cc5b9ce0003f206d4aa5.tar.bz2 open-keychain-5e5febaee38836d546d3cc5b9ce0003f206d4aa5.zip | |
rename activities to match new purpose
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 19b775149..d5db3c2da 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -195,7 +195,7 @@ </intent-filter> </activity> <activity - android:name=".ui.DecryptTextActivity" + android:name=".ui.DisplayTextActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_decrypt" android:parentActivityName=".ui.MainActivity" @@ -203,16 +203,9 @@ <meta-data android:name="android.support.PARENT_ACTIVITY" android:value=".ui.MainActivity" /> - - <!-- DECRYPT_TEXT with text as extra --> - <intent-filter> - <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_TEXT" /> - - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> </activity> <activity - android:name=".ui.DecryptFilesActivity" + android:name=".ui.DecryptActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_decrypt" android:parentActivityName=".ui.MainActivity" @@ -257,6 +250,14 @@ <data android:scheme="file" /> <data android:scheme="content" /> </intent-filter> + + <!-- DECRYPT_TEXT --> + <intent-filter> + <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_TEXT" /> + + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <!-- Android's Send and Multi-Send Actions --> <intent-filter android:label="@string/intent_send_decrypt"> <action android:name="android.intent.action.SEND" /> |