aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Fix keybase verificationDominik Schürmann2015-10-211-20/+17
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-10-216-8/+75
|\
| * decrypt: special case single encrypted text -> directly display text, if not ...Vincent Breitmoser2015-10-211-0/+23
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-10-211-2/+2
| |\
| * | 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-212-0/+11
| * | fix crash due to malformed log entryVincent Breitmoser2015-10-211-1/+1
| * | re-add accidentally deleted stringVincent Breitmoser2015-10-211-1/+2
* | | Improve file handling in TemporaryFileProviderDominik Schürmann2015-10-211-16/+21
| |/ |/|
* | SHA1 and RIPEMD160 are not declared insecure until widely deployedDominik Schürmann2015-10-211-2/+2
|/
* Integrate yubikey reset methodDominik Schürmann2015-10-163-6/+38
* UI preparations for yubikey resetDominik Schürmann2015-10-162-31/+68
* Remove default PIN settingDominik Schürmann2015-10-166-53/+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
* Renaming export strings to backupDominik Schürmann2015-10-154-47/+48
* 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-152-0/+22
* Support backupVersion ASCII Armor headerDominik Schürmann2015-10-157-25/+94
* File ending consisitency for backupsDominik Schürmann2015-10-153-7/+15
* Cleanup, fix advanced sharingDominik Schürmann2015-10-158-212/+92
* Remove debug codeDominik Schürmann2015-10-153-11/+3
* Mime type consistencyDominik Schürmann2015-10-157-18/+19
* Use correct filename when sharing backupDominik Schürmann2015-10-151-8/+8
* Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for d...Dominik Schürmann2015-10-159-51/+59
* Show the Internal Storage menu item on openFileDominik Schürmann2015-10-151-4/+4
* Add restore to backup fragment, cleanup, renamingsDominik Schürmann2015-10-153-20/+57
* Rename DrawerBackupFragment to BackupRestoreFragmentDominik Schürmann2015-10-152-3/+3
* Cleanup in BackupCodeFragmentDominik Schürmann2015-10-151-16/+14
* Fix drawer selection for backupDominik Schürmann2015-10-151-1/+1
* Unify backup filenameDominik Schürmann2015-10-152-4/+5
* Dont force OpenKeychain in open with for pgp-keysDominik Schürmann2015-10-151-1/+1
* Open decrypted application/pgp-keys only in OpenKeychainDominik Schürmann2015-10-151-2/+7
* Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-094-39/+83
|\
| * Revert "viewkeyactivity: ask for passphrase for backup only if key has one"Vincent Breitmoser2015-10-091-29/+3
| * fix variable name mistake (wth did I commit there?!)Vincent Breitmoser2015-10-091-2/+2
| * viewkeyactivity: ask for passphrase for backup only if key has oneVincent Breitmoser2015-10-091-3/+29
| * make openInputStreamSafe static and move to FileHelperVincent Breitmoser2015-10-092-87/+85
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-10-088-436/+420
| |\
| * | Revert "Check that the encrypt input uris are not linked to our own internal ...Dominik Schürmann2015-10-081-26/+3
| * | Dont allow encryption of app files via Os methods (OKC-01-010)Dominik Schürmann2015-10-081-3/+73
* | | viewkeyactivity: ask for passphrase for backup only if key has oneVincent Breitmoser2015-10-091-3/+29
* | | Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-0820-627/+548
|\ \ \ | | |/ | |/|
| * | pgpdecryptverify: only use keys for verification which are allowed to sign (O...Vincent Breitmoser2015-10-081-2/+10
| * | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-10-085-160/+9
| |\|
| | * Remove ShareHelper: Not compat with Android >= 5, reduce code complexityDominik Schürmann2015-10-084-159/+6