Commit Graph
5178 Commits
Author SHA1 Message Date
Dominik Schürmann 69376a489e Update from transifex 2015-10-21 22:49:49 +02:00
Dominik Schürmann 477a189c3f Merge branch 'master' of github.com:open-keychain/open-keychain 2015-10-21 22:33:46 +02:00
Vincent Breitmoser 7eb9f5d5cf decrypt: special case single encrypted text -> directly display text, if not too large 2015-10-21 22:30:21 +02:00
Dominik Schürmann 97ca5091c2 Improve file handling in TemporaryFileProvider 2015-10-21 22:14:54 +02:00
Vincent Breitmoser 4e60f1bc75 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-10-21 21:58:30 +02:00
Vincent Breitmoser 1b98c07237 encrypttext: localization, and truncate overlong input 2015-10-21 21:58:24 +02:00
Vincent Breitmoser a4b99ae350 encrypttext: handle input via Intent.EXTRA_STREAM in addition to Intent.EXTRA_TEXT 2015-10-21 21:55:15 +02:00
Vincent Breitmoser d149bfd3db displaytextactivity: truncate displayed text if too long 2015-10-21 21:54:39 +02:00
Dominik Schürmann 10fed404ae SHA1 and RIPEMD160 are not declared insecure until widely deployed 2015-10-21 21:42:37 +02:00
Dominik Schürmann 14d193a0f2 Use Github OAuth ID and secret from properties 2015-10-21 21:40:24 +02:00
Vincent Breitmoser f7bfe932ec fix crash due to malformed log entry 2015-10-21 17:11:02 +02:00
Vincent Breitmoser 86a7571c76 linked: fix colors for dark theme 2015-10-21 16:19:16 +02:00
Vincent Breitmoser 4172715064 re-add accidentally deleted string 2015-10-21 15:44:52 +02:00
Dominik Schürmann 8f565296b9 Integrate yubikey reset method 2015-10-16 15:30:06 +02:00
Dominik Schürmann 930db9061e UI preparations for yubikey reset 2015-10-16 14:57:45 +02:00
Dominik Schürmann 4f2e02d606 Remove default PIN setting 2015-10-16 13:43:21 +02:00
Dominik Schürmann a83f260cdb Clear cache when PIN is too short 2015-10-16 13:40:37 +02:00
Dominik Schürmann 995003af60 nfc dialog: button placeholder to retain size 2015-10-16 13:18:14 +02:00
Dominik Schürmann 703e0b34e7 Prevent nfc dialog from closing when touching outside of it, add cancel button 2015-10-16 13:11:28 +02:00
Dominik Schürmann de3791de3f Allow choosing of YubiKey PIN 2015-10-16 12:58:36 +02:00
Dominik Schürmann 709a91422e Add NFC reset method 2015-10-16 11:33:11 +02:00
Dominik Schürmann cb80d94831 Remove debug log 2015-10-15 23:45:11 +02:00
Dominik Schürmann 0bc2c860af Layout for backup code input 2015-10-15 23:40:53 +02:00
Dominik Schürmann 2db8346f37 Renaming export strings to backup 2015-10-15 23:40:35 +02:00
Dominik Schürmann 491477cabf Display backup code UI instead of passphrase on decrypt 2015-10-15 23:40:26 +02:00
Dominik Schürmann 6ea58aa0a7 Check if backup code in passphrase dialog 2015-10-15 23:08:30 +02:00
Dominik Schürmann cac7c3234a Support backupVersion ASCII Armor header 2015-10-15 22:50:34 +02:00
Dominik Schürmann c03dee6fe2 File ending consisitency for backups 2015-10-15 21:56:23 +02:00
Dominik Schürmann 53680b6213 Cleanup, fix advanced sharing 2015-10-15 21:48:01 +02:00
Dominik Schürmann 52c6d8f8e0 Remove debug code 2015-10-15 20:11:58 +02:00
Dominik Schürmann a5ff2f8fe3 Mime type consistency 2015-10-15 19:56:04 +02:00
Dominik Schürmann 81283a2967 Use correct filename when sharing backup 2015-10-15 19:46:28 +02:00
Dominik Schürmann 7384fa7f2b Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for db contract 2015-10-15 19:37:08 +02:00
Dominik Schürmann c0cd872954 Show the Internal Storage menu item on openFile 2015-10-15 19:19:43 +02:00
Dominik Schürmann 8279f84eb8 Add restore to backup fragment, cleanup, renamings 2015-10-15 19:10:06 +02:00
Dominik Schürmann cad89f12e2 Rename DrawerBackupFragment to BackupRestoreFragment 2015-10-15 18:58:19 +02:00
Dominik Schürmann 394b1b6ccb Cleanup in BackupCodeFragment 2015-10-15 18:57:19 +02:00
Dominik Schürmann f33168359c Fix drawer selection for backup 2015-10-15 18:57:08 +02:00
Dominik Schürmann e4e44f35d8 Layout consistency for backup fragment 2015-10-15 18:51:56 +02:00
Dominik Schürmann bed3819c11 Unify backup filename 2015-10-15 17:26:51 +02:00
Dominik Schürmann c4b3dc0643 Dont force OpenKeychain in open with for pgp-keys 2015-10-15 16:52:27 +02:00
Dominik Schürmann 6ea89a0892 Open decrypted application/pgp-keys only in OpenKeychain 2015-10-15 16:48:24 +02:00
Vincent Breitmoser 759ffc5a4b Merge branch 'master' into encrypted-export 2015-10-09 14:57:54 +02:00
Vincent Breitmoser eff4ae5551 Revert "viewkeyactivity: ask for passphrase for backup only if key has one"
This reverts commit 3316cb65e6.

Committed to wrong branch, derp :)
2015-10-09 14:56:46 +02:00
Vincent Breitmoser 315ed608ae viewkeyactivity: ask for passphrase for backup only if key has one 2015-10-09 14:56:02 +02:00
Vincent Breitmoser e67e8cd8c1 fix variable name mistake (wth did I commit there?!) 2015-10-09 14:28:25 +02:00
Vincent Breitmoser 3316cb65e6 viewkeyactivity: ask for passphrase for backup only if key has one 2015-10-09 13:11:25 +02:00
Vincent Breitmoser 83fef47ec8 make openInputStreamSafe static and move to FileHelper 2015-10-09 01:44:40 +02:00
Dominik Schürmann 1c556344c9 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-10-08 20:21:37 +02:00
Dominik Schürmann 1fb0ed8454 Revert "Check that the encrypt input uris are not linked to our own internal storage (OKC-01-010)"
Fix was not sufficient

This reverts commit b10b14d9bc.
2015-10-08 20:21:02 +02:00