cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,627 Commits 1 Branch 0 Tags
72ade58a7ab740c81f85e00b0566c19baf432b62
Commit Graph
1627 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dominik Schürmann 41fc7b6344 Merge pull request #476 from thi/rename-old-apg-things 
Rename old mentionings of APG-named things
 2014-03-23 22:13:16 +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
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