moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 08:28:50 -05:00
Code Issues Releases Wiki Activity
1,670 Commits 12 Branches 24 Tags 116 MiB
a234d09f91
Commit Graph

964 Commits

Author SHA1 Message Date
Dominik Schürmann
2947ab7e48 More experimental work on decrypt fragments 2014-03-30 19:32:05 +02:00
Dominik Schürmann
4cec2194e0 Experiments with fragments in decrypt activity 2014-03-30 19:32:04 +02:00
Dominik Schürmann
224e8a7554 Remove cancel from app menu 2014-03-30 19:29:07 +02:00
Dominik Schürmann
583467356c Revert "Remove cancel from app menu" 
This reverts commit 3c0b97f280.
 2014-03-30 19:28:35 +02:00
Dominik Schürmann
3c0b97f280 Remove cancel from app menu 2014-03-30 19:26:41 +02:00
Dominik Schürmann
7b53150ad5 Remove FLAG_ONE_SHOT from most PIs 2014-03-30 19:25:39 +02:00
Dominik Schürmann
6b5d60e1f4 Merge pull request #491 from openpgp-keychain/edit-key 
Edit key changes
 2014-03-30 18:04:43 +02:00
Ashley Hughes
be007ecc56 style changes 2014-03-30 16:22:13 +01:00
Dominik Schürmann
b2342744b5 Actually use fixBadCharactersForGmail 2014-03-30 14:02:09 +02:00
Ashley Hughes
95eb33b2ed use save icon, not tick 2014-03-29 15:33:03 +00:00
Ashley Hughes
556d6ff226 revert mistake 2014-03-29 15:19:38 +00:00
Ashley Hughes
e1d07214df merge master 2014-03-29 13:21:39 +00:00
Miroojin Bakshi
d5e3958565 Enable importing of fingerprints from clipboard. 2014-03-28 00:34:24 +05:30
Ashley Hughes
7a2d880c4d all editing cases I can think of now work 2014-03-27 15:00:35 +00:00
Ashley Hughes
56447ad0b5 fix for editing master keys and IDs, case of change primary ID and modify master key props fails 2014-03-27 14:48:27 +00:00
Ashley Hughes
140646fa12 pass through original primary ID 2014-03-27 13:35:03 +00:00
Dominik Schürmann
68668fd444 Version 2.4 2014-03-26 22:56:51 +01:00
Dominik Schürmann
619c079f00 Sync changelog and about with transifex 2014-03-26 22:55:33 +01:00
Dominik Schürmann
a589b6e7fe Changelog for 2.4 2014-03-26 22:48:23 +01:00
Dominik Schürmann
8e9ceffae3 Changelog for 2.4 2014-03-26 22:45:35 +01:00
Dominik Schürmann
19bbaecf32 Update from transifex 2014-03-26 22:20:23 +01:00
Dominik Schürmann
cc8fd35137 Show divider only when used 2014-03-26 18:34:48 +01:00
Dominik Schürmann
ac134790a0 Text for creation of new api accounts 2014-03-26 18:23:48 +01:00
Dominik Schürmann
399106015e Rename layouts for remote activity 2014-03-26 18:18:00 +01:00
Dominik Schürmann
2e063a42ed Fix provider for API_ACCOUNTS 2014-03-26 17:55:48 +01:00
Dominik Schürmann
ba37fc254d Accounts activity prettified 2014-03-26 17:50:16 +01:00
Dominik Schürmann
65857d2b5f Accounts list prettified 2014-03-26 17:43:26 +01:00
Dominik Schürmann
de553e9b43 Merge pull request #483 from uberspot/master 
fix capability icons and remove red text for revoked keys
 2014-03-26 14:11:04 +01:00
Dominik Schürmann
ec34597331 Make PendingIntents with FLAG_CANCEL_CURRENT and FLAG_ONE_SHOT 2014-03-26 14:11:28 +01:00
uberspot
c8b7717105 fix capability icons and remove red text for revoked keys 2014-03-26 14:46:03 +02:00
Dominik Schürmann
f10235220d Forgot resource 2014-03-26 13:32:36 +01:00
Dominik Schürmann
de718c24c4 Merge pull request #482 from uberspot/master 
Fix style for expired/revoked keys
 2014-03-26 13:23:50 +01:00
Dominik Schürmann
92a4d0e914 Part 2 of basic user interface for api accounts 2014-03-26 13:21:29 +01:00
uberspot
8d23ba968a add strike through text for revoked or expired keys and disable views for revoked keys as well 2014-03-26 14:07:41 +02:00
uberspot
438c050250 put expiry on a separate line 2014-03-26 14:07:41 +02:00
Dominik Schürmann
9542dc0e12 Accounts API, user interface 2014-03-26 13:07:32 +01:00
Ashley Hughes
4923c9b8e3 add original primary ID field to parcel 2014-03-26 00:29:39 +00:00
Dominik Schürmann
930d722013 Simplify can encrypt check 2014-03-26 00:40:13 +01:00
Dominik Schürmann
30a002634d Merge pull request #471 from sreeram-boyapati/encryption 
Added can_encrypt check
 2014-03-26 00:33:29 +01:00
Dominik Schürmann
dbbb782911 Merge pull request #479 from AlexanderS/subkey-expiry 
Display expiry of subkeys in single key view.
 2014-03-26 00:20:17 +01:00
Dominik Schürmann
028af0c119 Fix constraints and insert 2014-03-26 00:11:49 +01:00
Ashley Hughes
b77e0504aa allow master key updates by removing old primary ID cert 2014-03-25 23:01:17 +00:00
Ashley Hughes
259a8a63a2 delete IDs needs to update keyring, flag it 2014-03-25 22:40:05 +00:00
Ashley Hughes
68f035ff88 allow lists to be subkeys or keyrings 2014-03-25 22:28:32 +00:00
Dominik Schürmann
0edfd7ed48 Temporary fix for inserting by content provider 2014-03-25 23:25:03 +01:00
Dominik Schürmann
cb3e149c14 Merge pull request #474 from honnel/empty-list-flash 
Empty list flash
 2014-03-25 23:14:45 +01:00
Dominik Schürmann
758aabd751 Merge pull request #475 from thi/master 
Add recent contributors to credits
 2014-03-25 23:11:09 +01:00
Dominik Schürmann
dc9fd12213 Return account creation intent if account does not exists in db 2014-03-25 23:09:57 +01:00
Dominik Schürmann
8c496d3393 Fix update and insert for new api content provider 2014-03-25 21:52:06 +01:00
Dominik Schürmann
cff35ca842 More experimental work on api accounts 2014-03-25 21:23:59 +01:00
Dominik Schürmann
031beed680 Merge pull request #477 from thi/adjust-getting-started-text 
Change the getting started text
 2014-03-25 19:11:29 +01:00
Dominik Schürmann
7111a4265d Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-25 19:11:32 +01:00
Dominik Schürmann
aa35b1f4b5 More experimental work on API accounts 2014-03-25 19:11:20 +01:00
Alexander Sulfrian
4e481512c3 Display expiry of subkeys in single key view. 2014-03-25 05:29:52 +01:00
Ashley Hughes
e7b3dd64f4 results of debugging, fix several bugs - more needed though... 2014-03-25 00:20:35 +00:00
Ashley Hughes
02688f6ebf comments, slight change to progress bar 2014-03-24 17:41:45 +00:00
Ashley Hughes
300b90bcac make sure ID info is saved 2014-03-24 16:47:02 +00:00
Ashley Hughes
974514e470 work on saving 2014-03-24 16:15:28 +00:00
Ashley Hughes
fcc7117770 move stuff around, save work 2014-03-23 23:41:08 +00:00
Thialfihar
0867d1f078 Change the getting started text 
"My Keys" is now wrapped into "Contacts".
 2014-03-24 00:29:46 +01:00
Thialfihar
7d5896b107 Add recent contributors to credits 2014-03-24 00:24:43 +01:00
Thialfihar
c9053b97a8 Rename old mentionings of APG-named things 
Mostly in comments, most importantly: STORE_PATH now ends in
/KeychainBlobs instead of /ApgBlobs
 2014-03-23 21:58:18 +01:00
Thialfihar
3dfcb037dc Remove icon set credits 2014-03-23 19:51:29 +01:00
Thialfihar
a2048773ee Fix file decryption interface 
Actually use mAssumeSymmetricEncryption and set it to false as
default. Don't close the file input stream, so we can actually
look for PGP encrypted data in the next step.
 2014-03-23 19:40:09 +01:00
Thialfihar
60998f114c Adjust encrypt layout, align signature with button 2014-03-23 19:39:18 +01:00
Daniel Hammann
2ea0cd0e8a No "empty-list" layout flashing up on start of OpenKeychain 2014-03-23 19:35:12 +01:00
Thialfihar
900e8ce990 Adjust credits 2014-03-23 12:32:13 +01:00
Sreeram Boyapati
57f9b55677 Added can_encrypt check 2014-03-23 14:35:48 +05:30
Dominik Schürmann
f082b53118 Extend provider for new api tables 2014-03-23 02:17:39 +01:00
Dominik Schürmann
9555ae3bc1 Move classes for OpenPGP API into remote package 2014-03-23 01:26:49 +01:00
Dominik Schürmann
12402d9a51 New db table for api accounts 2014-03-23 01:16:56 +01:00
Dominik Schürmann
ff67ddc5f4 Merge pull request #469 from honnel/save-key-workaround 
Can't save key after key generation
 2014-03-23 00:13:18 +01:00
Dominik Schürmann
153b99a186 Use new FoldableLinearLayout in API settings 2014-03-23 00:03:49 +01:00
Dominik Schürmann
14dab821b7 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-22 23:46:15 +01:00
Dominik Schürmann
90efc7f2a0 Merge pull request #467 from uberspot/master 
Make foldable settings in EncryptActivity into a separate widget
 2014-03-22 23:44:50 +01:00
Daniel Hammann
9c18062951 The current implementation of saving new generated key doesn't save the key due to the public key of master key id can not be resolved by ProviderHelper.getPGPPublicKeyByKeyId (via URI/Cursor). Workaround uses local keys-arraylist for resoving the pubkey of master key id. 2014-03-22 15:42:50 +01:00
Daniel Hammann
0f6dc253a4 Because of an unknown reason toast messages were commented out. 2014-03-21 23:01:24 +01:00
uberspot
8f37569967 Make foldable settings in EncryptActivity a separate widget 2014-03-21 19:09:17 +02:00
Dominik Schürmann
b7bc8faee6 raname to mKeychainDatabase 2014-03-21 11:43:30 +01:00
Dominik Schürmann
1b57a10bb6 Fix nfc help button 2014-03-21 11:26:18 +01:00
Dominik Schürmann
c6189c5218 remove ach language, not supported by android 2014-03-21 10:29:29 +01:00
Dominik Schürmann
c85a0e9cca Pull from transifex 2014-03-21 10:28:34 +01:00
Dominik Schürmann
4dac00bb21 Pull from transifex 2014-03-21 10:28:26 +01:00
Dominik Schürmann
620c67f441 reformat merge 2014-03-21 10:05:59 +01:00
Dominik Schürmann
8fead6fddb Merge pull request #458 from hav3n/branch-delete-fix 
New Fix for #410
 2014-03-21 09:59:19 +01:00
Dominik Schürmann
a7ea9d4eca Merge pull request #461 from honnel/ui-tasks 
UI-Icon-Modifying #429
 2014-03-21 09:59:14 +01:00
Daniel Hammann
e00eeab1bf UI-Icon-Modifying #429 added hint to text edit, different icons for share and clipboard button 2014-03-20 22:49:59 +01:00
Daniel Hammann
2f0075e043 URI is transported in intents data not extra. 2014-03-20 22:35:05 +01:00
Nikhil Peter Raj
4e6325a140 Fix GPL Headers 2014-03-21 01:56:33 +05:30
Nikhil Peter Raj
2816461283 Fix for #410 2014-03-21 01:50:20 +05:30
Dominik Schürmann
58b22d1213 Merge pull request #457 from hav3n/branch-fix-certify 
Fix for #451
 2014-03-20 20:12:43 +01:00
Nikhil Peter Raj
d9b909a24f Update fix for #451 2014-03-21 00:27:03 +05:30
Dominik Schürmann
59d51fe68e Fix fingerprint handling 2014-03-20 19:48:18 +01:00
Nikhil Peter Raj
016641a422 Cleanup for #451 2014-03-20 23:46:26 +05:30
Dominik Schürmann
df6fff93f0 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-20 19:11:59 +01:00
Dominik Schürmann
0510e0e217 verify downloaded key by comparing fingerprints 2014-03-20 19:11:51 +01:00
Nikhil Peter Raj
0a8b45ee88 Fix for #451 2014-03-20 23:37:29 +05:30
Thialfihar
f5ecd2ae46 Move fingerprint up below the algorithm in key view 
This makes it consistent with the key list entry layout and it also
makes more sense, as it belongs to key identification.
 2014-03-20 18:40:30 +01:00
Thialfihar
602fb654af Move fingerprint to the right in key list entry 
Fits much better there and doesn't separate the user ID.
 2014-03-20 18:40:29 +01:00
Thialfihar
a17481b80a Group fingerprint again to make it visually consistent 2014-03-20 18:40:29 +01:00
Dominik Schürmann
77365202e0 put colorize method into key helper 2014-03-20 16:10:42 +01:00
Dominik Schürmann
81e0d04230 colorize fingerprint in import 2014-03-20 16:09:05 +01:00
Dominik Schürmann
36815b9185 Use getter and setter 2014-03-20 16:04:05 +01:00
Dominik Schürmann
2b77489932 Dont try to parse key/fingerprint result from keyserver query 2014-03-20 15:54:49 +01:00
Thialfihar
3fa3fc444b Add debug logging for hkp keyserver actions 2014-03-20 14:21:21 +01:00
Thialfihar
16ae9c8999 Let convertKeyIdToHex handle short key IDs 
If a short key ID is given, then it should only be displayed as such.
 2014-03-20 14:19:33 +01:00
Thialfihar
62fb1fb579 Fix key list views in main key view 
Since the views are being reused, a revoked key might set the text
color of a view and when the view is being reused for a non-revoked
key it is still red. So grab the default text colour and set it
explicitly when the key is not revoked.
 2014-03-20 00:37:03 +01:00
uberspot
977e76e7e4 add apg's fix for Key id display 2014-03-19 18:28:34 +02:00
Dominik Schürmann
52838a50c1 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-19 16:22:26 +01:00
Dominik Schürmann
8059c78e55 Remove oxygen text from icon 2014-03-19 16:22:22 +01:00
Dominik Schürmann
12b97d251a Cleanup 2014-03-19 16:22:10 +01:00
Dominik Schürmann
41fda151dc Merge pull request #448 from AlexanderS/lint-fixes 
use correct LongSparseArray for minimum api level
 2014-03-19 15:41:15 +01:00
Alexander Sulfrian
69d26496a2 use correct LongSparseArray for minimum api level 2014-03-19 14:26:00 +01:00
Dominik Schürmann
3416e51f84 Merge pull request #445 from gogowitczak/rwrsa-branch 
Disabled possibility to generate weak RSA keys (512 and 1024 bit)
 2014-03-19 09:40:28 +01:00
gogowitczak
19e962481d Note about blocked possibility to generate weak (<1024) RSA key. 2014-03-18 23:30:42 +01:00
gogowitczak
2435794279 Blocked ok button for generating weak (<1024) RSA key. 2014-03-18 21:52:44 +01:00
Dominik Schürmann
9d60224980 Cleanup SelectSecretKeyActivity and also return Uri 2014-03-18 19:36:59 +01:00
uberspot
654c302961 CertifyKeyActivity sets error if no key is selected 2014-03-18 20:13:39 +02:00
Dominik Schürmann
4aa24413de revert ca_necrypt patch 2014-03-18 18:35:59 +01:00
uberspot
ea648e5a43 fix emails not showing up in import keyserver search 2014-03-18 19:24:04 +02:00
Dominik Schürmann
9badff0b5b Merge pull request #434 from honnel/revocation-status 
Show revocation status in ViewKeyKeysAdapter #375
 2014-03-18 16:45:44 +01:00
Dominik Schürmann
b97097d8d9 Merge pull request #437 from sreeram-boyapati/encrypt 
Can_Encrypt Check added to hide Button
 2014-03-18 16:45:38 +01:00
Sreeram Boyapati
163e9fddb9 Code Style fix 2014-03-18 21:10:09 +05:30
Daniel Hammann
2d3f47eb99 Show revocation status in SelectPublicKeyFragment #375 
Added revocation status in Key List View (graphical symbol and red coloring)
 2014-03-18 16:33:49 +01:00
Dominik Schürmann
fe3d6bafc3 Merge pull request #435 from sreeram-boyapati/change_passphrase 
Button Text changes to Change Passphrase if Passphrase is set
 2014-03-18 16:30:42 +01:00
Dominik Schürmann
eebf1c171a add mr option in keyserver class before query (code simplification) 2014-03-18 16:29:40 +01:00
Sreeram Boyapati
f34b3ee531 Button Text changes to Change Passphrase if Passphrase is set 2014-03-18 20:40:09 +05:30
Sreeram Boyapati
fa439c1a72 Can_Encrypt Check added to hide Button 2014-03-18 20:33:17 +05:30
Dominik Schürmann
d1f0374620 Merge pull request #424 from gogowitczak/mro-branch 
Machine readable output for Keyserver query
 2014-03-18 15:56:46 +01:00
gogowitczak
fee18bd33e Fixed coding style. 2014-03-18 15:44:20 +01:00
Dominik Schürmann
72a5d6d870 Merge pull request #431 from honnel/ui-modification 
Ui modification
 2014-03-18 14:57:32 +01:00
Dominik Schürmann
711a51f7fc Merge pull request #430 from Valodim/certify 
Revamp certify dialogue
 2014-03-18 14:43:20 +01:00
Dominik Schürmann
30644b5c4f Merge pull request #420 from gogowitczak/master 
Added FAQ: specifying connection port for Keyserver.
 2014-03-18 14:24:53 +01:00
Daniel Hammann
b39d37f59c #429 4) 
In the clicking for a particular contact , two icon in the actionbar show the same hint ('Share'). Second
icon hint can be 'Keyserver' or just only 'server'
 2014-03-17 22:17:05 +01:00
Vincent Breitmoser
5e4239a7b9 Merge branch 'certify' into certs 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenPGP-Keychain/src/main/res/values/strings.xml
 2014-03-17 14:18:42 +01:00
Vincent Breitmoser
87004fd0ca certify: preserve user id certificates when saving secret keys 2014-03-17 14:11:32 +01:00
Vincent Breitmoser
e8ad4317a4 certs: more filters, better initial uid selection, code cosmetics 
- add three types of filters for certificate list (ui looks like crap
      there, need to work on that)
    - select uncertified uids by default in CertifyKeyActivity
    - move some code around in KeychainProvider, 's slightly less hacky now
 2014-03-17 14:10:40 +01:00
uberspot
e01c99a193 make loading of drawer items a bit more dynamic 2014-03-17 00:27:52 +02:00
uberspot
cea62b1857 Lock drawer as open in tablets 2014-03-16 23:35:14 +02:00
gogowitczak
5277e4c1e7 removed TODO comment 2014-03-15 22:01:37 +01:00
gogowitczak
207010dd86 Keyserver query now uses machine readable output for search and get. Added separate function for converting algorithm integer ID to String. 2014-03-15 21:16:34 +01:00
Vincent Breitmoser
f192c70179 certs: green dots for verified status \o/ 2014-03-15 19:58:17 +01:00
Vincent Breitmoser
5c28da44d6 certs: provider cleanup and bugfixing 2014-03-15 19:57:55 +01:00
Vincent Breitmoser
6bacb5ff51 Merge branch 'certify' into certs 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
	OpenPGP-Keychain/src/main/res/values/strings.xml
 2014-03-15 18:34:20 +01:00
Vincent Breitmoser
95be228b47 certify: sign individual UIDs 
direct signing of pubkeys is out for now. not sure how this should be
handled, but it's trivial to re-add so leaving this up for discussion
for now.
 2014-03-15 18:20:50 +01:00
Vincent Breitmoser
8fbd77fb15 certify: preserve user id certificates when saving secret keys 2014-03-15 18:20:50 +01:00
Vincent Breitmoser
a3224687f6 certify: add some subscopes in PgpKeyOperation for readability 
note this commit introduces NO semantical changes whatsoever!
 2014-03-15 18:20:50 +01:00
Vincent Breitmoser
1de0312bb5 certify: revamp certifykeyactivity 
show info on the key to be certified, along with a list of (selectable)
user ids. user ids are handed through to the signing service, but not
yet handled.
 2014-03-15 18:20:49 +01:00
Vincent Breitmoser
49984846d5 certify: support PUBLIC_KEY_RING_BY_MASTER_KEY_ID_USER_ID uri (haha) 2014-03-15 18:20:49 +01:00
Vincent Breitmoser
efc8252598 certify: viewkeyuseridsadapter cosmetics and checkbox capability 2014-03-15 18:20:49 +01:00