Commit Graph

1727 Commits

Author SHA1 Message Date
Dominik Schürmann
4e8c4af262 Update tab lib and fix colors of tabs 2015-02-23 00:11:06 +01:00
Dominik Schürmann
d984f50cb7 Disable default yubikey PIN by default 2015-02-22 23:55:23 +01:00
Dominik Schürmann
e20c6add43 Fix multi select and more colors 2015-02-22 23:52:29 +01:00
Dominik Schürmann
f852cb7449 Pull from transifex 2015-02-22 21:41:29 +01:00
Dominik Schürmann
df7009669b Pull from transifex 2015-02-22 21:39:34 +01:00
Dominik Schürmann
21e7102e3a Fix back button in encrypt activities 2015-02-22 21:39:20 +01:00
Dominik Schürmann
0cdd68e763 Color for holo 2015-02-22 21:30:27 +01:00
Dominik Schürmann
e583edf020 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-22 21:30:02 +01:00
Dominik Schürmann
e46fa777ab Use right colors in snackbars and logs 2015-02-22 21:28:57 +01:00
Dominik Schürmann
04740121a5 Go to keyserver settings directly 2015-02-22 21:22:25 +01:00
Dominik Schürmann
d0be3bd7ea Once again: Colors and header image 2015-02-22 21:16:40 +01:00
Dominik Schürmann
7e0e16b014 Merge pull request #1047 from steelman/dev-strings
Some Polish translated strings and some tiny cleanups
2015-02-22 10:15:28 +01:00
Łukasz Stelmach
d720ac6124 some Polish translations 2015-02-21 23:06:20 +01:00
Łukasz Stelmach
db8ee77d56 move a string in the safe slinger activity to resources 2015-02-21 22:29:09 +01:00
Dominik Schürmann
6008b65bbd show app name instead of keys in main list 2015-02-21 21:04:26 +01:00
Dominik Schürmann
32acd94698 Floating action button icons and methods for key list 2015-02-21 20:46:37 +01:00
Dominik Schürmann
5b75985f95 Status bar height fix 2015-02-21 20:01:19 +01:00
Dominik Schürmann
5b017dbf7a Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-20 11:04:18 +01:00
Dominik Schürmann
9d7e05c06e Screenshot for GSoC 2015-02-20 11:04:07 +01:00
Vincent Breitmoser
bb30cb5401 fix comments and some warnings in PgpDecryptVerify 2015-02-17 18:43:43 +01:00
Vincent Breitmoser
3efaac2175 determine correct filesize during decryption from LiteralData packet 2015-02-17 18:08:45 +01:00
Dominik Schürmann
a468c667bb Improve nav drawer drawable 2015-02-03 19:47:50 +01:00
Dominik Schürmann
e2cb1a90cd Improve nav drawer drawable 2015-02-03 19:26:40 +01:00
Dominik Schürmann
e29ea517da Fix first time wizard design 2015-02-03 19:13:02 +01:00
Dominik Schürmann
dfe92ceb24 Add FAB to key list 2015-02-03 18:51:58 +01:00
Dominik Schürmann
d6d679997b Move encrypt decrypt operations in own starter activity 2015-02-03 18:39:07 +01:00
Dominik Schürmann
9e011860c4 More toolbar fixes 2015-02-03 18:10:13 +01:00
Dominik Schürmann
b77bbb6027 App settings statusbar fix 2015-02-03 16:10:54 +01:00
Dominik Schürmann
7914aa5c08 Toolbar fixes, Toolbar under status bar on Lollipop 2015-02-03 16:05:18 +01:00
Dominik Schürmann
e2a8819385 Floating Action Button added in app settings 2015-02-03 14:28:54 +01:00
Dominik Schürmann
c763ea3503 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-02 17:19:31 +01:00
Dominik Schürmann
95e534e1f5 UI experiments for app settings 2015-02-02 17:19:27 +01:00
Vincent Breitmoser
7b24ee7b55 rewrite PgpSignEncrypt data flow
- introduce high-level SignEncryptOperation for uri to uri signing/encryption
- use SignEncryptParcel for high-level operation parameters
- use PgpSignEncryptInput plus streams for low-level operation parameters
- get rid of all sign/encrypt logic in KeychainIntentService
2015-02-01 23:14:26 +01:00
Vincent Breitmoser
0b6dc65c97 Merge remote-tracking branch 'origin/development' into development 2015-01-31 18:49:54 +01:00
Vincent Breitmoser
5466d1e980 prevent recursive consolidate 2015-01-31 18:49:00 +01:00
Dominik Schürmann
e651a39279 Rename app setting classes for consistency 2015-01-30 10:59:57 +01:00
Dominik Schürmann
464f7c6718 Fix saving of allowed keys 2015-01-30 10:47:40 +01:00
Dominik Schürmann
34b664f4b6 Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of https://github.com/ligi/open-keychain into ligi-ligi/fix/add_ability_to_compile_with_java8 2015-01-30 10:10:13 +01:00
Dominik Schürmann
38f7950d90 Saving of allowed keys 2015-01-29 21:00:58 +01:00
ligi
fcd91d881e Add explicit casting to be able to compile with java8 2015-01-29 20:30:26 +01:00
ligi
4aa6e37ac6 Use latest buildTools 2015-01-29 20:28:58 +01:00
Dominik Schürmann
d6e4936fa5 Introduce allowed keys table per API client 2015-01-29 17:46:27 +01:00
Dominik Schürmann
e0369a2f14 Header image tryout 2015-01-29 17:02:01 +01:00
Dominik Schürmann
34b01e9f2b Remove files related to old nav drawer 2015-01-29 13:36:38 +01:00
Dominik Schürmann
6a7d332606 Fix item layout in apps list 2015-01-29 13:24:08 +01:00
Dominik Schürmann
a346b58db7 Close FileDescriptors and input, output streams when possible 2015-01-29 12:44:06 +01:00
Dominik Schürmann
c4ef86b38a Refactor DecryptActivity into DecryptOverviewFragment for nav drawer 2015-01-29 12:03:00 +01:00
Dominik Schürmann
03a01dc7ae White popup theme 2015-01-29 11:03:19 +01:00
Dominik Schürmann
43930ed8f2 Move key list logic into fragment, UI fixes for nav drawer 2015-01-29 10:10:07 +01:00
Dominik Schürmann
5564f65a69 Merge remote-tracking branch 'origin/t/snackbar' into development
Conflicts:
	OpenKeychain/build.gradle
2015-01-29 09:55:09 +01:00
Dominik Schürmann
81d4d31fd7 Cloud search icon 2015-01-28 18:11:08 +01:00
Dominik Schürmann
6c6201f129 Fix cleartext signatures internally 2015-01-27 17:13:54 +01:00
Dominik Schürmann
5a1187b781 Fix nullpointer in ImportKeysActivity 2015-01-27 13:15:24 +01:00
Dominik Schürmann
ae7ba2639f Support verification of detached signatures 2015-01-27 13:00:28 +01:00
Dominik Schürmann
e8780b4410 Merge branch 'development' into detached-sigs-api
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-01-27 09:46:42 +01:00
Dominik Schürmann
e77f9a5351 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-27 09:43:45 +01:00
Dominik Schürmann
fd29d27e61 Temporary nav drawer fixes 2015-01-27 09:37:07 +01:00
Vincent Breitmoser
6c80025ead backend support for charset in ascii-armored streams 2015-01-27 09:17:23 +01:00
Dominik Schürmann
fc786280fd Fixes for detached signatures 2015-01-26 17:33:40 +01:00
Vincent Breitmoser
efe5c80b1c remove unused NonPgpPartException 2015-01-26 16:33:10 +01:00
Vincent Breitmoser
2bb7c3bcef move last parts of import logic from kis into operation 2015-01-26 16:33:10 +01:00
Dominik Schürmann
34a7728cec Merge branch 'development' into detached-sigs-api
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2015-01-26 16:30:21 +01:00
Dominik Schürmann
e049895b9f Material Design Drawer 2015-01-26 15:24:42 +01:00
Dominik Schürmann
e4e2d647c8 Material Design: Full screen dialogs 2015-01-26 00:50:35 +01:00
Vincent Breitmoser
b4781343d9 specify our usage of java 1.7 in build files 2015-01-25 12:41:03 +01:00
Vincent Breitmoser
8d9c3c0534 lift language level to java 7, and some code cleanup 2015-01-25 12:36:00 +01:00
Vincent Breitmoser
41aba69fad introduce PromoteKeyOperation to create dummy secret from public keys 2015-01-25 02:08:07 +01:00
Vincent Breitmoser
1516f951b7 work on divert-to-key and other keyring stuff
- allow modifySecretKeyRing operation without passphrase, but a only
  restricted subset of operations (ie, s2k strip/divert)
- pass byte array with serial number to key edit operation to initialize
  divert-to-card key
- update spongycastle to support serial numbers in iv for divert-to-card
2015-01-25 01:57:58 +01:00
Vincent Breitmoser
fb2fa195bf allow explicit re-certification in SaveKeyringParcel 2015-01-24 23:11:54 +01:00
Vincent Breitmoser
0e0970c347 move key stripping into ChangeSubkey, support divert-to-card 2015-01-24 23:05:50 +01:00
Vincent Breitmoser
a65edcdb2f only respect most recent signature for key flags 2015-01-19 18:31:57 +01:00
Vincent Breitmoser
e71bd3d9dd always show revoked user ids last! 2015-01-19 18:31:57 +01:00
Dominik Schürmann
3752cdd132 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-19 17:25:36 +01:00
Dominik Schürmann
3ac466c9db Disable sharing chooser blacklisting for lollipop 2015-01-19 17:22:31 +01:00
Vincent Breitmoser
198ddfeff7 use Notify helper everywhere, replace supertoasts with snackbar library 2015-01-19 15:43:35 +01:00
Vincent
491c12d5d3 No setContentView in onCreate for KeyListActivity 2015-01-16 15:41:43 +01:00
Vincent Breitmoser
b6f0fb91da show notification if KeyListActivity is spawned with an EXTRA_RESULT
Closes #1029

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
2015-01-16 13:58:34 +01:00
Dominik Schürmann
09e992081b Style tabs, add missing drawables 2015-01-15 14:48:13 +01:00
Dominik Schürmann
0c74cc7c3d Fix drawable sizes 2015-01-14 20:25:28 +01:00
Dominik Schürmann
fe25a68c6a Yubikey numkey by default to true 2015-01-14 20:19:56 +01:00
Dominik Schürmann
1516ebf26a Toolbar for settings 2015-01-14 20:18:03 +01:00
Dominik Schürmann
85b6669625 Integrate QR Code library instead of requiring the app to be installed, also due to security reasons 2015-01-14 19:14:30 +01:00
Dominik Schürmann
9b093c6d73 Increase minSdk to 15, according to stats 2015-01-14 18:59:18 +01:00
Dominik Schürmann
4ad3c24126 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-14 14:52:29 +01:00
Dominik Schürmann
f397d4f995 Reorganize folders of graphics sources 2015-01-14 14:52:23 +01:00
Vincent Breitmoser
8ef104281b fix ambiguous column name in advanced key info 2015-01-14 14:12:49 +01:00
Dominik Schürmann
b4edb88f45 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-14 14:02:58 +01:00
Dominik Schürmann
c94ef60c5d Fix SearchView 2015-01-14 14:02:51 +01:00
Vincent Breitmoser
73feaa974c small fixes to user attribute handling 2015-01-14 13:25:38 +01:00
Vincent Breitmoser
4660608887 fix log entry for addition of user attributes 2015-01-14 13:25:38 +01:00
Dominik Schürmann
99361bdcff Better way to have dark toolbar and light theme 2015-01-14 13:19:21 +01:00
Dominik Schürmann
d9e0f0a271 Fix Toolbars in decrypt activities 2015-01-14 10:35:40 +01:00
Dominik Schürmann
5517b4f8cf Launcher icon fixes 2015-01-14 02:03:20 +01:00
Dominik Schürmann
318d3eb120 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-14 00:04:10 +01:00
Vincent Breitmoser
c57355b24a actually import user attributes (though they are not shown anywhere yet) 2015-01-14 00:03:02 +01:00
Vincent Breitmoser
2b1c5358b7 make user_ids table typed, with attribute_data support
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
2015-01-14 00:02:53 +01:00
Dominik Schürmann
7da3ddae7b Refactor BaseActivity 2015-01-13 23:43:18 +01:00
Dominik Schürmann
d8ff737fc5 Use Toolbar and new BaseActivity 2015-01-13 23:15:13 +01:00
Dominik Schürmann
862d1f1971 Green 2015-01-13 22:18:40 +01:00
Dominik Schürmann
2e3545949b Start working on Material Design 2015-01-13 21:55:53 +01:00
Vincent Breitmoser
abd1211613 hack to make WrappedUserAttribute serializable
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
2015-01-13 20:42:40 +01:00
Vincent Breitmoser
84eece622b support addition of user attributes
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
	OpenKeychain/src/main/res/values/strings.xml
2015-01-13 20:41:01 +01:00
Vincent Breitmoser
50e515c6cd add support for user attributes in merge() routine 2015-01-13 20:37:26 +01:00
Dominik Schürmann
2f0eb3fbd6 Set minSdk to 14 2015-01-13 19:05:26 +01:00
Vincent Breitmoser
fc85ef71a8 remove LinkedIdentity (committed earlier by accident) 2015-01-13 00:10:59 +01:00
Vincent Breitmoser
fc3397de5d add support for user attributes (during canonicalization) 2015-01-12 20:08:35 +01:00
Dominik Schürmann
3e74405f3c Merge pull request #1023 from adithyaphilip/development
Issue #954 - fixed crash when file scheme is passed, broadened deletion scope
2015-01-12 11:03:42 +01:00
Abraham Philip
16f924eef3 fixed crash when file scheme is passed, broadened deletion scope 2015-01-09 05:07:50 +05:30
Dominik Schürmann
a87a45aa9a No output stream for detached signatures, makes no sense to pipe it through 2015-01-08 14:57:09 +01:00
Dominik Schürmann
1c4b8c193d Experimental API support for detached signatures (not tested) 2015-01-08 14:48:13 +01:00
Dominik Schürmann
6570483fab Test new icon 2015-01-07 14:10:12 +01:00
Dominik Schürmann
816b1bb8c8 OpenPGP instead of PGP 2015-01-07 13:45:28 +01:00
Dominik Schürmann
443fbaff17 PIn not pin passphrase 2015-01-07 13:29:56 +01:00
Dominik Schürmann
c4ee00bd39 OpenPGP not PGP 2015-01-07 00:01:57 +01:00
Dominik Schürmann
6ec85b0550 Clearup after lockpattern experiments 2015-01-06 19:29:51 +01:00
Dominik Schürmann
af762a65a0 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-06 14:52:12 +01:00
Dominik Schürmann
e34ad18ed2 Passphrase wizard tests 2015-01-06 14:52:07 +01:00
Vincent Breitmoser
07251f35ae minor stuff 2015-01-03 23:01:57 +01:00
Vincent Breitmoser
47ace7cea3 make certify routines more robust (#1016) 2015-01-03 22:14:12 +01:00
Vincent Breitmoser
2192a6badd add more descriptive string about non-mdc encrypted data 2015-01-03 21:07:33 +01:00
Vincent Breitmoser
320f7d35ef encapsulate high level edit key into new operation class 2015-01-03 13:55:15 +01:00
Vincent Breitmoser
5057ea1744 deal with non-existent user ids during import (#994) 2015-01-02 14:28:03 +01:00
Vincent Breitmoser
920fbdfb42 throw exception if no data is found in getGenericData 2015-01-02 02:24:11 +01:00
Vincent Breitmoser
56f2a3137b get rid of RuntimeException control flow in UncachedKeyRing.fromStream 2015-01-02 02:05:12 +01:00
Vincent Breitmoser
b52fb90380 fix and test for bad certificate version numbers (#1012)
closes #1012
2015-01-02 01:58:16 +01:00
Vincent Breitmoser
7223abcf0c extend canonicalize to strip local certificates on export 2015-01-02 00:07:05 +01:00
Vincent Breitmoser
1c1ae769ef small improvements regarding pin tests and logging 2015-01-01 21:13:07 +01:00
Vincent Breitmoser
2d38079574 add empty notation data packet only if necessary 2015-01-01 20:46:39 +01:00
Vincent Breitmoser
5e9d8ca8c6 tests: add multi key encryption/decryption test, new way for fake passphrase cache 2015-01-01 20:21:32 +01:00
Vincent Breitmoser
71c53f13ec fix small merge conflict oversight 2014-12-30 16:24:20 +01:00
Vincent Breitmoser
9e663237b6 Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/res/values/strings.xml
2014-12-30 13:09:27 +01:00
Vincent Breitmoser
2223cdd405 some small notation data fixes 2014-12-30 13:07:56 +01:00
Vincent Breitmoser
438405d3d2 add PIN as a SecretKeyType 2014-12-30 12:34:24 +01:00
Vincent Breitmoser
7524881a01 fix unit tests for ChangeUnlockParcel 2014-12-30 12:02:37 +01:00
Vincent Breitmoser
c7b0b650c1 introduce handling of notation direct key signatures, and experimental pin notation packet 2014-12-30 00:44:12 +01:00
Dominik Schürmann
ccde6add70 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-12-29 23:17:01 +01:00
Dominik Schürmann
610c4780f1 New work on PIN and lock pattern UI 2014-12-29 23:16:54 +01:00
Vincent Breitmoser
576e6fd0cc introduce new ChangeUnlockParcel packet for extended passphrase changing capabilities 2014-12-29 23:12:11 +01:00
Dominik Schürmann
320f825878 Add android-lockpattern library 2014-12-29 23:10:50 +01:00
Dominik Schürmann
a86abe04cd Allow for creation date to be in the future up to one day to account for diverging clocks on different systems for fresh keys 2014-12-28 20:57:03 +01:00
Dominik Schürmann
7dbf0abf7b Fix crash on first time wizard 2014-12-28 19:06:17 +01:00
Dominik Schürmann
5c54ab1a0d Merge branch 'development' into keybase-proofs 2014-12-05 15:51:15 +01:00
Dominik Schürmann
26341a325b Update target and support libs to SDK 21, fixing compile issues 2014-12-04 22:48:40 +01:00
Dominik Schürmann
6b9749289f Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-12-04 19:44:27 +01:00
Dominik Schürmann
389d191448 Merge branch 'master' into development 2014-12-04 19:43:41 +01:00
Dominik Schürmann
450ac161b9 Set version to 3.2beta1 2014-12-04 19:26:10 +01:00
cketti
aa8b3db139 Fix spelling of 'K-9 Mail' in FAQ 2014-11-26 04:40:58 +01:00
Tim Bray
2a608c12ca Check fingerprint match between proof & database 2014-11-22 09:27:28 -08:00
Tim Bray
734a085f0d Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
2014-11-21 19:45:35 -08:00
Tim Bray
e72c082acd Add check that proof & database fingerprints are the same 2014-11-21 19:44:05 -08:00