diff options
| author | Lubo Viluda <lubo.viluda@gmail.com> | 2016-03-20 11:52:36 +0100 |
|---|---|---|
| committer | Lubo Viluda <lubo.viluda@gmail.com> | 2016-03-20 11:52:36 +0100 |
| commit | 7efeebc6381784a9362e5514fb50084c662dd335 (patch) | |
| tree | a910e8f82d484ffa10b24081cc4c62af80503584 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | 556c04db829c7e7534d03e8eb101a13d2cab6503 (diff) | |
| download | open-keychain-7efeebc6381784a9362e5514fb50084c662dd335.tar.gz open-keychain-7efeebc6381784a9362e5514fb50084c662dd335.tar.bz2 open-keychain-7efeebc6381784a9362e5514fb50084c662dd335.zip | |
#1661 - Don't expose CertifyActivity
*Add new activity - RedirectImportKeysActivity, which prompts user to
use Openkeychain directly
*Add intent filter for the activity
*Change intent filter for CertifyActivity
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 50ab9aaae..8031606fb 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -711,6 +711,15 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value=".ui.MainActivity" /> + </activity> + <activity + android:name=".ui.RedirectImportKeysActivity" + android:configChanges="orientation|screenSize|keyboardHidden|keyboard" + android:label="@string/title_activity_redirect_key"> > + <!-- VIEW with fingerprint scheme: Handle URIs with fingerprints when scanning directly from Barcode Scanner --> <intent-filter android:label="@string/intent_import_key"> @@ -726,11 +735,9 @@ <data android:scheme="OpenPGP4Fpr" /> <data android:scheme="OpenPGP4fpr" /> </intent-filter> - - <meta-data - android:name="android.support.PARENT_ACTIVITY" - android:value=".ui.MainActivity" /> </activity> + + <activity android:name=".ui.LogDisplayActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" @@ -943,4 +950,4 @@ </application> -</manifest> +</manifest>
\ No newline at end of file |