cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,553 Commits 1 Branch 0 Tags
ebb7f559216fd2f4d82f824e4fa7ceddbfa7cd1c
Commit Graph
1553 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 0d5e99e1f0 Coding style 2014-03-26 13:42:16 +01:00
Dominik Schürmann e5fe4245bf remove old icon entry 2014-03-26 13:39:30 +01:00
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
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
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