aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* make use of proxies a Keyserver propertyVincent Breitmoser2015-10-297-49/+55
* editkey: always return EditKeyResultVincent Breitmoser2015-10-293-14/+16
* use Proxy.NO_PROXY instead of null value for no proxyVincent Breitmoser2015-10-296-21/+26
* encrypttext: fix mimetype check logic (#1574)Vincent Breitmoser2015-10-291-1/+2
* uploadop: clean up, add loggingVincent Breitmoser2015-10-2911-66/+120
* prevent crashes in EncryptKeyCompletionView (2)Vincent Breitmoser2015-10-261-10/+19
* Target SDK 23 and related fixesDominik Schürmann2015-10-262-8/+6
* 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
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-10-261-3/+6
|\
* | fix FileHelper class for pre-lollipop devicesVincent Breitmoser2015-10-262-43/+86
|/
* linked: fix crash on <= lollipopVincent Breitmoser2015-10-251-3/+6
* inputdataoperation: guess filetype from filename for generic application/ mim...Vincent Breitmoser2015-10-232-3/+18
* 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-223-3/+3
* 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