cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,439 Commits 1 Branch 0 Tags
b75428daf71ace4b295dddbad2094a593996c085
Commit Graph
1439 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann b75428daf7 Revert "Update README.md, icon set not used anymore" 
This reverts commit 9d4582f968.
 2014-03-26 13:38:45 +01: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
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
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
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