moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-15 05:15:03 -05:00
Code Issues Releases Wiki Activity
4,251 Commits 12 Branches 24 Tags 116 MiB
ef209450c6
Commit Graph

2206 Commits

Author SHA1 Message Date
Dominik Schürmann
84e5ac4b03 Remove supertoast dependency 2015-03-02 16:25:12 +01:00
Dominik Schürmann
505140ef2a Use SDK and build tools versions from root project 2015-03-02 16:21:51 +01:00
Dominik Schürmann
69865a6d57 Use index constants in ContactHelper 2015-03-02 15:44:34 +01:00
Adithya Abraham Philip
e69ee812d2 supports sub logs in log export 2015-03-01 11:31:46 +05:30
Adithya Abraham Philip
95e9e2ac30 added logging, notify for log export 2015-03-01 02:02:39 +05:30
Vincent Breitmoser
4e29d027af fix a couple lint errors 2015-02-28 17:49:09 +01:00
Adithya Abraham Philip
6a26ea908e Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-02-28 21:57:49 +05:30
Vincent Breitmoser
0557e0680e some changes to qr scan logic 2015-02-28 15:58:26 +01:00
Adithya Abraham Philip
94114e35c2 Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-02-28 14:29:20 +05:30
Vincent Breitmoser
2ae4d6ce05 pass through messenger to certify service from ViewKeyActivity 
the idea here is to handle progress and result of the CertifyActivity
directly in ViewKeyActivity by passing a messenger through to it. this
allows smoother transition from an uncertified to certified state.
 2015-02-28 04:34:08 +01:00
Vincent Breitmoser
f3710b12f6 fab support for all notify types 2015-02-28 02:30:59 +01:00
Vincent Breitmoser
e4d91de8d2 small Notify cleanup 2015-02-28 01:37:57 +01:00
Vincent Breitmoser
6ba03c0f13 clean up warnings in KeyListFragment 2015-02-28 01:32:15 +01:00
Vincent Breitmoser
cc5b0dae06 collapse fab on action selected 
closes #1057
 2015-02-28 01:31:24 +01:00
Vincent Breitmoser
d64b8f47d1 animate FAB to move up and down when a snackbar appears 2015-02-28 01:17:53 +01:00
Dominik Schürmann
c8f5dc5cf3 Strings: File size 2015-02-28 00:56:04 +01:00
Dominik Schürmann
cec7cb3620 Fix strings based on transifex reports 2015-02-28 00:51:58 +01:00
Vincent Breitmoser
67093ccba2 forgot to commit FabContainer 2015-02-28 00:40:11 +01:00
Dominik Schürmann
fd55cdb08e Merge branch 'development' of github.com:open-keychain/open-keychain into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
 2015-02-28 00:39:18 +01:00
Dominik Schürmann
453b67f7a8 Update from transifex 2015-02-28 00:38:53 +01:00
Vincent Breitmoser
9c62c3fd39 control flow for moving the fab up with snackbar 2015-02-28 00:28:20 +01:00
Dominik Schürmann
0669193e75 Simplify MainActivity 2015-02-28 00:22:31 +01:00
Dominik Schürmann
1c91be84af Upload new keys to keyserver by default 2015-02-28 00:11:34 +01:00
Dominik Schürmann
0b49becaa8 padding fixes for key list 2015-02-28 00:04:15 +01:00
Dominik Schürmann
dc38031b4e Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-27 23:57:00 +01:00
Dominik Schürmann
582caaba97 Reorder advanced key view 2015-02-27 23:56:53 +01:00
Vincent Breitmoser
c46fdef203 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-27 23:53:14 +01:00
Vincent Breitmoser
8cfba4c0fb slightly longer color fade duration 2015-02-27 23:52:51 +01:00
Dominik Schürmann
f2a9a41840 Enable multi line snackbar option 2015-02-27 23:47:15 +01:00
Dominik Schürmann
200d4a6bb6 Remove swipte to refresh src, fix padding in key list 2015-02-27 23:39:36 +01:00
Dominik Schürmann
b1c8fa3471 Fix keyboard overlay bug on top of edittexts 2015-02-27 23:24:04 +01:00
Vincent Breitmoser
aec9bdfc1e transition status color in key view 2015-02-27 23:10:02 +01:00
Vincent Breitmoser
863f4e6ac1 hand through result in CertifyFingerprintActivity 2015-02-27 23:09:17 +01:00
Dominik Schürmann
5b1d834f91 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-27 22:47:43 +01:00
Dominik Schürmann
fd2f858b12 Fix status images in user id adapter 2015-02-27 22:47:39 +01:00
Vincent Breitmoser
80c159056d show refresh key progress inline 2015-02-27 22:46:48 +01:00
Dominik Schürmann
fe31883f66 Keybase header text 2015-02-27 22:40:52 +01:00
Dominik Schürmann
54e04f496e Better qr code resizing 2015-02-27 22:26:11 +01:00
Adithya Abraham Philip
23cbd786ea cleaned up log export 2015-02-28 02:11:39 +05:30
Adithya Abraham Philip
960a163185 Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-02-28 01:30:41 +05:30
Adithya Abraham Philip
d776bd2888 refined log output 2015-02-28 01:30:17 +05:30
Vincent Breitmoser
2cd7be6373 go to directly to certify screen after nfc import 2015-02-27 18:05:36 +01:00
Dominik Schürmann
ea4ca9e686 Prettify qr code cleanup 2015-02-27 01:47:06 +01:00
Dominik Schürmann
11c3436454 Prettify qr code in advanced key view 2015-02-27 01:44:40 +01:00
Dominik Schürmann
4ccd9f9bb1 Uncluttering advanced key view 2015-02-27 01:38:57 +01:00
Dominik Schürmann
b90335f901 Simplify delete key dialog 2015-02-27 01:30:32 +01:00
Dominik Schürmann
8230fb1179 Remove unused BadImportKeyDialogFragment 2015-02-27 01:26:26 +01:00
Dominik Schürmann
6bd4e1e5b3 Fix margins of dialog views 2015-02-27 01:26:04 +01:00
Dominik Schürmann
6dce7c88d8 Merge keybase-proof branch 2015-02-27 01:18:18 +01:00
Vincent Breitmoser
4ff8eca292 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-26 18:54:00 +01:00
Vincent Breitmoser
55dd6526a6 split up and mark unsafe expiry-related methods 2015-02-26 18:53:42 +01:00
Vincent Breitmoser
e5bb7a35b5 save revocation instead of self-cert for revoked uids 2015-02-26 18:53:16 +01:00
Vincent Breitmoser
d7888d4666 ignore revoked user ids for primary key expiry 2015-02-26 18:52:54 +01:00
Adithya Abraham Philip
99ff9d2340 merged dialog 2015-02-26 22:26:40 +05:30
Dominik Schürmann
1210a80a96 Remove old Holo design resources 2015-02-26 17:37:28 +01:00
Dominik Schürmann
93109985e7 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-26 17:32:28 +01:00
Dominik Schürmann
4c4782bd5e Hopefully fixes drop down icon for spinners on Android lower 5 2015-02-26 17:32:08 +01:00
Adithya Abraham Philip
ec353b0c39 initial Log Display function 2015-02-26 21:58:25 +05:30
Vincent Breitmoser
ad8209bd94 pre-select certification key if only one is available 2015-02-26 10:48:17 +01:00
Dominik Schürmann
72acaaa41f Fingerprint verification, design fixes for qr code card 2015-02-26 02:06:57 +01:00
Dominik Schürmann
a38f84a401 Dont show verification icons in my key view, hide edit button for non-secret keys 2015-02-25 21:53:46 +01:00
Dominik Schürmann
b521162ef0 Invoke NFC button 2015-02-25 20:50:34 +01:00
Dominik Schürmann
0931c7742b Other icon for key exchange 2015-02-25 20:20:39 +01:00
Dominik Schürmann
57fa702cbf Design fixes for header, QR Code shared element transitions 2015-02-25 19:38:13 +01:00
Dominik Schürmann
27263edda5 CardView and more header design 2015-02-25 18:37:31 +01:00
Dominik Schürmann
4ea59f79cc Use material icon for safeslinger 2015-02-25 15:18:00 +01:00
Dominik Schürmann
8ddca4f8fe Fix menu 2015-02-25 13:49:54 +01:00
Dominik Schürmann
fa92ceeae3 Toolbar: qr code in header, cleanup of fragment 2015-02-25 13:49:21 +01:00
Dominik Schürmann
430ba2f777 Bigger status icon in key view 2015-02-25 11:29:46 +01:00
Dominik Schürmann
56d38dd68b First work on new key view toolbar 2015-02-25 02:35:09 +01:00
Dominik Schürmann
2b609b8144 Fix QR Code, design experiments for key view 2015-02-24 13:43:24 +01:00
Dominik Schürmann
17a6003edd Remove tabs in view key 2015-02-24 11:25:19 +01:00
Dominik Schürmann
52bcfd71ad New advanced key view 2015-02-23 23:03:45 +01:00
Dominik Schürmann
29628e54ec Refactor AppsListFragment 2015-02-23 21:55:44 +01:00
Dominik Schürmann
2064d81aef Refactor AppsListFragment 2015-02-23 21:52:04 +01:00
Dominik Schürmann
dd3af50956 Uncluttering App Settings: Move advanced info in dialog 2015-02-23 10:36:39 +01:00
Dominik Schürmann
4c7622e257 Remove unused FixedDrawerLayout 2015-02-23 00:30:02 +01:00
Dominik Schürmann
7bddd5be1d Remove old pattern lib, add new pattern lib 2015-02-23 00:28:26 +01:00
Dominik Schürmann
6b57afc350 Removed submodule android-lockpattern 2015-02-23 00:17:27 +01:00
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
Dominik Schürmann
9c133d343f fix signature check 2014-11-22 02:55:42 +01:00
Dominik Schürmann
bbbc45e4e9 Dont accept signatures by expired or revoked subkeys 2014-11-22 00:29:14 +01:00
Dominik Schürmann
fd60d49d26 Use master key id for keybase proof verification 2014-11-22 00:10:15 +01:00
Dominik Schürmann
47caad3edb Merge branch 'development' into keybase-proofs 2014-11-21 23:55:17 +01:00
Dominik Schürmann
a805069c59 more cleanup 2014-11-21 23:55:04 +01:00
Dominik Schürmann
dd65d10406 NFC activity design 2014-11-21 13:31:43 +01:00
Dominik Schürmann
fc32f5f9d4 Minor code cleanup 2014-11-21 12:41:39 +01:00
Tim Bray
629d83a1ce Merge branch 'keybase-proofs' of https://github.com/open-keychain/open-keychain into keybase-proofs 2014-11-19 14:37:06 -08:00
Tim Bray
b5cdeb7f5a Prevent multiple cloud-trust-search launches. Handle DNS query failure gracefully. Fixes #1007 & #1008. 2014-11-19 14:35:05 -08:00
Dominik Schürmann
1c0f994d08 Merge branch 'keybase-proofs' of github.com:open-keychain/open-keychain into keybase-proofs 2014-11-19 22:22:18 +01:00
Tim Bray
0f59e6bd95 In the ImportKeysList display, arrange for Keybase UserIDs to sort below the rest. Also mention Keybase stuff other than Twitter/GitHub/Website 2014-11-18 22:12:50 -08:00
Dominik Schürmann
6691f5118a Version 3.2beta1 2014-11-18 19:04:16 +01:00
Tim Bray
36bac67dd5 All keybase proofs now in place 2014-11-11 18:45:36 -08:00
Tim Bray
3c19e6cfc1 Fix a no-result corner case, and make verifications clickable 2014-11-07 21:07:10 -08:00
Tim Bray
4929e346a2 XML fragment for proof listing 2014-11-07 12:29:17 -08:00
Tim Bray
c05441667e Moved from WebView to Spannables, some proof cleanup too 2014-11-07 12:28:27 -08:00
Dominik Schürmann
9de76bb903 Version 3.1.2 2014-11-02 17:54:33 +01:00
Dominik Schürmann
f3da3b31e5 Pull from transifex 2014-11-02 17:54:10 +01:00
Dominik Schürmann
602930d929 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-11-02 17:50:38 +01:00
Dominik Schürmann
9dc8c0d506 Changelog 2014-11-02 17:50:31 +01:00
Vincent Breitmoser
1886dd1790 export secret and public keys in separate armored blocks 2014-10-31 18:18:09 +01:00
Vincent Breitmoser
8720a21106 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-30 19:48:27 +01:00
Vincent Breitmoser
7017527999 forgot a thing for secret key export 2014-10-30 15:14:44 +01:00
Dominik Schürmann
f10ec91380 Version 3.1.1 2014-10-30 12:54:17 +01:00
Dominik Schürmann
148c9a5c62 Revert "Version 3.1.1" 
This reverts commit 8461f953f6.
 2014-10-30 12:54:01 +01:00
Dominik Schürmann
8461f953f6 Version 3.1.1 2014-10-30 12:53:21 +01:00
Dominik Schürmann
f4d0e5250b Pull from transifex 2014-10-30 12:52:33 +01:00
Dominik Schürmann
26a4cf2a56 Changelog 3.1.1 2014-10-30 12:48:06 +01:00
Dominik Schürmann
18255e331b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-30 12:44:13 +01:00
Dominik Schürmann
30c3021fea Always use INTEGER instead of BOOLEAN in database to avoid confusion 2014-10-29 23:41:10 +01:00
Vincent Breitmoser
a221464f38 Fix to preselect certification key if only one is available 
Closes #981
 2014-10-29 22:47:34 +01:00
Vincent Breitmoser
8b53bed6c0 remove unused ExchangeKeySpinner class 2014-10-29 22:45:49 +01:00
Vincent Breitmoser
e1285eec7b Close stream on key export to avoid partial write (see #986) 2014-10-29 22:39:38 +01:00
Vincent Breitmoser
727783dd00 retrofit getBlob method of matrixcursor for android 2.3 2014-10-27 17:36:53 +01:00
Dominik Schürmann
3e601431ea Version 3.1 2014-10-26 23:32:57 +01:00
Dominik Schürmann
e02b2ab30c Pull from transifex 2014-10-26 23:32:34 +01:00
Dominik Schürmann
5f20abdb26 Pull from transifex 2014-10-26 23:23:30 +01:00
Dominik Schürmann
893a4620c1 Changelog 3.1 2014-10-26 23:15:46 +01:00
Dominik Schürmann
e1b0908290 Fix crash with NotFoundException 2014-10-26 22:49:34 +01:00
Dominik Schürmann
1e5797387a Rename multi certify files to certify 2014-10-26 22:41:40 +01:00
Dominik Schürmann
be31815ee8 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 22:38:35 +01:00
Dominik Schürmann
fa73362a9f Fix notify after certify 2014-10-26 22:38:30 +01:00
Vincent Breitmoser
84b234af37 Display error on certification attempt with yubikey 
Closes #978
 2014-10-26 22:29:47 +01:00
Vincent Breitmoser
ce58eb4b03 disable cancel button instead of hiding it on cancel prevention 2014-10-26 22:26:05 +01:00
Vincent Breitmoser
5ce89c4af8 fix consolidate if no secret key are present 2014-10-26 22:20:44 +01:00
Vincent Breitmoser
35c80ed429 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 22:01:00 +01:00
Vincent Breitmoser
082722a3cf prevent cancel dring consolidate, move logic into progressable 2014-10-26 22:00:57 +01:00
Dominik Schürmann
4aed570ee3 3.1beta1 2014-10-26 05:28:57 +01:00
Vincent Breitmoser
b8ed54bc69 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 05:25:54 +01:00
Vincent Breitmoser
84a57411a5 add descriptive text to safeslinger activity 2014-10-26 02:12:29 +01:00
Dominik Schürmann
aaa4753503 Fix decrypt intent api 2014-10-26 02:00:52 +01:00
Dominik Schürmann
dd007e9664 Hide keyboard in safe slinger activity 2014-10-26 02:36:57 +02:00
Dominik Schürmann
3325ff57a7 Use new safe slinger activity from share tab 2014-10-26 02:34:51 +02:00
Dominik Schürmann
4631f45ed7 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 02:17:26 +02:00
Dominik Schürmann
be3e6ae6ef Move advanced info into own activity 2014-10-26 02:16:39 +02:00
Vincent Breitmoser
d6b9fc27b7 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 01:54:12 +02:00
Vincent Breitmoser
510ef40f55 implement upload of keyring after certification, check that option by default 2014-10-26 01:50:48 +02:00
Dominik Schürmann
97baa0e52f Keyboard tests 2014-10-26 01:09:35 +02:00
Dominik Schürmann
825baeee1b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 00:38:31 +02:00
Dominik Schürmann
8257e450f9 Fixes from transifex 2014-10-26 00:38:25 +02:00
Vincent Breitmoser
fb7264d7fd Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 00:34:19 +02:00
Dominik Schürmann
f51aebf52d Move some multi select items in overflow menu, rename import 2014-10-26 00:30:10 +02:00
Vincent Breitmoser
33738b1f52 Retry canonicalization with pubkey self certs if first attempt failed 
Fixes #974
 2014-10-26 00:26:13 +02:00
Dominik Schürmann
94693efbe5 Fail on unknown key ids on API, Key item design consistency for API 2014-10-26 00:19:14 +02:00
Dominik Schürmann
e4391c282d Fix layout of select key adapter 2014-10-26 00:15:35 +02:00
Dominik Schürmann
74bac3ea36 Remove empty layout 2014-10-25 23:36:48 +02:00
Dominik Schürmann
94e7bbb67b Remove PassphraseDialogFragment 2014-10-25 22:56:27 +02:00
Dominik Schürmann
ad60ec2d00 Remove old certify activity 2014-10-25 22:55:16 +02:00
Dominik Schürmann
c1ef9ed149 Use passphrase dialog activity instead of passphrase dialog 2014-10-25 22:53:35 +02:00
Dominik Schürmann
1099382250 Remove old exception handling code from loaders 2014-10-25 22:31:28 +02:00
Dominik Schürmann
8dddc82f69 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 22:25:14 +02:00
Dominik Schürmann
4f37c88ea7 Fix color in import list 2014-10-25 22:25:11 +02:00
Vincent Breitmoser
b9c0504465 remove unnecessary (and buggy) BufferedInputStream wrapping 2014-10-25 22:20:55 +02:00
Dominik Schürmann
c2e7c2416f Remove tabs from import keys activity 2014-10-25 22:05:55 +02:00
Dominik Schürmann
71e3fb5380 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 21:15:12 +02:00
Dominik Schürmann
0abfff0b0e Fixes and icons for apps list, also add Password Store 2014-10-25 21:15:05 +02:00
Vincent Breitmoser
26bd847c32 shorter certification explanation 2014-10-25 03:18:54 +02:00
Vincent Breitmoser
ce4b8edaab more rewording 2014-10-25 03:18:54 +02:00
Dominik Schürmann
d3e0e823e3 Fix result passing 2014-10-25 03:06:39 +02:00
Dominik Schürmann
e11df08ea1 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 02:57:42 +02:00
Dominik Schürmann
339b283df5 Safeslinger fixesÄ 2014-10-25 02:57:33 +02:00
Vincent Breitmoser
748049fb5b slightly change wording in merge logs 2014-10-25 02:50:48 +02:00
Vincent Breitmoser
c5028dc9ce Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 02:49:37 +02:00
Vincent Breitmoser
30d0afa363 change the way merging is logged 2014-10-25 02:45:16 +02:00
Dominik Schürmann
49b237d609 Fix safe slinger button 2014-10-25 02:42:13 +02:00
Dominik Schürmann
418f0970ab Fix safe slinger button 2014-10-25 02:41:20 +02:00
Dominik Schürmann
57a26a6cb3 Use selected number of users in safe slinger 2014-10-25 02:39:48 +02:00
Dominik Schürmann
e332c664cf Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 02:38:09 +02:00
Dominik Schürmann
33b54ab03e Safe slinger activity preps 2014-10-25 02:38:06 +02:00
Vincent Breitmoser
7c4bbc83cb change indentation of import logs 2014-10-25 02:25:39 +02:00
Vincent Breitmoser
059c058040 set padding for sublog entries 2014-10-25 02:25:28 +02:00
Vincent Breitmoser
ba724353e5 more work on import logging 2014-10-25 02:13:02 +02:00
Vincent Breitmoser
478b2a4d8b add logging to import and change order of import, keyservers first 2014-10-25 01:59:15 +02:00
Dominik Schürmann
1cbedb60d6 Qr code button text 2014-10-24 00:44:26 +02:00
Dominik Schürmann
b1c164bde0 remove space in on large devices in layouts where no drawer nav is shown 2014-10-24 00:39:33 +02:00
Dominik Schürmann
9447f8fdf9 Fix import from cloud 2014-10-24 00:30:58 +02:00
Dominik Schürmann
bfc3774f02 Merge pull request #973 from timbray/development 
Make the Certify screen a little more self-explanatory
 2014-10-24 00:23:40 +02:00
Dominik Schürmann
efa5a80eb6 Merge branch 'development' of github.com:open-keychain/open-keychain into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
 2014-10-23 23:33:50 +02:00
Dominik Schürmann
1624cd8349 Start safe slinger activity 2014-10-23 23:31:50 +02:00
Vincent Breitmoser
76a1e99d7e Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-23 23:31:28 +02:00
Vincent Breitmoser
214b60cd00 integrate download from keyserver into key import operation 2014-10-23 23:29:40 +02:00
Dominik Schürmann
e494beb58a Externalize QR Code scanning and import into its own activity for better code separation 2014-10-23 17:13:49 +02:00
Dominik Schürmann
ecfa2288eb Fix crash on Android 5 2014-10-22 23:28:13 +02:00
Tim Bray
d4fb71cb76 reword sync message 2014-10-22 08:19:13 -07:00
Tim Bray
0516b80c07 Make the Certify screen a little more self-explanatory 2014-10-21 11:35:03 -07:00
Dominik Schürmann
f4f16e62a2 consistency for import UI 2014-10-16 14:47:36 +02:00
Dominik Schürmann
d09d4296da Silently fail on import on key import with ArrayIndexOutOfBoundsException 2014-10-16 13:36:21 +02:00
Dominik Schürmann
81935fe99b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-15 23:22:12 +02:00
Dominik Schürmann
0cdcc90984 More consisitency 2014-10-15 23:22:08 +02:00
Dominik Schürmann
4e1053c6fa More color/icon consistency 2014-10-15 23:05:29 +02:00
Vincent Breitmoser
b6c7231a7f some cleanup and documentation of *Operation classes 2014-10-15 16:57:23 +02:00
Dominik Schürmann
be9b483ee8 color experiments 2014-10-15 12:48:54 +02:00
Vincent Breitmoser
c7e2b8424e Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-14 16:35:56 +02:00
Vincent Breitmoser
7af0219857 fix test for new PgpDecryptVerify 2014-10-14 16:35:48 +02:00
Vincent Breitmoser
e58ba0f4bb fix export performance problems 2014-10-14 14:19:54 +02:00
Dominik Schürmann
dc87557805 Group passphrase cache settings 2014-10-13 19:34:41 +02:00
Dominik Schürmann
85d4bcca52 Register application/pgp-message for encrypted pgp data, more comments in Manifest 2014-10-13 19:17:23 +02:00
Vincent Breitmoser
40850b933b actually remove filter spinner code. that's what git is for~ 2014-10-13 16:43:17 +02:00
Dominik Schürmann
e9abe57aa7 Remove key list filter for now 2014-10-13 15:53:39 +02:00
Vincent Breitmoser
bfafc44a33 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-13 15:03:49 +02:00
Vincent Breitmoser
d7d2ce7652 fix syntax typo in androidmanifest 2014-10-13 15:03:26 +02:00
Vincent Breitmoser
ee4d911baf make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperation 2014-10-13 15:02:42 +02:00
Vincent Breitmoser
e5c7d8dcd1 forgot to remove AddKeysActivity in androidmanifest 2014-10-13 15:01:44 +02:00
Vincent Breitmoser
aec61fd174 remove DELETE_FILE_SECURELY 
closes #961
 2014-10-13 14:55:54 +02:00
Dominik Schürmann
b86d235177 wording 2014-10-13 14:44:23 +02:00
Dominik Schürmann
5219cf5207 Better qr code icon 2014-10-13 14:38:25 +02:00
Jerzy Kołosowski
13ed3bbd8a Added option for num keypad for YubiKey 2014-10-13 04:47:48 +02:00
Vincent Breitmoser
7ff526724b forgot committing ExportResult class 2014-10-13 01:19:35 +02:00
Vincent Breitmoser
6de52a431a remove outdated AddKeysActivity 2014-10-13 00:36:50 +02:00
Vincent Breitmoser
815ed2e233 rewrite export with new operation style 2014-10-13 00:26:59 +02:00
Vincent Breitmoser
b47412eb1e CertifyOperation is not a Pgp- operation 2014-10-12 19:22:34 +02:00
Vincent Breitmoser
93aefaca8e fix logging in consolidate, part 2 2014-10-11 20:04:45 +02:00
Vincent Breitmoser
5453a3e5af DeleteResult: add custom createNotify 2014-10-11 19:55:19 +02:00
Vincent Breitmoser
4bd9c6ff96 fix logging in consolidate, part 1 2014-10-11 19:54:07 +02:00
Vincent Breitmoser
e6a7960b8f move delete into operation class 2014-10-11 03:50:21 +02:00
Vincent Breitmoser
fe981e5498 move around package structure a bit 2014-10-10 19:59:25 +02:00
Vincent Breitmoser
ee00894e27 different wording in share tab 2014-10-10 19:43:34 +02:00
Vincent Breitmoser
ebdcb53c68 fix width of displayed qr code 2014-10-10 19:42:30 +02:00
Vincent Breitmoser
45dcc7d070 move operations into ops package, introduce BaseOperation class 2014-10-10 19:31:43 +02:00
Vincent Breitmoser
21ea040910 add keys button goes to directly to qr scan 2014-10-10 19:05:33 +02:00
Vincent Breitmoser
2dcd070014 keylist: add safeslinger exchange button to secret keys 2014-10-10 19:05:30 +02:00
Vincent Breitmoser
73ccff9537 Merge remote-tracking branch 'origin/development' into development 2014-10-09 16:26:38 +02:00
Vincent Breitmoser
340ed7c08d Merge remote-tracking branch 'origin/master' into development 2014-10-09 16:25:53 +02:00
Vincent Breitmoser
9d01490d4e reduce memory footprint in QrCodeActivity as well 2014-10-09 16:25:38 +02:00
Vincent Breitmoser
a54a0c34fe reduce memory footprint of qr code in share tab 2014-10-09 15:57:44 +02:00
Dominik Schürmann
134e1cb764 Better handling if no api key is selected 2014-10-09 01:52:44 +02:00
Dominik Schürmann
7646baf486 Better handling if no api key is selected 2014-10-09 01:51:35 +02:00
Dominik Schürmann
45b02008fb Replace many PgpGeneralExceptions with PgpKeyNotFoundException 2014-10-09 01:37:44 +02:00
Dominik Schürmann
b3f56c927b Revert "Replace PgpGeneralException with NotFoundException where appropriate" 
This reverts commit 49b4ff6312.
 2014-10-09 00:59:45 +02:00
Dominik Schürmann
a13bcbbb5b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-09 00:58:33 +02:00
Dominik Schürmann
49b4ff6312 Replace PgpGeneralException with NotFoundException where appropriate 2014-10-09 00:58:07 +02:00
Vincent Breitmoser
f6d0347c79 rename certify_key_item to the more appropriate multi_certify_item 2014-10-08 22:47:30 +02:00
Dominik Schürmann
3165f3ffa8 Remove unnecessary exception 2014-10-08 18:33:01 +02:00
Dominik Schürmann
0d6d4653b4 Big error screen if signature is invalid or key is revoked/expired, also fixes signature status for expired and revoked keys 2014-10-08 18:31:31 +02:00
Dominik Schürmann
2eb776594f Handle revoked and expired keys in decrypt activity 2014-10-08 17:39:53 +02:00
Dominik Schürmann
158f22a799 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-08 17:32:41 +02:00
Dominik Schürmann
b573afe235 New decryption screen UI with modernPGP icons 2014-10-08 17:32:32 +02:00
Vincent Breitmoser
590650a303 remove ui hack, use padding instead of margin 2014-10-08 15:36:18 +02:00
Vincent Breitmoser
1b160f68c9 slightly change text in certify dialog 2014-10-08 15:15:25 +02:00
Vincent Breitmoser
a96813198c use "Key ID" for beautify 2014-10-08 15:15:10 +02:00
Vincent Breitmoser
2d438fbc27 automatically extend single compound entry logs 2014-10-08 15:14:35 +02:00
Dominik Schürmann
adcc07ca65 Filter key list by certified keys 2014-10-08 14:42:56 +02:00
Dominik Schürmann
678265483a Move utf8 check for user id upwards 2014-10-07 18:11:12 +02:00
Dominik Schürmann
27d062496f Fix MSG_MF_UID_PRIMARY log 2014-10-07 17:50:09 +02:00
Dominik Schürmann
355bcfbb66 Remove monospace from encrypt item 2014-10-07 17:37:05 +02:00
Dominik Schürmann
f4c8c47ac2 Cleanup and fix decrypt activity 2014-10-07 17:35:12 +02:00
Dominik Schürmann
a150c0f480 Certify design 2014-10-07 17:24:20 +02:00
Dominik Schürmann
280899410f Certify design 2014-10-07 17:21:46 +02:00
Vincent Breitmoser
a50034bd10 forgot layout piece for 096f6e436 2014-10-06 19:25:29 +02:00
Vincent Breitmoser
84a9085190 get rid of some old code in LogDisplayFragment 2014-10-06 18:58:04 +02:00
Vincent Breitmoser
096f6e436d certify: checkbox fake click area tidbit 2014-10-06 18:50:58 +02:00
Vincent Breitmoser
f703d55bca move "synchronize" checkbox to bottom section as well 2014-10-06 15:42:47 +02:00
Vincent Breitmoser
b16a550fbb multicertify: move key spinner to the bottom 2014-10-06 15:41:15 +02:00
Dominik Schürmann
4b6016fcfc Fix app name 2014-10-05 11:19:19 +02:00
Vincent Breitmoser
12e44e7eeb Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-05 11:11:20 +02:00
Vincent Breitmoser
34345cf237 use sub results in import 2014-10-05 11:11:16 +02:00
Vincent Breitmoser
6699917279 add support for second line in log view 2014-10-05 11:10:40 +02:00
Dominik Schürmann
2768671206 UI stuff 2014-10-05 10:59:52 +02:00
Vincent Breitmoser
7fedde2638 add support for hierarchical log entries 2014-10-05 10:09:50 +02:00
Dominik Schürmann
0b9308753d use status icons in public key selection 2014-10-05 04:09:55 +02:00
Dominik Schürmann
d38b200b01 Add cloud icon 2014-10-05 03:39:44 +02:00
Vincent Breitmoser
84c624517c Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-05 02:25:36 +02:00
Dominik Schürmann
03fb3159b8 Give result down to list 2014-10-05 02:24:43 +02:00
Vincent Breitmoser
48c843beae even more layout neatification 2014-10-05 02:15:43 +02:00
Dominik Schürmann
fa2b3054b0 Make bit size optional 2014-10-05 01:46:56 +02:00
Vincent Breitmoser
60fb3b60a8 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
 2014-10-05 01:22:01 +02:00
Dominik Schürmann
d99115c263 preselect certify key 2014-10-05 01:23:34 +02:00
Vincent Breitmoser
dff68ac194 more layout neatification 2014-10-05 01:21:24 +02:00
Vincent Breitmoser
15165d056f slight layout changes to keyspinner_item 2014-10-05 01:07:32 +02:00
Dominik Schürmann
1dbb3db320 Display result in multi certify 2014-10-04 23:47:17 +02:00
Vincent Breitmoser
4b372a5c33 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 23:31:04 +02:00
Dominik Schürmann
4fcd58b9f8 use new multi certify, layout fixes 2014-10-04 23:32:25 +02:00
Vincent Breitmoser
f96f289891 merge key ids in getSelectedCertifyActions 2014-10-04 23:30:42 +02:00
Vincent Breitmoser
015291eb61 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 23:18:07 +02:00
Vincent Breitmoser
bad8aeea78 implement preliminary MultiCertifyActivity (most heavy lifting is done) 2014-10-04 23:16:51 +02:00
Dominik Schürmann
fbf993e621 add divider 2014-10-04 23:16:17 +02:00
Dominik Schürmann
e75e3d371d qr code download, cleanup 2014-10-04 21:40:28 +02:00
Dominik Schürmann
0599f0dd4e Workings on new parcel for key downloads 2014-10-04 21:09:32 +02:00
Dominik Schürmann
9e1a0c2c0a Pass imported master key ids via result parcel 2014-10-04 18:59:59 +02:00
Vincent Breitmoser
0ffa1b94de certify: get rid of fingerprint check 
Master key ids are unambiguous by database design, and only keys which
are in the database are signed. There is no reason to check the
fingerprint again during the certify operation.
 2014-10-04 18:30:14 +02:00
Dominik Schürmann
c614d8d4e0 Fixing import, start qr code stuff 2014-10-04 18:22:55 +02:00
Vincent Breitmoser
7e5918efa3 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 16:02:18 +02:00
Vincent Breitmoser
23b1ac1716 fix plurals quantity string in ImportKeyResult 2014-10-04 16:01:59 +02:00
Vincent Breitmoser
d004bf236b improve CertifyResult, add custom notify 2014-10-04 16:01:24 +02:00
Dominik Schürmann
7891560fc2 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 15:42:36 +02:00
Dominik Schürmann
a29d6b0ef3 Import code, fix collision of key spinner with other loaders 2014-10-04 15:42:23 +02:00
Vincent Breitmoser
0e0e3d8dd0 redesign certify action to work with parcel input and result 2014-10-04 15:19:43 +02:00
Vincent Breitmoser
ba018d1f1b yubikey: check with correct subkey id for sign operation 2014-10-04 15:13:38 +02:00
Dominik Schürmann
f0ee7ed4cf New add keys activity 2014-10-04 13:44:34 +02:00
Vincent Breitmoser
dcd22d9815 keychainintentservice: rearrange actions in alphabetical order 2014-10-04 12:31:05 +02:00
Vincent Breitmoser
ff144c7c11 canonicalize: compare user ids as string rather than bytes 2014-10-04 11:14:02 +02:00
Vincent Breitmoser
2b5341f0d4 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-10-03 23:10:37 +02:00
Vincent Breitmoser
f03822fefd fix nullpointer on button push while data is still loading 
fixes #934
 2014-10-03 23:08:32 +02:00
Dominik Schürmann
f6e0d0f495 Make app_name translatable 2014-10-03 18:49:31 +02:00
Dominik Schürmann
628eef2ab0 Version 3.0.1 2014-10-03 18:42:11 +02:00
Dominik Schürmann
3dfef61de5 Fix string reference 2014-10-03 18:42:03 +02:00
Dominik Schürmann
13cd1daaaa Pull from transifex 2014-10-03 18:37:56 +02:00
Dominik Schürmann
0b572e9001 Changelog 2014-10-03 18:31:47 +02:00
Dominik Schürmann
d5c6e430a5 Null check for getSelectedEntries 2014-10-03 13:37:49 +02:00
Vincent Breitmoser
228e5653f9 one more fix for getting the right subkey in api signing 2014-10-03 13:25:25 +02:00
Vincent Breitmoser
1ed6083a24 forgot adjustments in ProviderHelper 2014-10-03 04:42:01 +02:00
Vincent Breitmoser
f456c8a17d Merge branch 'master' of github.com:open-keychain/open-keychain 2014-10-03 04:25:08 +02:00
Vincent Breitmoser
662cc53859 clean up PgpImportExport a bit 2014-10-03 04:25:00 +02:00
Vincent Breitmoser
00bbf8c267 move IteratorWithSize interface into ParcelableFileCache - much cleaner 2014-10-03 04:22:32 +02:00
Vincent Breitmoser
504064302b actually use iterator interface for ParcelableFileCache in activities 2014-10-03 04:16:14 +02:00
Vincent Breitmoser
04c8d42436 get rid of two consolidate number preferences 2014-10-03 03:37:08 +02:00
Vincent Breitmoser
a91468565f use iterator interface exclusively in ParcelableFileCache 2014-10-03 03:29:23 +02:00
Dominik Schürmann
4cfc7feb43 More beautifyKeyIdWithPrefix 2014-10-03 03:16:34 +02:00
Dominik Schürmann
ef7eab2c8b Merge branch 'master' of github.com:open-keychain/open-keychain 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
 2014-10-03 02:20:38 +02:00
Dominik Schürmann
b9dc21969f Fix nullpointer with clipboard 2014-10-03 02:17:51 +02:00
Vincent Breitmoser
4b4e885e55 more getActivity() checks 2014-10-03 02:13:22 +02:00
Vincent Breitmoser
34e4dabea9 fix nullpointer with subtle attention seeker 2014-10-03 02:07:09 +02:00
Vincent Breitmoser
08bfc2ae73 fix hideKeyboard() in other activities as well, just to be safe 2014-10-02 19:40:43 +02:00
Vincent Breitmoser
a361e82a4d fix NullPointerException in keyboard hack 2014-10-02 19:35:03 +02:00
Vincent Breitmoser
37cb5c4c78 make getSignId a secret key operation, and respect unavailable keys 
This one should remedy #811, but waiting for a test
 2014-10-02 19:26:07 +02:00
Dominik Schürmann
9a296c012d Version 3.0 2014-10-02 14:22:06 +02:00
Dominik Schürmann
8192bf99a6 mProgressDialogFragment null check 2014-10-02 14:05:54 +02:00
Dominik Schürmann
c2f85c7446 Remove unnecessary call to mFingerprintQrCode 2014-10-02 12:50:38 +02:00
Dominik Schürmann
6da367e469 Fix IllegalStateException in ViewKeyShareFragment 2014-10-02 12:43:18 +02:00
Dominik Schürmann
a125b51b1c Fix nullpointer with getS2K() 2014-10-02 12:33:56 +02:00
Dominik Schürmann
675d2bd6dd code style 2014-10-02 11:47:42 +02:00
Dominik Schürmann
8f616bcf0c Add null check when retrieving key ids from contacts api 2014-10-02 11:32:10 +02:00
Dominik Schürmann
17e45d94a8 Add workaround for bug #912 2014-10-02 11:23:43 +02:00
Dominik Schürmann
42ce3bb0d3 Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling in decryt screen 2014-10-01 15:03:53 +02:00
Dominik Schürmann
e7cbf975ac More debugging output 2014-10-01 14:14:50 +02:00
Dominik Schürmann
f841203f5f Add filterTouchesWhenObscured to prevent Touch-Event Hijacking 2014-10-01 10:51:02 +02:00
Dominik Schürmann
84fcbba74d check key ids when used from api 2014-10-01 10:48:28 +02:00
Dominik Schürmann
e1a81ae5cd Update from transifex 2014-09-30 20:00:14 +02:00
Dominik Schürmann
cce2365173 Clarify api_create_account_text 2014-09-30 19:55:30 +02:00
Dominik Schürmann
b1b16b9313 3.0 beta3 2014-09-30 17:50:16 +02:00
Vincent Breitmoser
51ecce510f fix minor logic error (haha) 2014-09-30 14:10:54 +02:00
Vincent Breitmoser
354bc87579 fix ByteBuffer offset mistake in NfcActivity 2014-09-30 11:36:51 +02:00
Vincent Breitmoser
b2b19d7b2b pass (encryption) key id from Decrypt*Fragment to NfcActivity 2014-09-30 02:14:28 +02:00
Vincent Breitmoser
11d0f4510b pass key id for check from EncryptActivity to NfcActivity 2014-09-30 02:03:17 +02:00
Vincent Breitmoser
bd3f6a22cb add (optional) keyId check in NfcActivity 2014-09-30 01:47:04 +02:00
Vincent Breitmoser
dabdda36cf revamp fingerprint and keyid methods in NfcActivity 2014-09-30 01:46:16 +02:00
Vincent Breitmoser
de5dd482e1 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-30 00:51:58 +02:00
Vincent Breitmoser
384724f9b5 request passphrase for correct subkey in OpenPgpService 
fixes #811, hopefully
 2014-09-30 00:51:25 +02:00
Dominik Schürmann
9e7c9a0d32 Fix nullpointer in DecryptActivity 2014-09-29 23:05:17 +02:00
Dominik Schürmann
7531106565 3.0 beta2 2014-09-29 22:54:36 +02:00
Dominik Schürmann
f275daf1fb Disable NfcIntentActivity until we implement it properly 2014-09-29 22:54:17 +02:00
Dominik Schürmann
43140c10b1 Fixes for share to decrypt 2014-09-29 22:52:03 +02:00
Dominik Schürmann
8e5c5c9503 Remove unused layouts 2014-09-29 22:24:55 +02:00
Dominik Schürmann
51ea71d68a Maybe fixes encrypt files on tablets 2014-09-29 22:23:48 +02:00
Vincent Breitmoser
0b16a4edfd Merge remote-tracking branch 'origin/master' 
Conflicts:
	OpenKeychain/src/main/AndroidManifest.xml
 2014-09-29 21:32:21 +02:00
Vincent Breitmoser
7f547afe42 add barely functional nfc intent activity (WIP!) 2014-09-29 21:31:19 +02:00
Vincent Breitmoser
c13a7b7eae add class for proper nfc tlv packet parsing 2014-09-29 21:22:48 +02:00
Dominik Schürmann
f7fe236bd5 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-29 21:20:30 +02:00
Dominik Schürmann
654d98ac2a Fix NfcActivity task stack problem 2014-09-29 21:20:01 +02:00
Vincent Breitmoser
c34a159cae fix method visibility for tests 2014-09-28 15:17:09 +02:00
Vincent Breitmoser
8131daa638 move can.*() methods to CanonicalizedPublicKey, where they belong 2014-09-28 14:50:52 +02:00
Vincent Breitmoser
706e60474d be more mindful of algorithm and usage flag interaction 
Fixes #895
 2014-09-28 14:25:54 +02:00
Vincent Breitmoser
c0abae5cc3 only check for primary binding certificate if key algorithm even supports signing 2014-09-28 03:53:14 +02:00
Vincent Breitmoser
4782d22e26 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-28 03:38:14 +02:00
Vincent Breitmoser
1c3d0a58ea Reject subkeys with no key flags and no primary key binding certificate 
Closes #899
 2014-09-28 03:34:25 +02:00
Dominik Schürmann
d20f657151 Hide keyboard after cloud search 2014-09-27 14:36:14 +02:00
Dominik Schürmann
f22bbbd96c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-27 13:52:05 +02:00
Dominik Schürmann
1a7edc9925 Dont show keyboard by default in key creation to allow the user to get an overview what to type, use spannable where possible 2014-09-27 13:52:01 +02:00
Vincent Breitmoser
1a2ec1eb32 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-26 00:43:08 +02:00
Vincent Breitmoser
4ccb26d2e5 nfc: use proper hex encoding for pin length 
Fixes #886
 2014-09-26 00:39:48 +02:00
Tim Bray
6d70e1bfd1 Fix bug where Keybase extraData gets lost when SKS wins the search race. 2014-09-25 02:30:52 -07:00
Dominik Schürmann
999094934a Fixes for new app list 2014-09-24 21:30:03 +02:00
Dominik Schürmann
d5a1e9bb66 3.0 beta1 2014-09-24 19:11:23 +02:00
Vincent Breitmoser
f48db5a005 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 15:41:16 +02:00
Vincent Breitmoser
9e2fc81c65 disable pull to refresh (for now) 2014-09-24 15:41:08 +02:00
Dominik Schürmann
8b663add04 Pull from transifex 2014-09-24 15:41:00 +02:00
Vincent Breitmoser
312598290b fix save button when no file is selected 2014-09-24 15:36:34 +02:00
Vincent Breitmoser
a50fe142e4 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 15:31:37 +02:00
Vincent Breitmoser
7c6eff6d92 show message about saving multiple files rather than hide the button 2014-09-24 15:28:51 +02:00
Vincent Breitmoser
689b2c9ab1 move more stuff into EncryptActivity superclass 2014-09-24 15:18:00 +02:00
Vincent Breitmoser
e0da0f6eb5 use correct pin for nfc in EncryptActivity 2014-09-24 15:04:23 +02:00
Dominik Schürmann
9dbb966b44 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 14:46:03 +02:00
Dominik Schürmann
e3a185f698 propose apps in apps list 2014-09-24 14:45:51 +02:00
Vincent Breitmoser
c7b0f77c9b allow 1024 bit key signatures 2014-09-24 14:14:16 +02:00
Vincent Breitmoser
da66d1443f Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 12:30:15 +02:00
Vincent Breitmoser
e4a7414794 fix Le fields in APDUs 2014-09-24 12:30:07 +02:00
Dominik Schürmann
5b0cc1fab4 Fix logging in NFcActivity 2014-09-24 11:57:50 +02:00
Vincent Breitmoser
5604deaca0 Fix yubikey pin lengths other than 6 
Closes #883
 2014-09-24 02:58:38 +02:00
Vincent Breitmoser
425cea41f2 add subtle attention seeker to decryptactivity with available clipboard data 
Thanks Cyril Mottier

https://plus.google.com/+CyrilMottier/posts/FABaJhRMCuy
 2014-09-24 02:43:45 +02:00
Dominik Schürmann
382ae968d6 Fix strings reported by yahoe.001 2014-09-24 02:36:24 +02:00
Dominik Schürmann
c3e0b3e887 Fix NfcActivity typo 2014-09-24 02:11:41 +02:00
Dominik Schürmann
b373c866e7 Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate 2014-09-24 02:01:53 +02:00
Dominik Schürmann
f7d49a48cb Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 01:49:50 +02:00
Dominik Schürmann
3850ddea08 DecryptFiles: Reset state for new file decrytion 2014-09-24 01:46:54 +02:00
Vincent Breitmoser
c871891f49 Merge remote-tracking branch 'origin/master' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
 2014-09-24 01:42:17 +02:00
Vincent Breitmoser
7654cd54fb fix signing in OK with yubikeys 2014-09-24 01:41:40 +02:00
Dominik Schürmann
6e0938aa93 Fix new decrypt button 2014-09-24 01:41:38 +02:00
Dominik Schürmann
993046d12e cleanup 2014-09-24 01:38:18 +02:00
Vincent Breitmoser
d588b13255 fix signatures produced by yubikey 
The timestamp was only set on a second run. This led to a race
condition whether the signature could be completed within the
same timestamp.

Fixes #834
 2014-09-24 01:37:28 +02:00
Dominik Schürmann
42a7cd5eb0 Button text for decrypt 2014-09-24 01:37:00 +02:00
Dominik Schürmann
7f2640711e Fix yubikey file decryption 2014-09-24 01:18:14 +02:00
Dominik Schürmann
0182f7c951 Yubikey text decryption working 2014-09-24 00:57:57 +02:00
Dominik Schürmann
07704c2726 Yubikey decryption 2014-09-24 00:50:58 +02:00
Dominik Schürmann
7c82e1c728 DecryptFilesActivity 2014-09-24 00:02:00 +02:00
Vincent Breitmoser
07e8729abf fix nullpointer in previous swipetorefresh fix 2014-09-23 23:49:18 +02:00
Dominik Schürmann
0143b54e9e Implement buttons in DecryptTextFragment 2014-09-23 23:38:30 +02:00
Dominik Schürmann
b9347ea9aa Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-23 23:04:27 +02:00
Dominik Schürmann
9f67b0fe54 DecryptTextActivity rework 2014-09-23 23:04:18 +02:00
Vincent Breitmoser
ab4972b428 missed a secondary preference initialization 2014-09-23 19:17:54 +02:00
Vincent Breitmoser
5e090e6fb6 fix nullpointer ImportKeysListEntry (from pulltorefresh) 
Fixes #873
 2014-09-23 19:02:08 +02:00
Vincent Breitmoser
45b7b88b94 disable pull to refresh in upper right corner 
While at the top of the list, the scroll bar handle is in the top right
corner. Previously, dragging the handle from this position was difficult
because touch events were intercepted by the pull to refresh handler.

Closes #858
 2014-09-23 18:48:39 +02:00