cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,105 Commits 1 Branch 0 Tags
7c79902a82602ff4e25b03e1232faa1a1768ba16
Commit Graph

640 Commits

Author SHA1 Message Date
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
4025acd13a enc-export: use BackupActivity for backup from ViewKeyActivity 2015-09-30 14:41:14 +02:00
Dominik Schürmann
051e4b8a79 Improve NFC exception handling, fixes RuntimeExceptions 2015-09-30 12:45:21 +02:00
Vincent Breitmoser
2b6335e90b enc-export: add "back" button to fail state 2015-09-29 04:03:44 +02:00
Vincent Breitmoser
b0b65abbc6 enc-export: localize snackbar strings 2015-09-29 03:35:55 +02:00
Vincent Breitmoser
cca7ee80c5 enc-export: transifex compat 2015-09-29 03:27:21 +02:00
Vincent Breitmoser
bc09d290f8 enc-export: localization, and layout compatibility 2015-09-29 03:25:36 +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
0e613aff2e Merge remote-tracking branch 'origin/master' into encrypted-export 2015-09-28 18:27:29 +02:00
Vincent Breitmoser
676a863b14 export: more cleanup and splitting into subroutines 2015-09-26 03:39:52 +02:00
Dominik Schürmann
29e9b2fa1e Dont import more than 100 User IDs (OKC-01-002) 2015-09-25 01:38:43 +02:00
Dominik Schürmann
63f1b84914 Remove save support for Android < 4.4 (OKC-01-014) 2015-09-24 22:57:11 +02:00
Dominik Schürmann
688c5f545b Fix genitiv in strings 2015-09-24 18:40:04 +02:00
Dominik Schürmann
74281d6203 Confirm design 2015-09-24 18:30:14 +02:00
Dominik Schürmann
fd80d48f50 phrase confirmation 2015-09-24 14:11:20 +02:00
Dominik Schürmann
0b181743a3 Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on add (OKC-01-018) 2015-09-20 22:42:50 +02:00
Vincent Breitmoser
d94ebb2269 encrypted export WIP 2015-09-19 15:29:44 +02:00
Vincent Breitmoser
e7185bd1b8 fix fallback for non-mime data 2015-09-19 15:27:04 +02:00
Vincent Breitmoser
8ad31e3251 mime: skip trailing unsigned parts, and ignore nested signed data 2015-09-17 22:13:20 +02:00
Vincent Breitmoser
955a1f4b26 mime: support for signed-then-encrypted format 2015-09-17 21:51:11 +02:00
Vincent Breitmoser
fdb1a7384e multidcrypt: display k9 download only after decryption failure 2015-09-17 19:48:51 +02:00
Vincent Breitmoser
142a71480e Merge branch 'mime4j' of github.com:open-keychain/open-keychain into mime4j 2015-09-17 13:45:32 +02:00
Vincent Breitmoser
7da80c84b7 multidecrypt: use chooser intent on click for everything but text/plain ACTION_SHOW 2015-09-17 13:45:09 +02:00
Dominik Schürmann
acbb857f24 Add K-9 Mail warning toast 2015-09-17 10:16:59 +02:00
Vincent Breitmoser
d5bde6997e fail with warning if we get data from the AOSP mail client (see #290) 2015-09-16 21:03:49 +02:00
Vincent Breitmoser
76465fc687 mime: add failure case if openpgp processing fails! 2015-09-16 20:48:46 +02:00
Vincent Breitmoser
01038d6a26 mime: add logging messages 2015-09-16 20:45:12 +02:00
Vincent Breitmoser
93421e902c mime: handle non-mime data, just pass it through 2015-09-16 20:36:06 +02:00
Vincent Breitmoser
326834fd58 mime: add logging to InputDataOperation 2015-09-15 23:06:15 +02:00
Vincent Breitmoser
3814ae7d53 Merge branch 'master' into mime4j 
Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
	OpenKeychain/src/main/res/values/strings.xml
 2015-09-14 16:21:04 +02:00
Vincent Breitmoser
fd6141f0d2 add share item to decrypt file list (#1524) 2015-09-11 04:51:55 +02:00
Vincent Breitmoser
cdf67c3296 share rather than save log files (OKC-01-015) 2015-09-11 03:08:53 +02:00
Vincent Breitmoser
b76aa7fe11 never import secret keys from keyserver (OKC-01-001) 2015-09-11 02:05:17 +02:00
Vincent Breitmoser
9d97d37c06 perform fingerprint check after canonicalization (OKC-01-009) 2015-09-11 01:57:17 +02:00
Vincent Breitmoser
b78954fc16 add support for signed-only data in the backend (#1507) 2015-09-10 21:44:15 +02:00
Vincent Breitmoser
c6f1f505bb linked: ditch create dns fragment (for now) 2015-09-10 12:17:25 +02:00
Vincent Breitmoser
178aea6b90 linked: localization for github creation 2015-09-10 11:46:31 +02:00
Vincent Breitmoser
60e9141b86 linked: basic shared element transition 2015-09-06 00:49:19 +02:00
Vincent Breitmoser
2cda486427 linked: use webview instead of app, and some minor layoutings 2015-09-02 04:14:45 +02:00
Vincent Breitmoser
b52a0303ca linked: redesign github resource creation, implement ouath flow (WIP) 2015-09-01 06:42:10 +02:00
Vincent Breitmoser
261c83043b linked: Github -> GitHub (fixes #1513) 2015-08-31 14:24:13 +02:00
Vincent Breitmoser
36f8e9f563 linked: fix small typo 2015-08-31 13:48:40 +02:00
Dominik Schürmann
bff302f808 Show linked identity menu item and linked identities only when feature is enabled 2015-08-29 17:27:04 +02:00
Dominik Schürmann
feef4a93ab Reword experimental settings 2015-08-29 17:19:58 +02:00
Vincent Breitmoser
e037b78248 Merge remote-tracking branch 'origin/master' 2015-08-29 13:29:51 +02:00
Vincent Breitmoser
a6e25e6448 Merge branch 'linked-identities' (and fix OperationHelper ids) 
Merge Linked Identities.

Also includes an important fix for OperationHelper ids, which had an
error in the bit mask logic.

Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
	OpenKeychain/src/main/res/anim/fade_in.xml
	OpenKeychain/src/main/res/anim/fade_out.xml
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
	OpenKeychain/src/main/res/layout/view_key_fragment.xml
	OpenKeychain/src/main/res/menu/key_view.xml
	OpenKeychain/src/main/res/values/strings.xml
	OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	README.md
 2015-08-29 13:28:56 +02:00
Dominik Schürmann
3c25dc2b0c Improve decrypt strings 2015-08-28 17:47:56 +02:00
Dominik Schürmann
765ec094c9 Make keybase an experimental feature 2015-08-28 15:18:11 +02:00
Dominik Schürmann
0aaa93ac04 Dont show FAB for expired, revoked keys 2015-08-28 11:50:13 +02:00