diff options
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 74bf936b4..7247077d9 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -43,6 +43,11 @@ android:name="android.hardware.screen.portrait" android:required="false" /> + <!-- For OTG tokens --> + <uses-feature + android:name="android.hardware.usb.host" + android:required="false" /> + <!-- TemporaryStorageProvider should be writable by OpenKeychain only, thus signature-level permission --> <permission android:name="${applicationId}.WRITE_TEMPORARY_STORAGE" @@ -721,6 +726,16 @@ <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" + android:theme="@style/Theme.Keychain.Transparent"> + <!-- VIEW with fingerprint scheme: Handle URIs with fingerprints when scanning directly from Barcode Scanner --> <intent-filter android:label="@string/intent_import_key"> @@ -736,11 +751,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" @@ -872,6 +885,24 @@ android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_import_keys" /> + <!-- Usb interceptor activity --> + <activity + android:name=".ui.UsbEventReceiverActivity" + android:label="@string/app_name" + android:theme="@style/Theme.Keychain.Transparent" + android:noHistory="true" + android:excludeFromRecents="true" + android:taskAffinity="com.example.taskAffinityUsbEventReceiver" + android:process=":UsbEventReceiverActivityProcess" + android:exported="false"> + + <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" + android:resource="@xml/usb_device_filter" /> + <intent-filter> + <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" /> + </intent-filter> + </activity> + <!-- DEPRECATED service, using this service may lead to truncated data being returned to the caller --> <service |