aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into v/decrypt-key-lookupVincent Breitmoser2015-11-1517-243/+573
|\
| * some optimizations and indexes for the main key list queryVincent Breitmoser2015-11-151-1/+1
| * decryptlist: minor cleanups and documentationVincent Breitmoser2015-11-141-7/+30
| * decryptlist: some cleanup and streamlining of control flowVincent Breitmoser2015-11-141-81/+84
| * Move permission check to createOperationInputDominik Schürmann2015-11-131-91/+96
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-132-2/+9
| |\
| | * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-11-091-67/+0
| | |\
| | * | import: apply fixPgpMessage to text for import from clipboardVincent Breitmoser2015-11-062-2/+9
| * | | Request READ_EXTERNAL_STORAGE for decryptionDominik Schürmann2015-11-132-21/+94
| | |/ | |/|
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-081-0/+44
| |\|
| | * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-11-044-23/+154
| | |\
| | * | bench: add benchmark operation for testingVincent Breitmoser2015-11-041-0/+44
| * | | Cleanup settings activityDominik Schürmann2015-11-081-67/+0
| | |/ | |/|
| * | Support for Android 6 ACTION_PROCESS_TEXTDominik Schürmann2015-11-022-4/+48
| * | Properly hide fab in ViewKeyActivity, fixes #1580Dominik Schürmann2015-11-021-5/+28
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-021-14/+51
| |\|
| | * keylist: add "search for query" button to empty viewVincent Breitmoser2015-11-021-14/+51
| * | Add runtime permission check for QR Code activityDominik Schürmann2015-11-021-14/+78
| |/
| * update material drawer libraryDominik Schürmann2015-10-291-22/+20
| * import: make operation cancelable (again), make "update all" cancelableVincent Breitmoser2015-10-292-3/+8
| * encrypttext: fix mimetype check logic (#1574)Vincent Breitmoser2015-10-291-1/+2
| * prevent crashes in EncryptKeyCompletionView (2)Vincent Breitmoser2015-10-261-10/+19
| * Target SDK 23 and related fixesDominik Schürmann2015-10-261-5/+4
| * Update tokenautocompleteDominik Schürmann2015-10-261-15/+13
| * Update zxing-android-embedded with new custom activityDominik Schürmann2015-10-262-6/+75
| * import: move uri resolution into AsyncTask, prevent NetworkOnMainThreadExceptionVincent Breitmoser2015-10-262-49/+44
| * decrypt: restart operation if interrupted by fragment recreationVincent Breitmoser2015-10-261-15/+12
| * linked: fix crash on <= lollipopVincent Breitmoser2015-10-251-3/+6
* | decryptlist: re-decrypt after key lookupVincent Breitmoser2015-10-231-8/+14
* | decryptlist: implement key lookup (wip)Vincent Breitmoser2015-10-232-38/+114
|/
* import: use filesize from content provider on input uriVincent Breitmoser2015-10-231-3/+3
* decryptlist: use generic file icon for application/octet-streamVincent Breitmoser2015-10-231-0/+4
* fix argument order screwup in FileHelperVincent Breitmoser2015-10-222-2/+2
* decrypt: special case single encrypted text -> directly display text, if not ...Vincent Breitmoser2015-10-211-0/+23
* encrypttext: localization, and truncate overlong inputVincent Breitmoser2015-10-211-2/+6
* encrypttext: handle input via Intent.EXTRA_STREAM in addition to Intent.EXTRA...Vincent Breitmoser2015-10-211-6/+34
* displaytextactivity: truncate displayed text if too longVincent Breitmoser2015-10-211-0/+8
* Integrate yubikey reset methodDominik Schürmann2015-10-162-5/+32
* UI preparations for yubikey resetDominik Schürmann2015-10-162-31/+68
* Remove default PIN settingDominik Schürmann2015-10-163-34/+0
* Clear cache when PIN is too shortDominik Schürmann2015-10-162-12/+7
* Prevent nfc dialog from closing when touching outside of it, add cancel buttonDominik Schürmann2015-10-163-6/+16
* Allow choosing of YubiKey PINDominik Schürmann2015-10-163-155/+82
* Add NFC reset methodDominik Schürmann2015-10-161-10/+46
* Remove debug logDominik Schürmann2015-10-151-1/+0
* Display backup code UI instead of passphrase on decryptDominik Schürmann2015-10-152-2/+58
* Check if backup code in passphrase dialogDominik Schürmann2015-10-151-0/+21
* File ending consisitency for backupsDominik Schürmann2015-10-151-3/+5
* Cleanup, fix advanced sharingDominik Schürmann2015-10-154-69/+75
* Remove debug codeDominik Schürmann2015-10-151-9/+1