moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-20 06:12:16 -05:00
Code Issues Releases Wiki Activity
3,935 Commits 12 Branches 24 Tags 116 MiB
dcaac4f85f
Commit Graph

3935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dominik Schürmann
4e2e40f404 Merge pull request #473 from thi/master 
Adjust credits, align signature in encrypt layout slightly, fix file decryption, remove icon set credits
 2014-03-23 20:13:21 +01:00
Thialfihar
9d4582f968 Update README.md, icon set not used anymore 2014-03-23 19:52:25 +01:00
Thialfihar
3dfcb037dc Remove icon set credits 2014-03-23 19:51:29 +01:00
Dominik Schürmann
b4b709b1e0 put original license of launcher icon into repo 2014-03-23 19:42:17 +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
Daniel Hammann
30e7770b05 Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain 2014-03-23 18:33:01 +01:00
Daniel Hammann
3d9cc7fc56 Merge branch 'ui-createkey' 2014-03-23 18:32:19 +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
Dominik Schürmann
25e5360bee Merge pull request #468 from honnel/ui-createkey 
Because of an unknown reason toast messages were commented out.
 2014-03-22 23:44:32 +01:00
Daniel Hammann
36376c4999 Merge branch 'save-key-workaround' of https://github.com/honnel/openpgp-keychain into save-key-workaround 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-03-22 15:46:30 +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
4e285d9254 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:31:18 +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
Dominik Schürmann
81624aa648 Merge pull request #460 from honnel/uri-for-sign 
URI is transported in intents data not extra. #459
 2014-03-21 09:57:27 +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
Dominik Schürmann
7edc062147 Merge pull request #456 from thi/adjust-fingerprint-layouts 
Adjust fingerprint layouts
 2014-03-20 19:08:42 +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