Commit Graph

1629 Commits

Author SHA1 Message Date
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
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
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
3316cb65e6 viewkeyactivity: ask for passphrase for backup only if key has one 2015-10-09 13:11:25 +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
Vincent Breitmoser
6cf7e3e541 Merge branch 'master' into encrypted-export 2015-10-08 20:05:56 +02:00
Dominik Schürmann
1328309009 Remove ShareHelper: Not compat with Android >= 5, reduce code complexity 2015-10-08 18:47:28 +02:00
Vincent Breitmoser
8f40c6df51 use only primary and mutually bound subkeys for fingerprint verification 2015-10-06 15:06:36 +02:00
Vincent Breitmoser
7619083d5c decrypt: fix broken file save 2015-10-06 14:19:28 +02:00
Dominik Schürmann
dfce5449c2 Raise min asymmetric key length for all ciphers to 2048 bit 2015-10-04 22:46:21 +02:00
Dominik Schürmann
eff59b4645 Show dialog before sharing log 2015-10-04 16:57:28 +02:00
Vincent Breitmoser
7c79902a82 Merge branch 'master' into encrypted-export 2015-10-01 17:28:43 +02:00
Vincent Breitmoser
9ba66aa2ce import: special treatment for application/pgp-keys 2015-09-30 15:17:48 +02:00
Vincent Breitmoser
43e661790d import: simplify ImportKeysActivity, don't display search bar for fixed input 2015-09-30 14:41:15 +02:00
Vincent Breitmoser
4025acd13a enc-export: use BackupActivity for backup from ViewKeyActivity 2015-09-30 14:41:14 +02:00
Dominik Schürmann
405b959fb8 No show key button for RESULT_INVALID_SIGNATURE, Cleanup 2015-09-30 12:46:26 +02:00
Dominik Schürmann
1dd61cab41 Cleanup in BaseNfcActivity 2015-09-30 12:45:30 +02:00
Dominik Schürmann
051e4b8a79 Improve NFC exception handling, fixes RuntimeExceptions 2015-09-30 12:45:21 +02:00
Dominik Schürmann
08e25747da Fix crashes with Fluffys PGP applet 2015-09-30 12:45:15 +02:00
Dominik Schürmann
1d0e9bf60a Enable YubiKey creation 2015-09-30 12:45:10 +02:00
Dominik Schürmann
2535ecb91f Full 160 bit for phrase confirm, stuffed with ones 2015-09-29 14:38:30 +02:00
Vincent Breitmoser
5b6c04cbfb enc-export: handle onSaveInstanceState, add nicer layout for landscape 2015-09-29 05:33:30 +02:00
Vincent Breitmoser
2b6335e90b enc-export: add "back" button to fail state 2015-09-29 04:03:44 +02:00
Vincent Breitmoser
91c3577073 enc-export: add comments about debug mechanisms 2015-09-29 03:37:38 +02:00
Vincent Breitmoser
b0b65abbc6 enc-export: localize snackbar strings 2015-09-29 03:35:55 +02:00
Vincent Breitmoser
4923f08152 enc-export: rename fragment to match class 2015-09-29 02:15:33 +02:00
Vincent Breitmoser
3513f4453b enc-export: implement save file as CREATE_DOCUMENT, with static fallback for pre-kitkat 2015-09-29 02:12:29 +02:00
Vincent Breitmoser
8091e3af49 enc-export: mv BackupCodeEntryFragment BackupCodeFragment 2015-09-29 02:09:26 +02:00
Vincent Breitmoser
c630fe651f use annotations for android sdk constraints 2015-09-28 18:50:20 +02:00
Vincent Breitmoser
0e613aff2e Merge remote-tracking branch 'origin/master' into encrypted-export 2015-09-28 18:27:29 +02:00
Vincent Breitmoser
b65a23f2d4 enc-export: easier mechanism to get backup code from edittexts 2015-09-28 18:05:09 +02:00
Vincent Breitmoser
97b2178a29 upload: re-add upload by bytes 2015-09-28 18:03:58 +02:00
Vincent Breitmoser
66442b9c96 enc-backup: working "save to file" 2015-09-28 04:50:21 +02:00
Vincent Breitmoser
7a9a0567ab enc-backup: working first version 2015-09-28 04:25:48 +02:00
Vincent Breitmoser
46e24058ba export: support encrypted export, first version 2015-09-28 00:03:11 +02:00
Vincent Breitmoser
dc9e068790 upload: identify key by masterKeyId only 2015-09-26 18:10:30 +02:00
Vincent Breitmoser
c93670f3c6 export: externalize upload into its own operation 2015-09-26 03:21:53 +02:00
Vincent Breitmoser
15c9fde27f enc-backup: fix copyright notices 2015-09-25 04:29:26 +02:00
Vincent Breitmoser
f30ca1e92c enc-backup: use black check icon for button, and some cleanup 2015-09-25 04:17:47 +02:00
Vincent Breitmoser
097430b3e3 enc-backup: clean up backstack after restore 2015-09-25 04:08:42 +02:00
Vincent Breitmoser
7e175ac673 enc-backup: use ValueAnimator rather than ObjectAnimator for compatibility 2015-09-25 03:59:13 +02:00