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

rename activities to match new purpose

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-06-18 16:25:18 +02:00
parent 0cfbe4ad06
commit 5e5febaee3
7 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenKeychain/src/main/AndroidManifest.xml
View File

@@ -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" />